From e71dc8a22055e365ec089ea2867f7ef1af7a54b0 Mon Sep 17 00:00:00 2001 From: LeoAnn <1297441823@qq.com> Date: Mon, 14 Apr 2025 14:46:06 +0800 Subject: [PATCH] first commit --- .gitignore | 47 + LICENSE | 20 + README.md | 97 ++ bin/clean.bat | 12 + bin/package.bat | 12 + bin/run.bat | 14 + doc/若依环境使用手册.docx | Bin 0 -> 428430 bytes pom.xml | 265 +++ ruoyi-admin/pom.xml | 135 ++ .../main/java/com/ruoyi/RuoYiApplication.java | 28 + .../com/ruoyi/RuoYiServletInitializer.java | 18 + .../controller/common/CaptchaController.java | 93 ++ .../controller/common/CommonController.java | 163 ++ .../controller/monitor/CacheController.java | 53 + .../controller/monitor/ServerController.java | 27 + .../monitor/SysLogininforController.java | 69 + .../monitor/SysOperlogController.java | 69 + .../monitor/SysUserOnlineController.java | 92 ++ .../controller/system/LoginSsoController.java | 86 + .../system/SysConfigController.java | 134 ++ .../controller/system/SysDeptController.java | 165 ++ .../system/SysDictDataController.java | 121 ++ .../system/SysDictTypeController.java | 132 ++ .../controller/system/SysIndexController.java | 29 + .../controller/system/SysLoginController.java | 89 + .../controller/system/SysMenuController.java | 142 ++ .../system/SysNoticeController.java | 91 ++ .../controller/system/SysPostController.java | 130 ++ .../system/SysProfileController.java | 142 ++ .../system/SysRegisterController.java | 38 + .../controller/system/SysRoleController.java | 245 +++ .../controller/system/SysUserController.java | 237 +++ .../controller/tool/SwaggerController.java | 24 + .../web/controller/tool/TestController.java | 181 +++ .../ruoyi/web/core/config/SwaggerConfig.java | 125 ++ .../META-INF/spring-devtools.properties | 1 + .../src/main/resources/application-druid.yml | 57 + .../src/main/resources/application-test.yml | 60 + .../src/main/resources/application.yml | 147 ++ ruoyi-admin/src/main/resources/banner.txt | 24 + .../src/main/resources/excel/blank.xls | Bin 0 -> 20480 bytes .../resources/excel/dayEvaporationWater.xls | Bin 0 -> 20480 bytes .../src/main/resources/excel/dayFlow.xls | Bin 0 -> 20480 bytes .../src/main/resources/excel/dayMaxRain.xls | Bin 0 -> 20992 bytes .../src/main/resources/excel/dayRain.xls | Bin 0 -> 20480 bytes .../excel/daySedimentConcentration.xls | Bin 0 -> 20480 bytes .../main/resources/excel/dayWaterLever.xls | Bin 0 -> 20480 bytes .../resources/excel/dayWaterTemperature.xls | Bin 0 -> 20480 bytes .../src/main/resources/excel/floodExcerpt.xls | Bin 0 -> 20480 bytes .../excel/followingTheTideExcerpt.xls | Bin 0 -> 20480 bytes .../src/main/resources/excel/hourMaxRain.xls | Bin 0 -> 20992 bytes .../main/resources/excel/maxFloodScale.xls | Bin 0 -> 20992 bytes .../src/main/resources/excel/minMaxRain.xls | Bin 0 -> 20992 bytes .../excel/momthSedimentTransportRate.xls | Bin 0 -> 20992 bytes .../resources/excel/monthEvaporationWater.xls | Bin 0 -> 20992 bytes .../src/main/resources/excel/monthFlow.xls | Bin 0 -> 20992 bytes .../src/main/resources/excel/monthRain.xls | Bin 0 -> 20992 bytes .../excel/monthSedimentConcentration.xls | Bin 0 -> 20992 bytes .../main/resources/excel/monthTideLever.xls | Bin 0 -> 22528 bytes .../main/resources/excel/monthWaterLever.xls | Bin 0 -> 20992 bytes .../resources/excel/monthWaterTemperature.xls | Bin 0 -> 20992 bytes .../src/main/resources/excel/rainExcerpt.xls | Bin 0 -> 20480 bytes .../resources/excel/rsverFloodExcerpt.xls | Bin 0 -> 20992 bytes .../resources/excel/sedimentConcentration.xls | Bin 0 -> 20992 bytes .../resources/excel/sedimentTransportRate.xls | Bin 0 -> 20992 bytes .../src/main/resources/excel/station.xls | Bin 0 -> 21504 bytes .../main/resources/excel/szFloodExcerpt.xls | Bin 0 -> 20992 bytes .../resources/excel/yearEvaporationWater.xls | Bin 0 -> 20992 bytes .../src/main/resources/excel/yearFlow.xls | Bin 0 -> 20992 bytes .../src/main/resources/excel/yearRain.xls | Bin 0 -> 20992 bytes .../main/resources/excel/yearTideLever.xls | Bin 0 -> 22528 bytes .../main/resources/excel/yearWaterLever.xls | Bin 0 -> 20992 bytes .../resources/excel/yearWaterTemperature.xls | Bin 0 -> 20992 bytes .../main/resources/i18n/messages.properties | 37 + ruoyi-admin/src/main/resources/logback.xml | 93 ++ .../main/resources/mybatis/mybatis-config.xml | 20 + .../service/impl/HyDpCServiceImplTest.java | 77 + ruoyi-api/pom.xml | 28 + ruoyi-common/pom.xml | 160 ++ .../ruoyi/common/annotation/DataScope.java | 28 + .../ruoyi/common/annotation/DataSource.java | 28 + .../com/ruoyi/common/annotation/Excel.java | 183 +++ .../com/ruoyi/common/annotation/Excels.java | 18 + .../java/com/ruoyi/common/annotation/Log.java | 46 + .../ruoyi/common/annotation/RateLimiter.java | 40 + .../ruoyi/common/annotation/RepeatSubmit.java | 31 + .../com/ruoyi/common/config/RuoYiConfig.java | 144 ++ .../com/ruoyi/common/constant/Constants.java | 189 +++ .../ruoyi/common/constant/GenConstants.java | 117 ++ .../com/ruoyi/common/constant/HttpStatus.java | 89 + .../common/constant/ScheduleConstants.java | 50 + .../ruoyi/common/constant/UserConstants.java | 78 + .../core/controller/BaseController.java | 186 +++ .../ruoyi/common/core/domain/AjaxResult.java | 162 ++ .../ruoyi/common/core/domain/BaseEntity.java | 114 ++ .../ruoyi/common/core/domain/TreeEntity.java | 79 + .../ruoyi/common/core/domain/TreeSelect.java | 77 + .../common/core/domain/entity/SysDept.java | 203 +++ .../core/domain/entity/SysDictData.java | 176 ++ .../core/domain/entity/SysDictType.java | 96 ++ .../common/core/domain/entity/SysMenu.java | 259 +++ .../common/core/domain/entity/SysRole.java | 226 +++ .../common/core/domain/entity/SysUser.java | 342 ++++ .../common/core/domain/model/LoginBody.java | 69 + .../common/core/domain/model/LoginUser.java | 266 +++ .../core/domain/model/RegisterBody.java | 11 + .../ruoyi/common/core/page/PageDomain.java | 101 ++ .../java/com/ruoyi/common/core/page/R.java | 66 + .../ruoyi/common/core/page/TableDataInfo.java | 85 + .../ruoyi/common/core/page/TableSupport.java | 56 + .../ruoyi/common/core/redis/RedisCache.java | 246 +++ .../ruoyi/common/core/text/CharsetKit.java | 86 + .../com/ruoyi/common/core/text/Convert.java | 1005 ++++++++++++ .../ruoyi/common/core/text/StrFormatter.java | 92 ++ .../ruoyi/common/enums/BusinessStatus.java | 20 + .../com/ruoyi/common/enums/BusinessType.java | 59 + .../ruoyi/common/enums/DataSourceType.java | 23 + .../com/ruoyi/common/enums/HttpMethod.java | 36 + .../com/ruoyi/common/enums/LimitType.java | 20 + .../com/ruoyi/common/enums/OperatorType.java | 24 + .../com/ruoyi/common/enums/UserStatus.java | 30 + .../common/exception/DemoModeException.java | 15 + .../common/exception/GlobalException.java | 58 + .../ruoyi/common/exception/RYException.java | 61 + .../common/exception/ServiceException.java | 73 + .../ruoyi/common/exception/UtilException.java | 26 + .../common/exception/base/BaseException.java | 97 ++ .../common/exception/file/FileException.java | 19 + .../FileNameLengthLimitExceededException.java | 16 + .../file/FileSizeLimitExceededException.java | 16 + .../file/InvalidExtensionException.java | 81 + .../common/exception/job/TaskException.java | 34 + .../exception/user/CaptchaException.java | 16 + .../user/CaptchaExpireException.java | 16 + .../common/exception/user/UserException.java | 18 + .../user/UserPasswordNotMatchException.java | 16 + .../ruoyi/common/filter/RepeatableFilter.java | 52 + .../filter/RepeatedlyRequestWrapper.java | 75 + .../com/ruoyi/common/filter/XssFilter.java | 74 + .../filter/XssHttpServletRequestWrapper.java | 111 ++ .../java/com/ruoyi/common/utils/Arith.java | 114 ++ .../java/com/ruoyi/common/utils/BeanUtil.java | 36 + .../ruoyi/common/utils/ClassReflection.java | 36 + .../com/ruoyi/common/utils/DateUtils.java | 187 +++ .../com/ruoyi/common/utils/DictUtils.java | 182 +++ .../com/ruoyi/common/utils/ExceptionUtil.java | 39 + .../java/com/ruoyi/common/utils/IPUtils.java | 91 ++ .../java/com/ruoyi/common/utils/LogUtils.java | 18 + .../com/ruoyi/common/utils/MessageUtils.java | 26 + .../com/ruoyi/common/utils/PageUtils.java | 35 + .../java/com/ruoyi/common/utils/Query.java | 75 + .../com/ruoyi/common/utils/SecurityUtils.java | 120 ++ .../com/ruoyi/common/utils/ServletUtils.java | 146 ++ .../com/ruoyi/common/utils/StringUtils.java | 583 +++++++ .../java/com/ruoyi/common/utils/Threads.java | 99 ++ .../ruoyi/common/utils/bean/BeanUtils.java | 110 ++ .../common/utils/bean/BeanValidators.java | 24 + .../common/utils/file/FileTypeUtils.java | 76 + .../common/utils/file/FileUploadUtils.java | 233 +++ .../ruoyi/common/utils/file/FileUtils.java | 293 ++++ .../ruoyi/common/utils/file/ImageUtils.java | 98 ++ .../common/utils/file/MimeTypeUtils.java | 59 + .../ruoyi/common/utils/html/EscapeUtil.java | 167 ++ .../ruoyi/common/utils/html/HTMLFilter.java | 570 +++++++ .../ruoyi/common/utils/http/HttpHelper.java | 55 + .../ruoyi/common/utils/http/HttpUtils.java | 274 ++++ .../ruoyi/common/utils/ip/AddressUtils.java | 55 + .../com/ruoyi/common/utils/ip/IpUtils.java | 264 +++ .../common/utils/poi/ExcelHandlerAdapter.java | 19 + .../com/ruoyi/common/utils/poi/ExcelUtil.java | 1432 +++++++++++++++++ .../common/utils/reflect/ReflectUtils.java | 410 +++++ .../com/ruoyi/common/utils/sign/Base64.java | 291 ++++ .../com/ruoyi/common/utils/sign/Md5Utils.java | 67 + .../com/ruoyi/common/utils/sign/RsaUtils.java | 163 ++ .../java/com/ruoyi/common/utils/sm3/SM3.java | 359 +++++ .../com/ruoyi/common/utils/sm3/SM3Digest.java | 134 ++ .../com/ruoyi/common/utils/sm3/SM3Utils.java | 23 + .../java/com/ruoyi/common/utils/sm3/SM4.java | 344 ++++ .../com/ruoyi/common/utils/sm3/SM4Utils.java | 186 +++ .../ruoyi/common/utils/sm3/SM4_Context.java | 17 + .../java/com/ruoyi/common/utils/sm3/Util.java | 662 ++++++++ .../common/utils/spring/SpringUtils.java | 146 ++ .../com/ruoyi/common/utils/sql/SqlUtil.java | 61 + .../com/ruoyi/common/utils/uuid/IdUtils.java | 49 + .../java/com/ruoyi/common/utils/uuid/Seq.java | 86 + .../com/ruoyi/common/utils/uuid/UUID.java | 484 ++++++ .../common/validator/ValidatorUtils.java | 84 + .../java/com/ruoyi/common/xss/SQLFilter.java | 51 + .../main/java/com/ruoyi/common/xss/Xss.java | 27 + .../com/ruoyi/common/xss/XssValidator.java | 34 + ruoyi-framework/pom.xml | 69 + .../framework/aspectj/DataScopeAspect.java | 149 ++ .../framework/aspectj/DataSourceAspect.java | 72 + .../ruoyi/framework/aspectj/LogAspect.java | 217 +++ .../framework/aspectj/RateLimiterAspect.java | 91 ++ .../framework/config/ApplicationConfig.java | 30 + .../ruoyi/framework/config/CaptchaConfig.java | 83 + .../ruoyi/framework/config/DruidConfig.java | 138 ++ .../config/FastJson2JsonRedisSerializer.java | 71 + .../ruoyi/framework/config/FilterConfig.java | 58 + .../framework/config/KaptchaTextCreator.java | 75 + .../framework/config/MybatisPlusConfig.java | 62 + .../ruoyi/framework/config/RedisConfig.java | 79 + .../framework/config/ResourcesConfig.java | 70 + .../framework/config/SecurityConfig.java | 145 ++ .../ruoyi/framework/config/ServerConfig.java | 32 + .../config/SlaveDataSourceConfig.java | 50 + .../framework/config/ThreadPoolConfig.java | 63 + .../config/properties/DruidProperties.java | 77 + .../datasource/DynamicDataSource.java | 26 + .../DynamicDataSourceContextHolder.java | 45 + .../interceptor/RepeatSubmitInterceptor.java | 55 + .../impl/SameUrlDataInterceptor.java | 110 ++ .../ruoyi/framework/manager/AsyncManager.java | 55 + .../framework/manager/ShutdownManager.java | 39 + .../manager/factory/AsyncFactory.java | 102 ++ .../filter/JwtAuthenticationTokenFilter.java | 44 + .../handle/AuthenticationEntryPointImpl.java | 34 + .../handle/LogoutSuccessHandlerImpl.java | 53 + .../ruoyi/framework/web/domain/Server.java | 240 +++ .../framework/web/domain/server/Cpu.java | 101 ++ .../framework/web/domain/server/Jvm.java | 130 ++ .../framework/web/domain/server/Mem.java | 61 + .../framework/web/domain/server/Sys.java | 84 + .../framework/web/domain/server/SysFile.java | 114 ++ .../web/exception/GlobalExceptionHandler.java | 114 ++ .../web/service/PermissionService.java | 165 ++ .../web/service/SysLoginService.java | 134 ++ .../web/service/SysPermissionService.java | 66 + .../web/service/SysRegisterService.java | 115 ++ .../web/service/ThirdLoginService.java | 172 ++ .../framework/web/service/TokenService.java | 245 +++ .../web/service/UserDetailsServiceImpl.java | 60 + ruoyi-generator/pom.xml | 40 + .../com/ruoyi/generator/config/GenConfig.java | 73 + .../generator/controller/GenController.java | 214 +++ .../com/ruoyi/generator/domain/GenTable.java | 372 +++++ .../generator/domain/GenTableColumn.java | 373 +++++ .../mapper/GenTableColumnMapper.java | 60 + .../generator/mapper/GenTableMapper.java | 83 + .../service/GenTableColumnServiceImpl.java | 68 + .../service/GenTableServiceImpl.java | 521 ++++++ .../service/IGenTableColumnService.java | 44 + .../generator/service/IGenTableService.java | 121 ++ .../com/ruoyi/generator/util/GenUtils.java | 257 +++ .../generator/util/VelocityInitializer.java | 34 + .../ruoyi/generator/util/VelocityUtils.java | 401 +++++ .../src/main/resources/generator.yml | 10 + .../mapper/generator/GenTableColumnMapper.xml | 127 ++ .../mapper/generator/GenTableMapper.xml | 202 +++ .../main/resources/vm/java/controller.java.vm | 106 ++ .../src/main/resources/vm/java/domain.java.vm | 52 + .../src/main/resources/vm/java/mapper.java.vm | 18 + .../main/resources/vm/java/service.java.vm | 21 + .../resources/vm/java/serviceImpl.java.vm | 33 + .../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 | 480 ++++++ .../src/main/resources/vm/vue/index.vue.vm | 541 +++++++ .../resources/vm/vue/v3/index-tree.vue.vm | 464 ++++++ .../src/main/resources/vm/vue/v3/index.vue.vm | 596 +++++++ .../src/main/resources/vm/vue/v3/readme.txt | 1 + .../src/main/resources/vm/xml/mapper.xml.vm | 7 + ruoyi-quartz/pom.xml | 46 + .../ruoyi/quartz/config/ScheduleConfig.java | 57 + .../quartz/controller/SysJobController.java | 185 +++ .../controller/SysJobLogController.java | 92 ++ .../java/com/ruoyi/quartz/domain/SysJob.java | 171 ++ .../com/ruoyi/quartz/domain/SysJobLog.java | 155 ++ .../ruoyi/quartz/mapper/SysJobLogMapper.java | 64 + .../com/ruoyi/quartz/mapper/SysJobMapper.java | 67 + .../quartz/service/ISysJobLogService.java | 56 + .../ruoyi/quartz/service/ISysJobService.java | 102 ++ .../service/impl/SysJobLogServiceImpl.java | 87 + .../service/impl/SysJobServiceImpl.java | 254 +++ .../java/com/ruoyi/quartz/task/RyTask.java | 29 + .../ruoyi/quartz/util/AbstractQuartzJob.java | 107 ++ .../java/com/ruoyi/quartz/util/CronUtils.java | 63 + .../com/ruoyi/quartz/util/JobInvokeUtil.java | 182 +++ .../QuartzDisallowConcurrentExecution.java | 21 + .../ruoyi/quartz/util/QuartzJobExecution.java | 19 + .../com/ruoyi/quartz/util/ScheduleUtils.java | 134 ++ .../mapper/quartz/SysJobLogMapper.xml | 93 ++ .../resources/mapper/quartz/SysJobMapper.xml | 111 ++ ruoyi-system/pom.xml | 28 + .../com/ruoyi/system/domain/SysConfig.java | 111 ++ .../ruoyi/system/domain/SysLogininfor.java | 144 ++ .../com/ruoyi/system/domain/SysNotice.java | 102 ++ .../com/ruoyi/system/domain/SysOperLog.java | 255 +++ .../java/com/ruoyi/system/domain/SysPost.java | 123 ++ .../com/ruoyi/system/domain/SysRoleDept.java | 46 + .../com/ruoyi/system/domain/SysRoleMenu.java | 46 + .../ruoyi/system/domain/SysUserOnline.java | 113 ++ .../com/ruoyi/system/domain/SysUserPost.java | 46 + .../com/ruoyi/system/domain/SysUserRole.java | 46 + .../com/ruoyi/system/domain/vo/MetaVo.java | 106 ++ .../com/ruoyi/system/domain/vo/RouterVo.java | 148 ++ .../ruoyi/system/mapper/SysConfigMapper.java | 70 + .../ruoyi/system/mapper/SysDeptMapper.java | 118 ++ .../system/mapper/SysDictDataMapper.java | 95 ++ .../system/mapper/SysDictTypeMapper.java | 85 + .../system/mapper/SysLogininforMapper.java | 42 + .../ruoyi/system/mapper/SysMenuMapper.java | 117 ++ .../ruoyi/system/mapper/SysNoticeMapper.java | 60 + .../ruoyi/system/mapper/SysOperLogMapper.java | 48 + .../ruoyi/system/mapper/SysPostMapper.java | 99 ++ .../system/mapper/SysRoleDeptMapper.java | 44 + .../ruoyi/system/mapper/SysRoleMapper.java | 107 ++ .../system/mapper/SysRoleMenuMapper.java | 44 + .../ruoyi/system/mapper/SysUserMapper.java | 127 ++ .../system/mapper/SysUserPostMapper.java | 44 + .../system/mapper/SysUserRoleMapper.java | 62 + .../system/service/ISysConfigService.java | 89 + .../ruoyi/system/service/ISysDeptService.java | 116 ++ .../system/service/ISysDictDataService.java | 60 + .../system/service/ISysDictTypeService.java | 98 ++ .../system/service/ISysLogininforService.java | 40 + .../ruoyi/system/service/ISysMenuService.java | 136 ++ .../system/service/ISysNoticeService.java | 60 + .../system/service/ISysOperLogService.java | 48 + .../ruoyi/system/service/ISysPostService.java | 99 ++ .../ruoyi/system/service/ISysRoleService.java | 173 ++ .../system/service/ISysUserOnlineService.java | 48 + .../ruoyi/system/service/ISysUserService.java | 206 +++ .../service/impl/SysConfigServiceImpl.java | 226 +++ .../service/impl/SysDeptServiceImpl.java | 329 ++++ .../service/impl/SysDictDataServiceImpl.java | 111 ++ .../service/impl/SysDictTypeServiceImpl.java | 223 +++ .../impl/SysLogininforServiceImpl.java | 65 + .../service/impl/SysMenuServiceImpl.java | 514 ++++++ .../service/impl/SysNoticeServiceImpl.java | 92 ++ .../service/impl/SysOperLogServiceImpl.java | 76 + .../service/impl/SysPostServiceImpl.java | 178 ++ .../service/impl/SysRoleServiceImpl.java | 424 +++++ .../impl/SysUserOnlineServiceImpl.java | 96 ++ .../service/impl/SysUserServiceImpl.java | 562 +++++++ .../mapper/system/SysConfigMapper.xml | 112 ++ .../resources/mapper/system/SysDeptMapper.xml | 157 ++ .../mapper/system/SysDictDataMapper.xml | 124 ++ .../mapper/system/SysDictTypeMapper.xml | 105 ++ .../mapper/system/SysLogininforMapper.xml | 57 + .../resources/mapper/system/SysMenuMapper.xml | 195 +++ .../mapper/system/SysNoticeMapper.xml | 89 + .../mapper/system/SysOperLogMapper.xml | 83 + .../resources/mapper/system/SysPostMapper.xml | 122 ++ .../mapper/system/SysRoleDeptMapper.xml | 34 + .../resources/mapper/system/SysRoleMapper.xml | 152 ++ .../mapper/system/SysRoleMenuMapper.xml | 34 + .../resources/mapper/system/SysUserMapper.xml | 221 +++ .../mapper/system/SysUserPostMapper.xml | 34 + .../mapper/system/SysUserRoleMapper.xml | 44 + ry.bat | 67 + ry.sh | 86 + sql/quartz.sql | 174 ++ sql/ry_20210908.sql | 688 ++++++++ swlscx/pom.xml | 33 + .../controller/BaseExportController.java | 37 + .../basic/controller/BaseInfoController.java | 68 + .../swlscx/basic/domain/bo/HyStscABo.java | 107 ++ .../ruoyi/swlscx/basic/domain/po/HyStscA.java | 68 + .../swlscx/basic/domain/po/YcExportTask.java | 54 + .../swlscx/basic/domain/vo/HyStscAVo.java | 105 ++ .../swlscx/basic/mapper/HyStscAMapper.java | 40 + .../basic/mapper/YcExportTaskMapper.java | 27 + .../swlscx/basic/service/HyStscAService.java | 42 + .../basic/service/YcExportTaskService.java | 26 + .../service/impl/HyStscAServiceImpl.java | 349 ++++ .../service/impl/YcExportTaskServiceImpl.java | 99 ++ .../com/ruoyi/swlscx/common/PageParams.java | 29 + .../com/ruoyi/swlscx/common/RequestVo.java | 27 + .../common/constants/SystemConstants.java | 12 + .../common/functions/ExcelGenerator.java | 16 + .../common/functions/ExcelGenerator2_1.java | 13 + .../common/functions/ExcelGenerator2_2.java | 13 + .../common/functions/ExcelGenerator3.java | 15 + .../swlscx/common/listener/ExcelListener.java | 52 + .../thread/CustomNameThreadFactory.java | 47 + .../swlscx/common/thread/ExportThread.java | 40 + .../common/thread/ExportThreadPoolConfig.java | 35 + .../swlscx/common/thread/ThreadConfig.java | 29 + .../swlscx/common/utils/CommonUtils.java | 67 + .../ruoyi/swlscx/common/utils/ExcelUtils.java | 412 +++++ .../ruoyi/swlscx/common/utils/FileUtil.java | 80 + .../utils/ImportDateToSqlserverDto.java | 30 + .../com/ruoyi/swlscx/common/utils/Query.java | 76 + .../day/controller/DayExportController.java | 112 ++ .../controller/DayImportToSoftController.java | 93 ++ .../day/controller/DayTableController.java | 127 ++ .../ruoyi/swlscx/day/domain/bo/HyDcsFBo.java | 43 + .../ruoyi/swlscx/day/domain/bo/HyDpCBo.java | 45 + .../ruoyi/swlscx/day/domain/bo/HyDqCBo.java | 44 + .../ruoyi/swlscx/day/domain/bo/HyDqsCBo.java | 46 + .../ruoyi/swlscx/day/domain/bo/HyDweCBo.java | 46 + .../ruoyi/swlscx/day/domain/bo/HyDwtCBo.java | 42 + .../ruoyi/swlscx/day/domain/bo/HyDzCBo.java | 44 + .../ruoyi/swlscx/day/domain/po/HyDcsF.java | 41 + .../com/ruoyi/swlscx/day/domain/po/HyDpC.java | 42 + .../com/ruoyi/swlscx/day/domain/po/HyDqC.java | 41 + .../ruoyi/swlscx/day/domain/po/HyDqsC.java | 46 + .../ruoyi/swlscx/day/domain/po/HyDweC.java | 46 + .../ruoyi/swlscx/day/domain/po/HyDwtC.java | 41 + .../com/ruoyi/swlscx/day/domain/po/HyDzC.java | 41 + .../ruoyi/swlscx/day/domain/vo/HyDcsFVo.java | 43 + .../ruoyi/swlscx/day/domain/vo/HyDpCVo.java | 45 + .../ruoyi/swlscx/day/domain/vo/HyDqCVo.java | 43 + .../ruoyi/swlscx/day/domain/vo/HyDweCVo.java | 49 + .../ruoyi/swlscx/day/domain/vo/HyDwtCVo.java | 43 + .../ruoyi/swlscx/day/domain/vo/HyDzCVo.java | 43 + .../ruoyi/swlscx/day/mapper/HyDcsFMapper.java | 38 + .../ruoyi/swlscx/day/mapper/HyDpCMapper.java | 37 + .../ruoyi/swlscx/day/mapper/HyDqCMapper.java | 36 + .../ruoyi/swlscx/day/mapper/HyDqsCMapper.java | 18 + .../ruoyi/swlscx/day/mapper/HyDweCMapper.java | 36 + .../ruoyi/swlscx/day/mapper/HyDwtCMapper.java | 26 + .../ruoyi/swlscx/day/mapper/HyDzCMapper.java | 34 + .../swlscx/day/service/HyDcsFService.java | 36 + .../swlscx/day/service/HyDpCService.java | 37 + .../swlscx/day/service/HyDqCService.java | 35 + .../swlscx/day/service/HyDqsCService.java | 19 + .../swlscx/day/service/HyDweCService.java | 35 + .../swlscx/day/service/HyDwtCService.java | 37 + .../swlscx/day/service/HyDzCService.java | 38 + .../day/service/impl/HyDcsFServiceImpl.java | 345 ++++ .../day/service/impl/HyDpCServiceImpl.java | 359 +++++ .../day/service/impl/HyDqCServiceImpl.java | 343 ++++ .../day/service/impl/HyDqsCServiceImpl.java | 52 + .../day/service/impl/HyDweCServiceImpl.java | 330 ++++ .../day/service/impl/HyDwtCServiceImpl.java | 311 ++++ .../day/service/impl/HyDzCServiceImpl.java | 354 ++++ .../controller/ExcerptExportController.java | 96 ++ .../controller/ExcerptImportController.java | 79 + .../controller/ExcerptTableController.java | 111 ++ .../swlscx/excerpt/domain/bo/HyFdheexBBo.java | 52 + .../swlscx/excerpt/domain/bo/HyHltdzBBo.java | 64 + .../swlscx/excerpt/domain/bo/HyPrexBBo.java | 46 + .../swlscx/excerpt/domain/bo/HyRvfhexBBo.java | 64 + .../swlscx/excerpt/domain/bo/HyWsfhexBBo.java | 67 + .../swlscx/excerpt/domain/po/HyFdheexB.java | 52 + .../swlscx/excerpt/domain/po/HyHltdzB.java | 61 + .../swlscx/excerpt/domain/po/HyPrexB.java | 48 + .../swlscx/excerpt/domain/po/HyRvfhexB.java | 61 + .../swlscx/excerpt/domain/po/HyWsfhexB.java | 61 + .../swlscx/excerpt/domain/vo/HyFdheexBVo.java | 57 + .../swlscx/excerpt/domain/vo/HyHltdzBVo.java | 64 + .../swlscx/excerpt/domain/vo/HyPrexBVo.java | 51 + .../swlscx/excerpt/domain/vo/HyRvfhexBVo.java | 65 + .../swlscx/excerpt/domain/vo/HyWsfhexBVo.java | 64 + .../excerpt/mapper/HyFdheexBMapper.java | 39 + .../swlscx/excerpt/mapper/HyHltdzBMapper.java | 34 + .../swlscx/excerpt/mapper/HyPrexBMapper.java | 40 + .../excerpt/mapper/HyRvfhexBMapper.java | 34 + .../excerpt/mapper/HyWsfhexBMapper.java | 36 + .../excerpt/service/HyFdheexBService.java | 37 + .../excerpt/service/HyHltdzBService.java | 38 + .../excerpt/service/HyPrexBService.java | 37 + .../excerpt/service/HyRvfhexBService.java | 36 + .../excerpt/service/HyWsfhexBService.java | 36 + .../service/impl/HyFdheexBServiceImpl.java | 359 +++++ .../service/impl/HyHltdzBServiceImpl.java | 363 +++++ .../service/impl/HyPrexBServiceImpl.java | 355 ++++ .../service/impl/HyRvfhexBServiceImpl.java | 359 +++++ .../service/impl/HyWsfhexBServiceImpl.java | 347 ++++ .../controller/MonthExportController.java | 136 ++ .../controller/MonthTableController.java | 110 ++ .../controller/MonthToSoftController.java | 93 ++ .../month/domain/bo/HyHmxpFExcelBo.java | 62 + .../swlscx/month/domain/bo/HyMtcsEBo.java | 85 + .../swlscx/month/domain/bo/HyMtpEBo.java | 83 + .../swlscx/month/domain/bo/HyMtpddbEBo.java | 47 + .../swlscx/month/domain/bo/HyMtqEBo.java | 86 + .../swlscx/month/domain/bo/HyMtqsEBo.java | 75 + .../swlscx/month/domain/bo/HyMttdzEBo.java | 361 +++++ .../swlscx/month/domain/bo/HyMtweEBo.java | 79 + .../swlscx/month/domain/bo/HyMtwtEBo.java | 85 + .../swlscx/month/domain/bo/HyMtzEBo.java | 87 + .../swlscx/month/domain/po/HyMtchpdE.java | 60 + .../ruoyi/swlscx/month/domain/po/HyMtcsE.java | 76 + .../ruoyi/swlscx/month/domain/po/HyMtiqE.java | 61 + .../ruoyi/swlscx/month/domain/po/HyMtpE.java | 270 ++++ .../swlscx/month/domain/po/HyMtpddbE.java | 49 + .../ruoyi/swlscx/month/domain/po/HyMtqE.java | 76 + .../ruoyi/swlscx/month/domain/po/HyMtqsE.java | 66 + .../swlscx/month/domain/po/HyMttdzE.java | 306 ++++ .../ruoyi/swlscx/month/domain/po/HyMtweE.java | 70 + .../ruoyi/swlscx/month/domain/po/HyMtwtE.java | 76 + .../ruoyi/swlscx/month/domain/po/HyMtzE.java | 292 ++++ .../swlscx/month/domain/vo/HyMptEVo.java | 39 + .../swlscx/month/domain/vo/HyMtcsEVo.java | 87 + .../swlscx/month/domain/vo/HyMtpEVo.java | 85 + .../swlscx/month/domain/vo/HyMtqEVo.java | 86 + .../swlscx/month/domain/vo/HyMtqsEVo.java | 79 + .../swlscx/month/domain/vo/HyMttdzEVo.java | 317 ++++ .../swlscx/month/domain/vo/HyMtweEVo.java | 81 + .../swlscx/month/domain/vo/HyMtwtEVo.java | 89 + .../swlscx/month/domain/vo/HyMtzEVo.java | 87 + .../swlscx/month/mapper/HyMtchpdEMapper.java | 20 + .../swlscx/month/mapper/HyMtcsEMapper.java | 34 + .../swlscx/month/mapper/HyMtiqEMapper.java | 20 + .../swlscx/month/mapper/HyMtpEMapper.java | 39 + .../swlscx/month/mapper/HyMtpddbEMapper.java | 20 + .../swlscx/month/mapper/HyMtqEMapper.java | 35 + .../swlscx/month/mapper/HyMtqsEMapper.java | 34 + .../swlscx/month/mapper/HyMttdzEMapper.java | 27 + .../swlscx/month/mapper/HyMtweEMapper.java | 37 + .../swlscx/month/mapper/HyMtwtEMapper.java | 37 + .../swlscx/month/mapper/HyMtzEMapper.java | 40 + .../month/service/HyMtchpdEService.java | 13 + .../swlscx/month/service/HyMtcsEService.java | 36 + .../swlscx/month/service/HyMtiqEService.java | 13 + .../swlscx/month/service/HyMtpEService.java | 38 + .../month/service/HyMtpddbEService.java | 19 + .../swlscx/month/service/HyMtqEService.java | 31 + .../swlscx/month/service/HyMtqsEService.java | 37 + .../swlscx/month/service/HyMttdzEService.java | 32 + .../swlscx/month/service/HyMtweEService.java | 36 + .../swlscx/month/service/HyMtwtEService.java | 37 + .../swlscx/month/service/HyMtzEService.java | 34 + .../service/impl/HyMtchpdEServiceImpl.java | 22 + .../service/impl/HyMtcsEServiceImpl.java | 363 +++++ .../service/impl/HyMtiqEServiceImpl.java | 22 + .../month/service/impl/HyMtpEServiceImpl.java | 359 +++++ .../service/impl/HyMtpddbEServiceImpl.java | 54 + .../month/service/impl/HyMtqEServiceImpl.java | 368 +++++ .../service/impl/HyMtqsEServiceImpl.java | 354 ++++ .../service/impl/HyMttdzEServiceImpl.java | 402 +++++ .../service/impl/HyMtweEServiceImpl.java | 355 ++++ .../service/impl/HyMtwtEServiceImpl.java | 360 +++++ .../month/service/impl/HyMtzEServiceImpl.java | 360 +++++ .../year/controller/YearExportController.java | 201 +++ .../YearImportToSoftController.java | 143 ++ .../year/controller/YearTableController.java | 184 +++ .../swlscx/year/domain/bo/HyDmxpFBo.java | 54 + .../swlscx/year/domain/bo/HyHmxpFBo.java | 35 + .../swlscx/year/domain/bo/HyImxfwFBo.java | 54 + .../swlscx/year/domain/bo/HyMmxpFBo.java | 54 + .../swlscx/year/domain/bo/HyYrcsFBo.java | 78 + .../ruoyi/swlscx/year/domain/bo/HyYrpFBo.java | 75 + .../ruoyi/swlscx/year/domain/bo/HyYrqFBo.java | 98 ++ .../swlscx/year/domain/bo/HyYrqsFBo.java | 97 ++ .../swlscx/year/domain/bo/HyYrtdzFBo.java | 353 ++++ .../swlscx/year/domain/bo/HyYrweFBo.java | 106 ++ .../swlscx/year/domain/bo/HyYrwtFBo.java | 75 + .../ruoyi/swlscx/year/domain/bo/HyYrzFBo.java | 76 + .../ruoyi/swlscx/year/domain/po/HyDmxpF.java | 51 + .../ruoyi/swlscx/year/domain/po/HyHmxpF.java | 63 + .../ruoyi/swlscx/year/domain/po/HyImxfwF.java | 51 + .../ruoyi/swlscx/year/domain/po/HyMmxpF.java | 51 + .../ruoyi/swlscx/year/domain/po/HyYrcsF.java | 71 + .../ruoyi/swlscx/year/domain/po/HyYrpF.java | 71 + .../ruoyi/swlscx/year/domain/po/HyYrqF.java | 91 ++ .../ruoyi/swlscx/year/domain/po/HyYrqsF.java | 91 ++ .../ruoyi/swlscx/year/domain/po/HyYrtdzF.java | 301 ++++ .../ruoyi/swlscx/year/domain/po/HyYrweF.java | 97 ++ .../ruoyi/swlscx/year/domain/po/HyYrwtF.java | 71 + .../ruoyi/swlscx/year/domain/po/HyYrzF.java | 71 + .../swlscx/year/domain/vo/HyDmxpFVo.java | 62 + .../swlscx/year/domain/vo/HyHmxpFVo.java | 70 + .../swlscx/year/domain/vo/HyImxfwFVo.java | 63 + .../swlscx/year/domain/vo/HyMmxpFVo.java | 63 + .../swlscx/year/domain/vo/HyYrcsFVo.java | 82 + .../ruoyi/swlscx/year/domain/vo/HyYrpFVo.java | 76 + .../ruoyi/swlscx/year/domain/vo/HyYrqFVo.java | 101 ++ .../swlscx/year/domain/vo/HyYrqsFVo.java | 102 ++ .../swlscx/year/domain/vo/HyYrtdzFVo.java | 310 ++++ .../swlscx/year/domain/vo/HyYrweFVo.java | 98 ++ .../swlscx/year/domain/vo/HyYrwtFVo.java | 74 + .../ruoyi/swlscx/year/domain/vo/HyYrzFVo.java | 80 + .../swlscx/year/mapper/HyDmxpFMapper.java | 33 + .../swlscx/year/mapper/HyHmxpFMapper.java | 42 + .../swlscx/year/mapper/HyImxfwFMapper.java | 37 + .../swlscx/year/mapper/HyMmxpFMapper.java | 37 + .../swlscx/year/mapper/HyYrcsFMapper.java | 37 + .../swlscx/year/mapper/HyYrpFMapper.java | 51 + .../swlscx/year/mapper/HyYrqFMapper.java | 34 + .../swlscx/year/mapper/HyYrqsFMapper.java | 37 + .../swlscx/year/mapper/HyYrtdzFMapper.java | 34 + .../swlscx/year/mapper/HyYrweFMapper.java | 36 + .../swlscx/year/mapper/HyYrwtFMapper.java | 37 + .../swlscx/year/mapper/HyYrzFMapper.java | 34 + .../swlscx/year/service/HyDmxpFService.java | 33 + .../swlscx/year/service/HyHmxpFService.java | 42 + .../swlscx/year/service/HyImxfwFService.java | 38 + .../swlscx/year/service/HyMmxpFService.java | 39 + .../swlscx/year/service/HyYrcsFService.java | 35 + .../swlscx/year/service/HyYrpFService.java | 32 + .../swlscx/year/service/HyYrqFService.java | 33 + .../swlscx/year/service/HyYrqsFService.java | 33 + .../swlscx/year/service/HyYrtdzFService.java | 33 + .../swlscx/year/service/HyYrweFService.java | 32 + .../swlscx/year/service/HyYrwtFService.java | 33 + .../swlscx/year/service/HyYrzFService.java | 35 + .../year/service/impl/HyDmxpFServiceImpl.java | 344 ++++ .../year/service/impl/HyHmxpFServiceImpl.java | 356 ++++ .../service/impl/HyImxfwFServiceImpl.java | 348 ++++ .../year/service/impl/HyMmxpFServiceImpl.java | 349 ++++ .../year/service/impl/HyYrcsFServiceImpl.java | 366 +++++ .../year/service/impl/HyYrpFServiceImpl.java | 364 +++++ .../year/service/impl/HyYrqFServiceImpl.java | 366 +++++ .../year/service/impl/HyYrqsFServiceImpl.java | 371 +++++ .../service/impl/HyYrtdzFServiceImpl.java | 481 ++++++ .../year/service/impl/HyYrweFServiceImpl.java | 375 +++++ .../year/service/impl/HyYrwtFServiceImpl.java | 356 ++++ .../year/service/impl/HyYrzFServiceImpl.java | 357 ++++ .../resources/mapper/basic/HyStscAMapper.xml | 112 ++ .../mapper/basic/YcExportTaskMapper.xml | 19 + .../resources/mapper/day/HyDcsFMapper.xml | 85 + .../main/resources/mapper/day/HyDpCMapper.xml | 79 + .../main/resources/mapper/day/HyDqCMapper.xml | 75 + .../resources/mapper/day/HyDqsCMapper.xml | 19 + .../resources/mapper/day/HyDweCMapper.xml | 70 + .../resources/mapper/day/HyDwtCMapper.xml | 33 + .../main/resources/mapper/day/HyDzCMapper.xml | 75 + .../mapper/excerpt/HyFdheexBMapper.xml | 82 + .../mapper/excerpt/HyHltdzBMapper.xml | 95 ++ .../mapper/excerpt/HyPrexBMapper.xml | 77 + .../mapper/excerpt/HyRvfhexBMapper.xml | 88 + .../mapper/excerpt/HyWsfhexBMapper.xml | 61 + .../mapper/month/HyMtchpdEMapper.xml | 23 + .../resources/mapper/month/HyMtcsEMapper.xml | 79 + .../resources/mapper/month/HyMtiqEMapper.xml | 23 + .../resources/mapper/month/HyMtpEMapper.xml | 98 ++ .../mapper/month/HyMtpddbEMapper.xml | 20 + .../resources/mapper/month/HyMtqEMapper.xml | 81 + .../resources/mapper/month/HyMtqsEMapper.xml | 83 + .../resources/mapper/month/HyMttdzEMapper.xml | 123 ++ .../resources/mapper/month/HyMtweEMapper.xml | 92 ++ .../resources/mapper/month/HyMtwtEMapper.xml | 80 + .../resources/mapper/month/HyMtzEMapper.xml | 97 ++ .../resources/mapper/year/HyDmxpFMapper.xml | 56 + .../resources/mapper/year/HyHmxpFMapper.xml | 62 + .../resources/mapper/year/HyImxfwFMapper.xml | 52 + .../resources/mapper/year/HyMmxpFMapper.xml | 65 + .../resources/mapper/year/HyYrcsFMapper.xml | 78 + .../resources/mapper/year/HyYrpFMapper.xml | 124 ++ .../resources/mapper/year/HyYrqFMapper.xml | 69 + .../resources/mapper/year/HyYrqsFMapper.xml | 73 + .../resources/mapper/year/HyYrtdzFMapper.xml | 65 + .../resources/mapper/year/HyYrweFMapper.xml | 140 ++ .../resources/mapper/year/HyYrwtFMapper.xml | 72 + .../resources/mapper/year/HyYrzFMapper.xml | 72 + 641 files changed, 68520 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.bat create mode 100644 doc/若依环境使用手册.docx create mode 100644 pom.xml create mode 100644 ruoyi-admin/pom.xml create mode 100644 ruoyi-admin/src/main/java/com/ruoyi/RuoYiApplication.java create mode 100644 ruoyi-admin/src/main/java/com/ruoyi/RuoYiServletInitializer.java create mode 100644 ruoyi-admin/src/main/java/com/ruoyi/web/controller/common/CaptchaController.java create mode 100644 ruoyi-admin/src/main/java/com/ruoyi/web/controller/common/CommonController.java create mode 100644 ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitor/CacheController.java create mode 100644 ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitor/ServerController.java create mode 100644 ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitor/SysLogininforController.java create mode 100644 ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitor/SysOperlogController.java create mode 100644 ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitor/SysUserOnlineController.java create mode 100644 ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/LoginSsoController.java create mode 100644 ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysConfigController.java create mode 100644 ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysDeptController.java create mode 100644 ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysDictDataController.java create mode 100644 ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysDictTypeController.java create mode 100644 ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysIndexController.java create mode 100644 ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysLoginController.java create mode 100644 ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysMenuController.java create mode 100644 ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysNoticeController.java create mode 100644 ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysPostController.java create mode 100644 ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysProfileController.java create mode 100644 ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysRegisterController.java create mode 100644 ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysRoleController.java create mode 100644 ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysUserController.java create mode 100644 ruoyi-admin/src/main/java/com/ruoyi/web/controller/tool/SwaggerController.java create mode 100644 ruoyi-admin/src/main/java/com/ruoyi/web/controller/tool/TestController.java create mode 100644 ruoyi-admin/src/main/java/com/ruoyi/web/core/config/SwaggerConfig.java create mode 100644 ruoyi-admin/src/main/resources/META-INF/spring-devtools.properties create mode 100644 ruoyi-admin/src/main/resources/application-druid.yml create mode 100644 ruoyi-admin/src/main/resources/application-test.yml create mode 100644 ruoyi-admin/src/main/resources/application.yml create mode 100644 ruoyi-admin/src/main/resources/banner.txt create mode 100644 ruoyi-admin/src/main/resources/excel/blank.xls create mode 100644 ruoyi-admin/src/main/resources/excel/dayEvaporationWater.xls create mode 100644 ruoyi-admin/src/main/resources/excel/dayFlow.xls create mode 100644 ruoyi-admin/src/main/resources/excel/dayMaxRain.xls create mode 100644 ruoyi-admin/src/main/resources/excel/dayRain.xls create mode 100644 ruoyi-admin/src/main/resources/excel/daySedimentConcentration.xls create mode 100644 ruoyi-admin/src/main/resources/excel/dayWaterLever.xls create mode 100644 ruoyi-admin/src/main/resources/excel/dayWaterTemperature.xls create mode 100644 ruoyi-admin/src/main/resources/excel/floodExcerpt.xls create mode 100644 ruoyi-admin/src/main/resources/excel/followingTheTideExcerpt.xls create mode 100644 ruoyi-admin/src/main/resources/excel/hourMaxRain.xls create mode 100644 ruoyi-admin/src/main/resources/excel/maxFloodScale.xls create mode 100644 ruoyi-admin/src/main/resources/excel/minMaxRain.xls create mode 100644 ruoyi-admin/src/main/resources/excel/momthSedimentTransportRate.xls create mode 100644 ruoyi-admin/src/main/resources/excel/monthEvaporationWater.xls create mode 100644 ruoyi-admin/src/main/resources/excel/monthFlow.xls create mode 100644 ruoyi-admin/src/main/resources/excel/monthRain.xls create mode 100644 ruoyi-admin/src/main/resources/excel/monthSedimentConcentration.xls create mode 100644 ruoyi-admin/src/main/resources/excel/monthTideLever.xls create mode 100644 ruoyi-admin/src/main/resources/excel/monthWaterLever.xls create mode 100644 ruoyi-admin/src/main/resources/excel/monthWaterTemperature.xls create mode 100644 ruoyi-admin/src/main/resources/excel/rainExcerpt.xls create mode 100644 ruoyi-admin/src/main/resources/excel/rsverFloodExcerpt.xls create mode 100644 ruoyi-admin/src/main/resources/excel/sedimentConcentration.xls create mode 100644 ruoyi-admin/src/main/resources/excel/sedimentTransportRate.xls create mode 100644 ruoyi-admin/src/main/resources/excel/station.xls create mode 100644 ruoyi-admin/src/main/resources/excel/szFloodExcerpt.xls create mode 100644 ruoyi-admin/src/main/resources/excel/yearEvaporationWater.xls create mode 100644 ruoyi-admin/src/main/resources/excel/yearFlow.xls create mode 100644 ruoyi-admin/src/main/resources/excel/yearRain.xls create mode 100644 ruoyi-admin/src/main/resources/excel/yearTideLever.xls create mode 100644 ruoyi-admin/src/main/resources/excel/yearWaterLever.xls create mode 100644 ruoyi-admin/src/main/resources/excel/yearWaterTemperature.xls create mode 100644 ruoyi-admin/src/main/resources/i18n/messages.properties create mode 100644 ruoyi-admin/src/main/resources/logback.xml create mode 100644 ruoyi-admin/src/main/resources/mybatis/mybatis-config.xml create mode 100644 ruoyi-admin/src/test/java/com/ruoyi/swlscx/day/service/impl/HyDpCServiceImplTest.java create mode 100644 ruoyi-api/pom.xml create mode 100644 ruoyi-common/pom.xml create mode 100644 ruoyi-common/src/main/java/com/ruoyi/common/annotation/DataScope.java create mode 100644 ruoyi-common/src/main/java/com/ruoyi/common/annotation/DataSource.java create mode 100644 ruoyi-common/src/main/java/com/ruoyi/common/annotation/Excel.java create mode 100644 ruoyi-common/src/main/java/com/ruoyi/common/annotation/Excels.java create mode 100644 ruoyi-common/src/main/java/com/ruoyi/common/annotation/Log.java create mode 100644 ruoyi-common/src/main/java/com/ruoyi/common/annotation/RateLimiter.java create mode 100644 ruoyi-common/src/main/java/com/ruoyi/common/annotation/RepeatSubmit.java create mode 100644 ruoyi-common/src/main/java/com/ruoyi/common/config/RuoYiConfig.java create mode 100644 ruoyi-common/src/main/java/com/ruoyi/common/constant/Constants.java create mode 100644 ruoyi-common/src/main/java/com/ruoyi/common/constant/GenConstants.java create mode 100644 ruoyi-common/src/main/java/com/ruoyi/common/constant/HttpStatus.java create mode 100644 ruoyi-common/src/main/java/com/ruoyi/common/constant/ScheduleConstants.java create mode 100644 ruoyi-common/src/main/java/com/ruoyi/common/constant/UserConstants.java create mode 100644 ruoyi-common/src/main/java/com/ruoyi/common/core/controller/BaseController.java create mode 100644 ruoyi-common/src/main/java/com/ruoyi/common/core/domain/AjaxResult.java create mode 100644 ruoyi-common/src/main/java/com/ruoyi/common/core/domain/BaseEntity.java create mode 100644 ruoyi-common/src/main/java/com/ruoyi/common/core/domain/TreeEntity.java create mode 100644 ruoyi-common/src/main/java/com/ruoyi/common/core/domain/TreeSelect.java create mode 100644 ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysDept.java create mode 100644 ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysDictData.java create mode 100644 ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysDictType.java create mode 100644 ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysMenu.java create mode 100644 ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysRole.java create mode 100644 ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysUser.java create mode 100644 ruoyi-common/src/main/java/com/ruoyi/common/core/domain/model/LoginBody.java create mode 100644 ruoyi-common/src/main/java/com/ruoyi/common/core/domain/model/LoginUser.java create mode 100644 ruoyi-common/src/main/java/com/ruoyi/common/core/domain/model/RegisterBody.java create mode 100644 ruoyi-common/src/main/java/com/ruoyi/common/core/page/PageDomain.java create mode 100644 ruoyi-common/src/main/java/com/ruoyi/common/core/page/R.java create mode 100644 ruoyi-common/src/main/java/com/ruoyi/common/core/page/TableDataInfo.java create mode 100644 ruoyi-common/src/main/java/com/ruoyi/common/core/page/TableSupport.java create mode 100644 ruoyi-common/src/main/java/com/ruoyi/common/core/redis/RedisCache.java create mode 100644 ruoyi-common/src/main/java/com/ruoyi/common/core/text/CharsetKit.java create mode 100644 ruoyi-common/src/main/java/com/ruoyi/common/core/text/Convert.java create mode 100644 ruoyi-common/src/main/java/com/ruoyi/common/core/text/StrFormatter.java create mode 100644 ruoyi-common/src/main/java/com/ruoyi/common/enums/BusinessStatus.java create mode 100644 ruoyi-common/src/main/java/com/ruoyi/common/enums/BusinessType.java create mode 100644 ruoyi-common/src/main/java/com/ruoyi/common/enums/DataSourceType.java create mode 100644 ruoyi-common/src/main/java/com/ruoyi/common/enums/HttpMethod.java create mode 100644 ruoyi-common/src/main/java/com/ruoyi/common/enums/LimitType.java create mode 100644 ruoyi-common/src/main/java/com/ruoyi/common/enums/OperatorType.java create mode 100644 ruoyi-common/src/main/java/com/ruoyi/common/enums/UserStatus.java create mode 100644 ruoyi-common/src/main/java/com/ruoyi/common/exception/DemoModeException.java create mode 100644 ruoyi-common/src/main/java/com/ruoyi/common/exception/GlobalException.java create mode 100644 ruoyi-common/src/main/java/com/ruoyi/common/exception/RYException.java create mode 100644 ruoyi-common/src/main/java/com/ruoyi/common/exception/ServiceException.java create mode 100644 ruoyi-common/src/main/java/com/ruoyi/common/exception/UtilException.java create mode 100644 ruoyi-common/src/main/java/com/ruoyi/common/exception/base/BaseException.java create mode 100644 ruoyi-common/src/main/java/com/ruoyi/common/exception/file/FileException.java create mode 100644 ruoyi-common/src/main/java/com/ruoyi/common/exception/file/FileNameLengthLimitExceededException.java create mode 100644 ruoyi-common/src/main/java/com/ruoyi/common/exception/file/FileSizeLimitExceededException.java create mode 100644 ruoyi-common/src/main/java/com/ruoyi/common/exception/file/InvalidExtensionException.java create mode 100644 ruoyi-common/src/main/java/com/ruoyi/common/exception/job/TaskException.java create mode 100644 ruoyi-common/src/main/java/com/ruoyi/common/exception/user/CaptchaException.java create mode 100644 ruoyi-common/src/main/java/com/ruoyi/common/exception/user/CaptchaExpireException.java create mode 100644 ruoyi-common/src/main/java/com/ruoyi/common/exception/user/UserException.java create mode 100644 ruoyi-common/src/main/java/com/ruoyi/common/exception/user/UserPasswordNotMatchException.java create mode 100644 ruoyi-common/src/main/java/com/ruoyi/common/filter/RepeatableFilter.java create mode 100644 ruoyi-common/src/main/java/com/ruoyi/common/filter/RepeatedlyRequestWrapper.java create mode 100644 ruoyi-common/src/main/java/com/ruoyi/common/filter/XssFilter.java create mode 100644 ruoyi-common/src/main/java/com/ruoyi/common/filter/XssHttpServletRequestWrapper.java create mode 100644 ruoyi-common/src/main/java/com/ruoyi/common/utils/Arith.java create mode 100644 ruoyi-common/src/main/java/com/ruoyi/common/utils/BeanUtil.java create mode 100644 ruoyi-common/src/main/java/com/ruoyi/common/utils/ClassReflection.java create mode 100644 ruoyi-common/src/main/java/com/ruoyi/common/utils/DateUtils.java create mode 100644 ruoyi-common/src/main/java/com/ruoyi/common/utils/DictUtils.java create mode 100644 ruoyi-common/src/main/java/com/ruoyi/common/utils/ExceptionUtil.java create mode 100644 ruoyi-common/src/main/java/com/ruoyi/common/utils/IPUtils.java create mode 100644 ruoyi-common/src/main/java/com/ruoyi/common/utils/LogUtils.java create mode 100644 ruoyi-common/src/main/java/com/ruoyi/common/utils/MessageUtils.java create mode 100644 ruoyi-common/src/main/java/com/ruoyi/common/utils/PageUtils.java create mode 100644 ruoyi-common/src/main/java/com/ruoyi/common/utils/Query.java create mode 100644 ruoyi-common/src/main/java/com/ruoyi/common/utils/SecurityUtils.java create mode 100644 ruoyi-common/src/main/java/com/ruoyi/common/utils/ServletUtils.java create mode 100644 ruoyi-common/src/main/java/com/ruoyi/common/utils/StringUtils.java create mode 100644 ruoyi-common/src/main/java/com/ruoyi/common/utils/Threads.java create mode 100644 ruoyi-common/src/main/java/com/ruoyi/common/utils/bean/BeanUtils.java create mode 100644 ruoyi-common/src/main/java/com/ruoyi/common/utils/bean/BeanValidators.java create mode 100644 ruoyi-common/src/main/java/com/ruoyi/common/utils/file/FileTypeUtils.java create mode 100644 ruoyi-common/src/main/java/com/ruoyi/common/utils/file/FileUploadUtils.java create mode 100644 ruoyi-common/src/main/java/com/ruoyi/common/utils/file/FileUtils.java create mode 100644 ruoyi-common/src/main/java/com/ruoyi/common/utils/file/ImageUtils.java create mode 100644 ruoyi-common/src/main/java/com/ruoyi/common/utils/file/MimeTypeUtils.java create mode 100644 ruoyi-common/src/main/java/com/ruoyi/common/utils/html/EscapeUtil.java create mode 100644 ruoyi-common/src/main/java/com/ruoyi/common/utils/html/HTMLFilter.java create mode 100644 ruoyi-common/src/main/java/com/ruoyi/common/utils/http/HttpHelper.java create mode 100644 ruoyi-common/src/main/java/com/ruoyi/common/utils/http/HttpUtils.java create mode 100644 ruoyi-common/src/main/java/com/ruoyi/common/utils/ip/AddressUtils.java create mode 100644 ruoyi-common/src/main/java/com/ruoyi/common/utils/ip/IpUtils.java create mode 100644 ruoyi-common/src/main/java/com/ruoyi/common/utils/poi/ExcelHandlerAdapter.java create mode 100644 ruoyi-common/src/main/java/com/ruoyi/common/utils/poi/ExcelUtil.java create mode 100644 ruoyi-common/src/main/java/com/ruoyi/common/utils/reflect/ReflectUtils.java create mode 100644 ruoyi-common/src/main/java/com/ruoyi/common/utils/sign/Base64.java create mode 100644 ruoyi-common/src/main/java/com/ruoyi/common/utils/sign/Md5Utils.java create mode 100644 ruoyi-common/src/main/java/com/ruoyi/common/utils/sign/RsaUtils.java create mode 100644 ruoyi-common/src/main/java/com/ruoyi/common/utils/sm3/SM3.java create mode 100644 ruoyi-common/src/main/java/com/ruoyi/common/utils/sm3/SM3Digest.java create mode 100644 ruoyi-common/src/main/java/com/ruoyi/common/utils/sm3/SM3Utils.java create mode 100644 ruoyi-common/src/main/java/com/ruoyi/common/utils/sm3/SM4.java create mode 100644 ruoyi-common/src/main/java/com/ruoyi/common/utils/sm3/SM4Utils.java create mode 100644 ruoyi-common/src/main/java/com/ruoyi/common/utils/sm3/SM4_Context.java create mode 100644 ruoyi-common/src/main/java/com/ruoyi/common/utils/sm3/Util.java create mode 100644 ruoyi-common/src/main/java/com/ruoyi/common/utils/spring/SpringUtils.java create mode 100644 ruoyi-common/src/main/java/com/ruoyi/common/utils/sql/SqlUtil.java create mode 100644 ruoyi-common/src/main/java/com/ruoyi/common/utils/uuid/IdUtils.java create mode 100644 ruoyi-common/src/main/java/com/ruoyi/common/utils/uuid/Seq.java create mode 100644 ruoyi-common/src/main/java/com/ruoyi/common/utils/uuid/UUID.java create mode 100644 ruoyi-common/src/main/java/com/ruoyi/common/validator/ValidatorUtils.java create mode 100644 ruoyi-common/src/main/java/com/ruoyi/common/xss/SQLFilter.java create mode 100644 ruoyi-common/src/main/java/com/ruoyi/common/xss/Xss.java create mode 100644 ruoyi-common/src/main/java/com/ruoyi/common/xss/XssValidator.java create mode 100644 ruoyi-framework/pom.xml create mode 100644 ruoyi-framework/src/main/java/com/ruoyi/framework/aspectj/DataScopeAspect.java create mode 100644 ruoyi-framework/src/main/java/com/ruoyi/framework/aspectj/DataSourceAspect.java create mode 100644 ruoyi-framework/src/main/java/com/ruoyi/framework/aspectj/LogAspect.java create mode 100644 ruoyi-framework/src/main/java/com/ruoyi/framework/aspectj/RateLimiterAspect.java create mode 100644 ruoyi-framework/src/main/java/com/ruoyi/framework/config/ApplicationConfig.java create mode 100644 ruoyi-framework/src/main/java/com/ruoyi/framework/config/CaptchaConfig.java create mode 100644 ruoyi-framework/src/main/java/com/ruoyi/framework/config/DruidConfig.java create mode 100644 ruoyi-framework/src/main/java/com/ruoyi/framework/config/FastJson2JsonRedisSerializer.java create mode 100644 ruoyi-framework/src/main/java/com/ruoyi/framework/config/FilterConfig.java create mode 100644 ruoyi-framework/src/main/java/com/ruoyi/framework/config/KaptchaTextCreator.java create mode 100644 ruoyi-framework/src/main/java/com/ruoyi/framework/config/MybatisPlusConfig.java create mode 100644 ruoyi-framework/src/main/java/com/ruoyi/framework/config/RedisConfig.java create mode 100644 ruoyi-framework/src/main/java/com/ruoyi/framework/config/ResourcesConfig.java create mode 100644 ruoyi-framework/src/main/java/com/ruoyi/framework/config/SecurityConfig.java create mode 100644 ruoyi-framework/src/main/java/com/ruoyi/framework/config/ServerConfig.java create mode 100644 ruoyi-framework/src/main/java/com/ruoyi/framework/config/SlaveDataSourceConfig.java create mode 100644 ruoyi-framework/src/main/java/com/ruoyi/framework/config/ThreadPoolConfig.java create mode 100644 ruoyi-framework/src/main/java/com/ruoyi/framework/config/properties/DruidProperties.java create mode 100644 ruoyi-framework/src/main/java/com/ruoyi/framework/datasource/DynamicDataSource.java create mode 100644 ruoyi-framework/src/main/java/com/ruoyi/framework/datasource/DynamicDataSourceContextHolder.java create mode 100644 ruoyi-framework/src/main/java/com/ruoyi/framework/interceptor/RepeatSubmitInterceptor.java create mode 100644 ruoyi-framework/src/main/java/com/ruoyi/framework/interceptor/impl/SameUrlDataInterceptor.java create mode 100644 ruoyi-framework/src/main/java/com/ruoyi/framework/manager/AsyncManager.java create mode 100644 ruoyi-framework/src/main/java/com/ruoyi/framework/manager/ShutdownManager.java create mode 100644 ruoyi-framework/src/main/java/com/ruoyi/framework/manager/factory/AsyncFactory.java create mode 100644 ruoyi-framework/src/main/java/com/ruoyi/framework/security/filter/JwtAuthenticationTokenFilter.java create mode 100644 ruoyi-framework/src/main/java/com/ruoyi/framework/security/handle/AuthenticationEntryPointImpl.java create mode 100644 ruoyi-framework/src/main/java/com/ruoyi/framework/security/handle/LogoutSuccessHandlerImpl.java create mode 100644 ruoyi-framework/src/main/java/com/ruoyi/framework/web/domain/Server.java create mode 100644 ruoyi-framework/src/main/java/com/ruoyi/framework/web/domain/server/Cpu.java create mode 100644 ruoyi-framework/src/main/java/com/ruoyi/framework/web/domain/server/Jvm.java create mode 100644 ruoyi-framework/src/main/java/com/ruoyi/framework/web/domain/server/Mem.java create mode 100644 ruoyi-framework/src/main/java/com/ruoyi/framework/web/domain/server/Sys.java create mode 100644 ruoyi-framework/src/main/java/com/ruoyi/framework/web/domain/server/SysFile.java create mode 100644 ruoyi-framework/src/main/java/com/ruoyi/framework/web/exception/GlobalExceptionHandler.java create mode 100644 ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/PermissionService.java create mode 100644 ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/SysLoginService.java create mode 100644 ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/SysPermissionService.java create mode 100644 ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/SysRegisterService.java create mode 100644 ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/ThirdLoginService.java create mode 100644 ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/TokenService.java create mode 100644 ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/UserDetailsServiceImpl.java create mode 100644 ruoyi-generator/pom.xml create mode 100644 ruoyi-generator/src/main/java/com/ruoyi/generator/config/GenConfig.java create mode 100644 ruoyi-generator/src/main/java/com/ruoyi/generator/controller/GenController.java create mode 100644 ruoyi-generator/src/main/java/com/ruoyi/generator/domain/GenTable.java create mode 100644 ruoyi-generator/src/main/java/com/ruoyi/generator/domain/GenTableColumn.java create mode 100644 ruoyi-generator/src/main/java/com/ruoyi/generator/mapper/GenTableColumnMapper.java create mode 100644 ruoyi-generator/src/main/java/com/ruoyi/generator/mapper/GenTableMapper.java create mode 100644 ruoyi-generator/src/main/java/com/ruoyi/generator/service/GenTableColumnServiceImpl.java create mode 100644 ruoyi-generator/src/main/java/com/ruoyi/generator/service/GenTableServiceImpl.java create mode 100644 ruoyi-generator/src/main/java/com/ruoyi/generator/service/IGenTableColumnService.java create mode 100644 ruoyi-generator/src/main/java/com/ruoyi/generator/service/IGenTableService.java create mode 100644 ruoyi-generator/src/main/java/com/ruoyi/generator/util/GenUtils.java create mode 100644 ruoyi-generator/src/main/java/com/ruoyi/generator/util/VelocityInitializer.java create mode 100644 ruoyi-generator/src/main/java/com/ruoyi/generator/util/VelocityUtils.java create mode 100644 ruoyi-generator/src/main/resources/generator.yml create mode 100644 ruoyi-generator/src/main/resources/mapper/generator/GenTableColumnMapper.xml create mode 100644 ruoyi-generator/src/main/resources/mapper/generator/GenTableMapper.xml create mode 100644 ruoyi-generator/src/main/resources/vm/java/controller.java.vm create mode 100644 ruoyi-generator/src/main/resources/vm/java/domain.java.vm create mode 100644 ruoyi-generator/src/main/resources/vm/java/mapper.java.vm create mode 100644 ruoyi-generator/src/main/resources/vm/java/service.java.vm create mode 100644 ruoyi-generator/src/main/resources/vm/java/serviceImpl.java.vm create mode 100644 ruoyi-generator/src/main/resources/vm/java/sub-domain.java.vm create mode 100644 ruoyi-generator/src/main/resources/vm/js/api.js.vm create mode 100644 ruoyi-generator/src/main/resources/vm/sql/sql.vm create mode 100644 ruoyi-generator/src/main/resources/vm/vue/index-tree.vue.vm create mode 100644 ruoyi-generator/src/main/resources/vm/vue/index.vue.vm create mode 100644 ruoyi-generator/src/main/resources/vm/vue/v3/index-tree.vue.vm create mode 100644 ruoyi-generator/src/main/resources/vm/vue/v3/index.vue.vm create mode 100644 ruoyi-generator/src/main/resources/vm/vue/v3/readme.txt create mode 100644 ruoyi-generator/src/main/resources/vm/xml/mapper.xml.vm create mode 100644 ruoyi-quartz/pom.xml create mode 100644 ruoyi-quartz/src/main/java/com/ruoyi/quartz/config/ScheduleConfig.java create mode 100644 ruoyi-quartz/src/main/java/com/ruoyi/quartz/controller/SysJobController.java create mode 100644 ruoyi-quartz/src/main/java/com/ruoyi/quartz/controller/SysJobLogController.java create mode 100644 ruoyi-quartz/src/main/java/com/ruoyi/quartz/domain/SysJob.java create mode 100644 ruoyi-quartz/src/main/java/com/ruoyi/quartz/domain/SysJobLog.java create mode 100644 ruoyi-quartz/src/main/java/com/ruoyi/quartz/mapper/SysJobLogMapper.java create mode 100644 ruoyi-quartz/src/main/java/com/ruoyi/quartz/mapper/SysJobMapper.java create mode 100644 ruoyi-quartz/src/main/java/com/ruoyi/quartz/service/ISysJobLogService.java create mode 100644 ruoyi-quartz/src/main/java/com/ruoyi/quartz/service/ISysJobService.java create mode 100644 ruoyi-quartz/src/main/java/com/ruoyi/quartz/service/impl/SysJobLogServiceImpl.java create mode 100644 ruoyi-quartz/src/main/java/com/ruoyi/quartz/service/impl/SysJobServiceImpl.java create mode 100644 ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/RyTask.java create mode 100644 ruoyi-quartz/src/main/java/com/ruoyi/quartz/util/AbstractQuartzJob.java create mode 100644 ruoyi-quartz/src/main/java/com/ruoyi/quartz/util/CronUtils.java create mode 100644 ruoyi-quartz/src/main/java/com/ruoyi/quartz/util/JobInvokeUtil.java create mode 100644 ruoyi-quartz/src/main/java/com/ruoyi/quartz/util/QuartzDisallowConcurrentExecution.java create mode 100644 ruoyi-quartz/src/main/java/com/ruoyi/quartz/util/QuartzJobExecution.java create mode 100644 ruoyi-quartz/src/main/java/com/ruoyi/quartz/util/ScheduleUtils.java create mode 100644 ruoyi-quartz/src/main/resources/mapper/quartz/SysJobLogMapper.xml create mode 100644 ruoyi-quartz/src/main/resources/mapper/quartz/SysJobMapper.xml create mode 100644 ruoyi-system/pom.xml create mode 100644 ruoyi-system/src/main/java/com/ruoyi/system/domain/SysConfig.java create mode 100644 ruoyi-system/src/main/java/com/ruoyi/system/domain/SysLogininfor.java create mode 100644 ruoyi-system/src/main/java/com/ruoyi/system/domain/SysNotice.java create mode 100644 ruoyi-system/src/main/java/com/ruoyi/system/domain/SysOperLog.java create mode 100644 ruoyi-system/src/main/java/com/ruoyi/system/domain/SysPost.java create mode 100644 ruoyi-system/src/main/java/com/ruoyi/system/domain/SysRoleDept.java create mode 100644 ruoyi-system/src/main/java/com/ruoyi/system/domain/SysRoleMenu.java create mode 100644 ruoyi-system/src/main/java/com/ruoyi/system/domain/SysUserOnline.java create mode 100644 ruoyi-system/src/main/java/com/ruoyi/system/domain/SysUserPost.java create mode 100644 ruoyi-system/src/main/java/com/ruoyi/system/domain/SysUserRole.java create mode 100644 ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/MetaVo.java create mode 100644 ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/RouterVo.java create mode 100644 ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysConfigMapper.java create mode 100644 ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysDeptMapper.java create mode 100644 ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysDictDataMapper.java create mode 100644 ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysDictTypeMapper.java create mode 100644 ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysLogininforMapper.java create mode 100644 ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysMenuMapper.java create mode 100644 ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysNoticeMapper.java create mode 100644 ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysOperLogMapper.java create mode 100644 ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysPostMapper.java create mode 100644 ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysRoleDeptMapper.java create mode 100644 ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysRoleMapper.java create mode 100644 ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysRoleMenuMapper.java create mode 100644 ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysUserMapper.java create mode 100644 ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysUserPostMapper.java create mode 100644 ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysUserRoleMapper.java create mode 100644 ruoyi-system/src/main/java/com/ruoyi/system/service/ISysConfigService.java create mode 100644 ruoyi-system/src/main/java/com/ruoyi/system/service/ISysDeptService.java create mode 100644 ruoyi-system/src/main/java/com/ruoyi/system/service/ISysDictDataService.java create mode 100644 ruoyi-system/src/main/java/com/ruoyi/system/service/ISysDictTypeService.java create mode 100644 ruoyi-system/src/main/java/com/ruoyi/system/service/ISysLogininforService.java create mode 100644 ruoyi-system/src/main/java/com/ruoyi/system/service/ISysMenuService.java create mode 100644 ruoyi-system/src/main/java/com/ruoyi/system/service/ISysNoticeService.java create mode 100644 ruoyi-system/src/main/java/com/ruoyi/system/service/ISysOperLogService.java create mode 100644 ruoyi-system/src/main/java/com/ruoyi/system/service/ISysPostService.java create mode 100644 ruoyi-system/src/main/java/com/ruoyi/system/service/ISysRoleService.java create mode 100644 ruoyi-system/src/main/java/com/ruoyi/system/service/ISysUserOnlineService.java create mode 100644 ruoyi-system/src/main/java/com/ruoyi/system/service/ISysUserService.java create mode 100644 ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysConfigServiceImpl.java create mode 100644 ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysDeptServiceImpl.java create mode 100644 ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysDictDataServiceImpl.java create mode 100644 ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysDictTypeServiceImpl.java create mode 100644 ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysLogininforServiceImpl.java create mode 100644 ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysMenuServiceImpl.java create mode 100644 ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysNoticeServiceImpl.java create mode 100644 ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysOperLogServiceImpl.java create mode 100644 ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysPostServiceImpl.java create mode 100644 ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysRoleServiceImpl.java create mode 100644 ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserOnlineServiceImpl.java create mode 100644 ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java create mode 100644 ruoyi-system/src/main/resources/mapper/system/SysConfigMapper.xml create mode 100644 ruoyi-system/src/main/resources/mapper/system/SysDeptMapper.xml create mode 100644 ruoyi-system/src/main/resources/mapper/system/SysDictDataMapper.xml create mode 100644 ruoyi-system/src/main/resources/mapper/system/SysDictTypeMapper.xml create mode 100644 ruoyi-system/src/main/resources/mapper/system/SysLogininforMapper.xml create mode 100644 ruoyi-system/src/main/resources/mapper/system/SysMenuMapper.xml create mode 100644 ruoyi-system/src/main/resources/mapper/system/SysNoticeMapper.xml create mode 100644 ruoyi-system/src/main/resources/mapper/system/SysOperLogMapper.xml create mode 100644 ruoyi-system/src/main/resources/mapper/system/SysPostMapper.xml create mode 100644 ruoyi-system/src/main/resources/mapper/system/SysRoleDeptMapper.xml create mode 100644 ruoyi-system/src/main/resources/mapper/system/SysRoleMapper.xml create mode 100644 ruoyi-system/src/main/resources/mapper/system/SysRoleMenuMapper.xml create mode 100644 ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml create mode 100644 ruoyi-system/src/main/resources/mapper/system/SysUserPostMapper.xml create mode 100644 ruoyi-system/src/main/resources/mapper/system/SysUserRoleMapper.xml create mode 100644 ry.bat create mode 100644 ry.sh create mode 100644 sql/quartz.sql create mode 100644 sql/ry_20210908.sql create mode 100644 swlscx/pom.xml create mode 100644 swlscx/src/main/java/com/ruoyi/swlscx/basic/controller/BaseExportController.java create mode 100644 swlscx/src/main/java/com/ruoyi/swlscx/basic/controller/BaseInfoController.java create mode 100644 swlscx/src/main/java/com/ruoyi/swlscx/basic/domain/bo/HyStscABo.java create mode 100644 swlscx/src/main/java/com/ruoyi/swlscx/basic/domain/po/HyStscA.java create mode 100644 swlscx/src/main/java/com/ruoyi/swlscx/basic/domain/po/YcExportTask.java create mode 100644 swlscx/src/main/java/com/ruoyi/swlscx/basic/domain/vo/HyStscAVo.java create mode 100644 swlscx/src/main/java/com/ruoyi/swlscx/basic/mapper/HyStscAMapper.java create mode 100644 swlscx/src/main/java/com/ruoyi/swlscx/basic/mapper/YcExportTaskMapper.java create mode 100644 swlscx/src/main/java/com/ruoyi/swlscx/basic/service/HyStscAService.java create mode 100644 swlscx/src/main/java/com/ruoyi/swlscx/basic/service/YcExportTaskService.java create mode 100644 swlscx/src/main/java/com/ruoyi/swlscx/basic/service/impl/HyStscAServiceImpl.java create mode 100644 swlscx/src/main/java/com/ruoyi/swlscx/basic/service/impl/YcExportTaskServiceImpl.java create mode 100644 swlscx/src/main/java/com/ruoyi/swlscx/common/PageParams.java create mode 100644 swlscx/src/main/java/com/ruoyi/swlscx/common/RequestVo.java create mode 100644 swlscx/src/main/java/com/ruoyi/swlscx/common/constants/SystemConstants.java create mode 100644 swlscx/src/main/java/com/ruoyi/swlscx/common/functions/ExcelGenerator.java create mode 100644 swlscx/src/main/java/com/ruoyi/swlscx/common/functions/ExcelGenerator2_1.java create mode 100644 swlscx/src/main/java/com/ruoyi/swlscx/common/functions/ExcelGenerator2_2.java create mode 100644 swlscx/src/main/java/com/ruoyi/swlscx/common/functions/ExcelGenerator3.java create mode 100644 swlscx/src/main/java/com/ruoyi/swlscx/common/listener/ExcelListener.java create mode 100644 swlscx/src/main/java/com/ruoyi/swlscx/common/thread/CustomNameThreadFactory.java create mode 100644 swlscx/src/main/java/com/ruoyi/swlscx/common/thread/ExportThread.java create mode 100644 swlscx/src/main/java/com/ruoyi/swlscx/common/thread/ExportThreadPoolConfig.java create mode 100644 swlscx/src/main/java/com/ruoyi/swlscx/common/thread/ThreadConfig.java create mode 100644 swlscx/src/main/java/com/ruoyi/swlscx/common/utils/CommonUtils.java create mode 100644 swlscx/src/main/java/com/ruoyi/swlscx/common/utils/ExcelUtils.java create mode 100644 swlscx/src/main/java/com/ruoyi/swlscx/common/utils/FileUtil.java create mode 100644 swlscx/src/main/java/com/ruoyi/swlscx/common/utils/ImportDateToSqlserverDto.java create mode 100644 swlscx/src/main/java/com/ruoyi/swlscx/common/utils/Query.java create mode 100644 swlscx/src/main/java/com/ruoyi/swlscx/day/controller/DayExportController.java create mode 100644 swlscx/src/main/java/com/ruoyi/swlscx/day/controller/DayImportToSoftController.java create mode 100644 swlscx/src/main/java/com/ruoyi/swlscx/day/controller/DayTableController.java create mode 100644 swlscx/src/main/java/com/ruoyi/swlscx/day/domain/bo/HyDcsFBo.java create mode 100644 swlscx/src/main/java/com/ruoyi/swlscx/day/domain/bo/HyDpCBo.java create mode 100644 swlscx/src/main/java/com/ruoyi/swlscx/day/domain/bo/HyDqCBo.java create mode 100644 swlscx/src/main/java/com/ruoyi/swlscx/day/domain/bo/HyDqsCBo.java create mode 100644 swlscx/src/main/java/com/ruoyi/swlscx/day/domain/bo/HyDweCBo.java create mode 100644 swlscx/src/main/java/com/ruoyi/swlscx/day/domain/bo/HyDwtCBo.java create mode 100644 swlscx/src/main/java/com/ruoyi/swlscx/day/domain/bo/HyDzCBo.java create mode 100644 swlscx/src/main/java/com/ruoyi/swlscx/day/domain/po/HyDcsF.java create mode 100644 swlscx/src/main/java/com/ruoyi/swlscx/day/domain/po/HyDpC.java create mode 100644 swlscx/src/main/java/com/ruoyi/swlscx/day/domain/po/HyDqC.java create mode 100644 swlscx/src/main/java/com/ruoyi/swlscx/day/domain/po/HyDqsC.java create mode 100644 swlscx/src/main/java/com/ruoyi/swlscx/day/domain/po/HyDweC.java create mode 100644 swlscx/src/main/java/com/ruoyi/swlscx/day/domain/po/HyDwtC.java create mode 100644 swlscx/src/main/java/com/ruoyi/swlscx/day/domain/po/HyDzC.java create mode 100644 swlscx/src/main/java/com/ruoyi/swlscx/day/domain/vo/HyDcsFVo.java create mode 100644 swlscx/src/main/java/com/ruoyi/swlscx/day/domain/vo/HyDpCVo.java create mode 100644 swlscx/src/main/java/com/ruoyi/swlscx/day/domain/vo/HyDqCVo.java create mode 100644 swlscx/src/main/java/com/ruoyi/swlscx/day/domain/vo/HyDweCVo.java create mode 100644 swlscx/src/main/java/com/ruoyi/swlscx/day/domain/vo/HyDwtCVo.java create mode 100644 swlscx/src/main/java/com/ruoyi/swlscx/day/domain/vo/HyDzCVo.java create mode 100644 swlscx/src/main/java/com/ruoyi/swlscx/day/mapper/HyDcsFMapper.java create mode 100644 swlscx/src/main/java/com/ruoyi/swlscx/day/mapper/HyDpCMapper.java create mode 100644 swlscx/src/main/java/com/ruoyi/swlscx/day/mapper/HyDqCMapper.java create mode 100644 swlscx/src/main/java/com/ruoyi/swlscx/day/mapper/HyDqsCMapper.java create mode 100644 swlscx/src/main/java/com/ruoyi/swlscx/day/mapper/HyDweCMapper.java create mode 100644 swlscx/src/main/java/com/ruoyi/swlscx/day/mapper/HyDwtCMapper.java create mode 100644 swlscx/src/main/java/com/ruoyi/swlscx/day/mapper/HyDzCMapper.java create mode 100644 swlscx/src/main/java/com/ruoyi/swlscx/day/service/HyDcsFService.java create mode 100644 swlscx/src/main/java/com/ruoyi/swlscx/day/service/HyDpCService.java create mode 100644 swlscx/src/main/java/com/ruoyi/swlscx/day/service/HyDqCService.java create mode 100644 swlscx/src/main/java/com/ruoyi/swlscx/day/service/HyDqsCService.java create mode 100644 swlscx/src/main/java/com/ruoyi/swlscx/day/service/HyDweCService.java create mode 100644 swlscx/src/main/java/com/ruoyi/swlscx/day/service/HyDwtCService.java create mode 100644 swlscx/src/main/java/com/ruoyi/swlscx/day/service/HyDzCService.java create mode 100644 swlscx/src/main/java/com/ruoyi/swlscx/day/service/impl/HyDcsFServiceImpl.java create mode 100644 swlscx/src/main/java/com/ruoyi/swlscx/day/service/impl/HyDpCServiceImpl.java create mode 100644 swlscx/src/main/java/com/ruoyi/swlscx/day/service/impl/HyDqCServiceImpl.java create mode 100644 swlscx/src/main/java/com/ruoyi/swlscx/day/service/impl/HyDqsCServiceImpl.java create mode 100644 swlscx/src/main/java/com/ruoyi/swlscx/day/service/impl/HyDweCServiceImpl.java create mode 100644 swlscx/src/main/java/com/ruoyi/swlscx/day/service/impl/HyDwtCServiceImpl.java create mode 100644 swlscx/src/main/java/com/ruoyi/swlscx/day/service/impl/HyDzCServiceImpl.java create mode 100644 swlscx/src/main/java/com/ruoyi/swlscx/excerpt/controller/ExcerptExportController.java create mode 100644 swlscx/src/main/java/com/ruoyi/swlscx/excerpt/controller/ExcerptImportController.java create mode 100644 swlscx/src/main/java/com/ruoyi/swlscx/excerpt/controller/ExcerptTableController.java create mode 100644 swlscx/src/main/java/com/ruoyi/swlscx/excerpt/domain/bo/HyFdheexBBo.java create mode 100644 swlscx/src/main/java/com/ruoyi/swlscx/excerpt/domain/bo/HyHltdzBBo.java create mode 100644 swlscx/src/main/java/com/ruoyi/swlscx/excerpt/domain/bo/HyPrexBBo.java create mode 100644 swlscx/src/main/java/com/ruoyi/swlscx/excerpt/domain/bo/HyRvfhexBBo.java create mode 100644 swlscx/src/main/java/com/ruoyi/swlscx/excerpt/domain/bo/HyWsfhexBBo.java create mode 100644 swlscx/src/main/java/com/ruoyi/swlscx/excerpt/domain/po/HyFdheexB.java create mode 100644 swlscx/src/main/java/com/ruoyi/swlscx/excerpt/domain/po/HyHltdzB.java create mode 100644 swlscx/src/main/java/com/ruoyi/swlscx/excerpt/domain/po/HyPrexB.java create mode 100644 swlscx/src/main/java/com/ruoyi/swlscx/excerpt/domain/po/HyRvfhexB.java create mode 100644 swlscx/src/main/java/com/ruoyi/swlscx/excerpt/domain/po/HyWsfhexB.java create mode 100644 swlscx/src/main/java/com/ruoyi/swlscx/excerpt/domain/vo/HyFdheexBVo.java create mode 100644 swlscx/src/main/java/com/ruoyi/swlscx/excerpt/domain/vo/HyHltdzBVo.java create mode 100644 swlscx/src/main/java/com/ruoyi/swlscx/excerpt/domain/vo/HyPrexBVo.java create mode 100644 swlscx/src/main/java/com/ruoyi/swlscx/excerpt/domain/vo/HyRvfhexBVo.java create mode 100644 swlscx/src/main/java/com/ruoyi/swlscx/excerpt/domain/vo/HyWsfhexBVo.java create mode 100644 swlscx/src/main/java/com/ruoyi/swlscx/excerpt/mapper/HyFdheexBMapper.java create mode 100644 swlscx/src/main/java/com/ruoyi/swlscx/excerpt/mapper/HyHltdzBMapper.java create mode 100644 swlscx/src/main/java/com/ruoyi/swlscx/excerpt/mapper/HyPrexBMapper.java create mode 100644 swlscx/src/main/java/com/ruoyi/swlscx/excerpt/mapper/HyRvfhexBMapper.java create mode 100644 swlscx/src/main/java/com/ruoyi/swlscx/excerpt/mapper/HyWsfhexBMapper.java create mode 100644 swlscx/src/main/java/com/ruoyi/swlscx/excerpt/service/HyFdheexBService.java create mode 100644 swlscx/src/main/java/com/ruoyi/swlscx/excerpt/service/HyHltdzBService.java create mode 100644 swlscx/src/main/java/com/ruoyi/swlscx/excerpt/service/HyPrexBService.java create mode 100644 swlscx/src/main/java/com/ruoyi/swlscx/excerpt/service/HyRvfhexBService.java create mode 100644 swlscx/src/main/java/com/ruoyi/swlscx/excerpt/service/HyWsfhexBService.java create mode 100644 swlscx/src/main/java/com/ruoyi/swlscx/excerpt/service/impl/HyFdheexBServiceImpl.java create mode 100644 swlscx/src/main/java/com/ruoyi/swlscx/excerpt/service/impl/HyHltdzBServiceImpl.java create mode 100644 swlscx/src/main/java/com/ruoyi/swlscx/excerpt/service/impl/HyPrexBServiceImpl.java create mode 100644 swlscx/src/main/java/com/ruoyi/swlscx/excerpt/service/impl/HyRvfhexBServiceImpl.java create mode 100644 swlscx/src/main/java/com/ruoyi/swlscx/excerpt/service/impl/HyWsfhexBServiceImpl.java create mode 100644 swlscx/src/main/java/com/ruoyi/swlscx/month/controller/MonthExportController.java create mode 100644 swlscx/src/main/java/com/ruoyi/swlscx/month/controller/MonthTableController.java create mode 100644 swlscx/src/main/java/com/ruoyi/swlscx/month/controller/MonthToSoftController.java create mode 100644 swlscx/src/main/java/com/ruoyi/swlscx/month/domain/bo/HyHmxpFExcelBo.java create mode 100644 swlscx/src/main/java/com/ruoyi/swlscx/month/domain/bo/HyMtcsEBo.java create mode 100644 swlscx/src/main/java/com/ruoyi/swlscx/month/domain/bo/HyMtpEBo.java create mode 100644 swlscx/src/main/java/com/ruoyi/swlscx/month/domain/bo/HyMtpddbEBo.java create mode 100644 swlscx/src/main/java/com/ruoyi/swlscx/month/domain/bo/HyMtqEBo.java create mode 100644 swlscx/src/main/java/com/ruoyi/swlscx/month/domain/bo/HyMtqsEBo.java create mode 100644 swlscx/src/main/java/com/ruoyi/swlscx/month/domain/bo/HyMttdzEBo.java create mode 100644 swlscx/src/main/java/com/ruoyi/swlscx/month/domain/bo/HyMtweEBo.java create mode 100644 swlscx/src/main/java/com/ruoyi/swlscx/month/domain/bo/HyMtwtEBo.java create mode 100644 swlscx/src/main/java/com/ruoyi/swlscx/month/domain/bo/HyMtzEBo.java create mode 100644 swlscx/src/main/java/com/ruoyi/swlscx/month/domain/po/HyMtchpdE.java create mode 100644 swlscx/src/main/java/com/ruoyi/swlscx/month/domain/po/HyMtcsE.java create mode 100644 swlscx/src/main/java/com/ruoyi/swlscx/month/domain/po/HyMtiqE.java create mode 100644 swlscx/src/main/java/com/ruoyi/swlscx/month/domain/po/HyMtpE.java create mode 100644 swlscx/src/main/java/com/ruoyi/swlscx/month/domain/po/HyMtpddbE.java create mode 100644 swlscx/src/main/java/com/ruoyi/swlscx/month/domain/po/HyMtqE.java create mode 100644 swlscx/src/main/java/com/ruoyi/swlscx/month/domain/po/HyMtqsE.java create mode 100644 swlscx/src/main/java/com/ruoyi/swlscx/month/domain/po/HyMttdzE.java create mode 100644 swlscx/src/main/java/com/ruoyi/swlscx/month/domain/po/HyMtweE.java create mode 100644 swlscx/src/main/java/com/ruoyi/swlscx/month/domain/po/HyMtwtE.java create mode 100644 swlscx/src/main/java/com/ruoyi/swlscx/month/domain/po/HyMtzE.java create mode 100644 swlscx/src/main/java/com/ruoyi/swlscx/month/domain/vo/HyMptEVo.java create mode 100644 swlscx/src/main/java/com/ruoyi/swlscx/month/domain/vo/HyMtcsEVo.java create mode 100644 swlscx/src/main/java/com/ruoyi/swlscx/month/domain/vo/HyMtpEVo.java create mode 100644 swlscx/src/main/java/com/ruoyi/swlscx/month/domain/vo/HyMtqEVo.java create mode 100644 swlscx/src/main/java/com/ruoyi/swlscx/month/domain/vo/HyMtqsEVo.java create mode 100644 swlscx/src/main/java/com/ruoyi/swlscx/month/domain/vo/HyMttdzEVo.java create mode 100644 swlscx/src/main/java/com/ruoyi/swlscx/month/domain/vo/HyMtweEVo.java create mode 100644 swlscx/src/main/java/com/ruoyi/swlscx/month/domain/vo/HyMtwtEVo.java create mode 100644 swlscx/src/main/java/com/ruoyi/swlscx/month/domain/vo/HyMtzEVo.java create mode 100644 swlscx/src/main/java/com/ruoyi/swlscx/month/mapper/HyMtchpdEMapper.java create mode 100644 swlscx/src/main/java/com/ruoyi/swlscx/month/mapper/HyMtcsEMapper.java create mode 100644 swlscx/src/main/java/com/ruoyi/swlscx/month/mapper/HyMtiqEMapper.java create mode 100644 swlscx/src/main/java/com/ruoyi/swlscx/month/mapper/HyMtpEMapper.java create mode 100644 swlscx/src/main/java/com/ruoyi/swlscx/month/mapper/HyMtpddbEMapper.java create mode 100644 swlscx/src/main/java/com/ruoyi/swlscx/month/mapper/HyMtqEMapper.java create mode 100644 swlscx/src/main/java/com/ruoyi/swlscx/month/mapper/HyMtqsEMapper.java create mode 100644 swlscx/src/main/java/com/ruoyi/swlscx/month/mapper/HyMttdzEMapper.java create mode 100644 swlscx/src/main/java/com/ruoyi/swlscx/month/mapper/HyMtweEMapper.java create mode 100644 swlscx/src/main/java/com/ruoyi/swlscx/month/mapper/HyMtwtEMapper.java create mode 100644 swlscx/src/main/java/com/ruoyi/swlscx/month/mapper/HyMtzEMapper.java create mode 100644 swlscx/src/main/java/com/ruoyi/swlscx/month/service/HyMtchpdEService.java create mode 100644 swlscx/src/main/java/com/ruoyi/swlscx/month/service/HyMtcsEService.java create mode 100644 swlscx/src/main/java/com/ruoyi/swlscx/month/service/HyMtiqEService.java create mode 100644 swlscx/src/main/java/com/ruoyi/swlscx/month/service/HyMtpEService.java create mode 100644 swlscx/src/main/java/com/ruoyi/swlscx/month/service/HyMtpddbEService.java create mode 100644 swlscx/src/main/java/com/ruoyi/swlscx/month/service/HyMtqEService.java create mode 100644 swlscx/src/main/java/com/ruoyi/swlscx/month/service/HyMtqsEService.java create mode 100644 swlscx/src/main/java/com/ruoyi/swlscx/month/service/HyMttdzEService.java create mode 100644 swlscx/src/main/java/com/ruoyi/swlscx/month/service/HyMtweEService.java create mode 100644 swlscx/src/main/java/com/ruoyi/swlscx/month/service/HyMtwtEService.java create mode 100644 swlscx/src/main/java/com/ruoyi/swlscx/month/service/HyMtzEService.java create mode 100644 swlscx/src/main/java/com/ruoyi/swlscx/month/service/impl/HyMtchpdEServiceImpl.java create mode 100644 swlscx/src/main/java/com/ruoyi/swlscx/month/service/impl/HyMtcsEServiceImpl.java create mode 100644 swlscx/src/main/java/com/ruoyi/swlscx/month/service/impl/HyMtiqEServiceImpl.java create mode 100644 swlscx/src/main/java/com/ruoyi/swlscx/month/service/impl/HyMtpEServiceImpl.java create mode 100644 swlscx/src/main/java/com/ruoyi/swlscx/month/service/impl/HyMtpddbEServiceImpl.java create mode 100644 swlscx/src/main/java/com/ruoyi/swlscx/month/service/impl/HyMtqEServiceImpl.java create mode 100644 swlscx/src/main/java/com/ruoyi/swlscx/month/service/impl/HyMtqsEServiceImpl.java create mode 100644 swlscx/src/main/java/com/ruoyi/swlscx/month/service/impl/HyMttdzEServiceImpl.java create mode 100644 swlscx/src/main/java/com/ruoyi/swlscx/month/service/impl/HyMtweEServiceImpl.java create mode 100644 swlscx/src/main/java/com/ruoyi/swlscx/month/service/impl/HyMtwtEServiceImpl.java create mode 100644 swlscx/src/main/java/com/ruoyi/swlscx/month/service/impl/HyMtzEServiceImpl.java create mode 100644 swlscx/src/main/java/com/ruoyi/swlscx/year/controller/YearExportController.java create mode 100644 swlscx/src/main/java/com/ruoyi/swlscx/year/controller/YearImportToSoftController.java create mode 100644 swlscx/src/main/java/com/ruoyi/swlscx/year/controller/YearTableController.java create mode 100644 swlscx/src/main/java/com/ruoyi/swlscx/year/domain/bo/HyDmxpFBo.java create mode 100644 swlscx/src/main/java/com/ruoyi/swlscx/year/domain/bo/HyHmxpFBo.java create mode 100644 swlscx/src/main/java/com/ruoyi/swlscx/year/domain/bo/HyImxfwFBo.java create mode 100644 swlscx/src/main/java/com/ruoyi/swlscx/year/domain/bo/HyMmxpFBo.java create mode 100644 swlscx/src/main/java/com/ruoyi/swlscx/year/domain/bo/HyYrcsFBo.java create mode 100644 swlscx/src/main/java/com/ruoyi/swlscx/year/domain/bo/HyYrpFBo.java create mode 100644 swlscx/src/main/java/com/ruoyi/swlscx/year/domain/bo/HyYrqFBo.java create mode 100644 swlscx/src/main/java/com/ruoyi/swlscx/year/domain/bo/HyYrqsFBo.java create mode 100644 swlscx/src/main/java/com/ruoyi/swlscx/year/domain/bo/HyYrtdzFBo.java create mode 100644 swlscx/src/main/java/com/ruoyi/swlscx/year/domain/bo/HyYrweFBo.java create mode 100644 swlscx/src/main/java/com/ruoyi/swlscx/year/domain/bo/HyYrwtFBo.java create mode 100644 swlscx/src/main/java/com/ruoyi/swlscx/year/domain/bo/HyYrzFBo.java create mode 100644 swlscx/src/main/java/com/ruoyi/swlscx/year/domain/po/HyDmxpF.java create mode 100644 swlscx/src/main/java/com/ruoyi/swlscx/year/domain/po/HyHmxpF.java create mode 100644 swlscx/src/main/java/com/ruoyi/swlscx/year/domain/po/HyImxfwF.java create mode 100644 swlscx/src/main/java/com/ruoyi/swlscx/year/domain/po/HyMmxpF.java create mode 100644 swlscx/src/main/java/com/ruoyi/swlscx/year/domain/po/HyYrcsF.java create mode 100644 swlscx/src/main/java/com/ruoyi/swlscx/year/domain/po/HyYrpF.java create mode 100644 swlscx/src/main/java/com/ruoyi/swlscx/year/domain/po/HyYrqF.java create mode 100644 swlscx/src/main/java/com/ruoyi/swlscx/year/domain/po/HyYrqsF.java create mode 100644 swlscx/src/main/java/com/ruoyi/swlscx/year/domain/po/HyYrtdzF.java create mode 100644 swlscx/src/main/java/com/ruoyi/swlscx/year/domain/po/HyYrweF.java create mode 100644 swlscx/src/main/java/com/ruoyi/swlscx/year/domain/po/HyYrwtF.java create mode 100644 swlscx/src/main/java/com/ruoyi/swlscx/year/domain/po/HyYrzF.java create mode 100644 swlscx/src/main/java/com/ruoyi/swlscx/year/domain/vo/HyDmxpFVo.java create mode 100644 swlscx/src/main/java/com/ruoyi/swlscx/year/domain/vo/HyHmxpFVo.java create mode 100644 swlscx/src/main/java/com/ruoyi/swlscx/year/domain/vo/HyImxfwFVo.java create mode 100644 swlscx/src/main/java/com/ruoyi/swlscx/year/domain/vo/HyMmxpFVo.java create mode 100644 swlscx/src/main/java/com/ruoyi/swlscx/year/domain/vo/HyYrcsFVo.java create mode 100644 swlscx/src/main/java/com/ruoyi/swlscx/year/domain/vo/HyYrpFVo.java create mode 100644 swlscx/src/main/java/com/ruoyi/swlscx/year/domain/vo/HyYrqFVo.java create mode 100644 swlscx/src/main/java/com/ruoyi/swlscx/year/domain/vo/HyYrqsFVo.java create mode 100644 swlscx/src/main/java/com/ruoyi/swlscx/year/domain/vo/HyYrtdzFVo.java create mode 100644 swlscx/src/main/java/com/ruoyi/swlscx/year/domain/vo/HyYrweFVo.java create mode 100644 swlscx/src/main/java/com/ruoyi/swlscx/year/domain/vo/HyYrwtFVo.java create mode 100644 swlscx/src/main/java/com/ruoyi/swlscx/year/domain/vo/HyYrzFVo.java create mode 100644 swlscx/src/main/java/com/ruoyi/swlscx/year/mapper/HyDmxpFMapper.java create mode 100644 swlscx/src/main/java/com/ruoyi/swlscx/year/mapper/HyHmxpFMapper.java create mode 100644 swlscx/src/main/java/com/ruoyi/swlscx/year/mapper/HyImxfwFMapper.java create mode 100644 swlscx/src/main/java/com/ruoyi/swlscx/year/mapper/HyMmxpFMapper.java create mode 100644 swlscx/src/main/java/com/ruoyi/swlscx/year/mapper/HyYrcsFMapper.java create mode 100644 swlscx/src/main/java/com/ruoyi/swlscx/year/mapper/HyYrpFMapper.java create mode 100644 swlscx/src/main/java/com/ruoyi/swlscx/year/mapper/HyYrqFMapper.java create mode 100644 swlscx/src/main/java/com/ruoyi/swlscx/year/mapper/HyYrqsFMapper.java create mode 100644 swlscx/src/main/java/com/ruoyi/swlscx/year/mapper/HyYrtdzFMapper.java create mode 100644 swlscx/src/main/java/com/ruoyi/swlscx/year/mapper/HyYrweFMapper.java create mode 100644 swlscx/src/main/java/com/ruoyi/swlscx/year/mapper/HyYrwtFMapper.java create mode 100644 swlscx/src/main/java/com/ruoyi/swlscx/year/mapper/HyYrzFMapper.java create mode 100644 swlscx/src/main/java/com/ruoyi/swlscx/year/service/HyDmxpFService.java create mode 100644 swlscx/src/main/java/com/ruoyi/swlscx/year/service/HyHmxpFService.java create mode 100644 swlscx/src/main/java/com/ruoyi/swlscx/year/service/HyImxfwFService.java create mode 100644 swlscx/src/main/java/com/ruoyi/swlscx/year/service/HyMmxpFService.java create mode 100644 swlscx/src/main/java/com/ruoyi/swlscx/year/service/HyYrcsFService.java create mode 100644 swlscx/src/main/java/com/ruoyi/swlscx/year/service/HyYrpFService.java create mode 100644 swlscx/src/main/java/com/ruoyi/swlscx/year/service/HyYrqFService.java create mode 100644 swlscx/src/main/java/com/ruoyi/swlscx/year/service/HyYrqsFService.java create mode 100644 swlscx/src/main/java/com/ruoyi/swlscx/year/service/HyYrtdzFService.java create mode 100644 swlscx/src/main/java/com/ruoyi/swlscx/year/service/HyYrweFService.java create mode 100644 swlscx/src/main/java/com/ruoyi/swlscx/year/service/HyYrwtFService.java create mode 100644 swlscx/src/main/java/com/ruoyi/swlscx/year/service/HyYrzFService.java create mode 100644 swlscx/src/main/java/com/ruoyi/swlscx/year/service/impl/HyDmxpFServiceImpl.java create mode 100644 swlscx/src/main/java/com/ruoyi/swlscx/year/service/impl/HyHmxpFServiceImpl.java create mode 100644 swlscx/src/main/java/com/ruoyi/swlscx/year/service/impl/HyImxfwFServiceImpl.java create mode 100644 swlscx/src/main/java/com/ruoyi/swlscx/year/service/impl/HyMmxpFServiceImpl.java create mode 100644 swlscx/src/main/java/com/ruoyi/swlscx/year/service/impl/HyYrcsFServiceImpl.java create mode 100644 swlscx/src/main/java/com/ruoyi/swlscx/year/service/impl/HyYrpFServiceImpl.java create mode 100644 swlscx/src/main/java/com/ruoyi/swlscx/year/service/impl/HyYrqFServiceImpl.java create mode 100644 swlscx/src/main/java/com/ruoyi/swlscx/year/service/impl/HyYrqsFServiceImpl.java create mode 100644 swlscx/src/main/java/com/ruoyi/swlscx/year/service/impl/HyYrtdzFServiceImpl.java create mode 100644 swlscx/src/main/java/com/ruoyi/swlscx/year/service/impl/HyYrweFServiceImpl.java create mode 100644 swlscx/src/main/java/com/ruoyi/swlscx/year/service/impl/HyYrwtFServiceImpl.java create mode 100644 swlscx/src/main/java/com/ruoyi/swlscx/year/service/impl/HyYrzFServiceImpl.java create mode 100644 swlscx/src/main/resources/mapper/basic/HyStscAMapper.xml create mode 100644 swlscx/src/main/resources/mapper/basic/YcExportTaskMapper.xml create mode 100644 swlscx/src/main/resources/mapper/day/HyDcsFMapper.xml create mode 100644 swlscx/src/main/resources/mapper/day/HyDpCMapper.xml create mode 100644 swlscx/src/main/resources/mapper/day/HyDqCMapper.xml create mode 100644 swlscx/src/main/resources/mapper/day/HyDqsCMapper.xml create mode 100644 swlscx/src/main/resources/mapper/day/HyDweCMapper.xml create mode 100644 swlscx/src/main/resources/mapper/day/HyDwtCMapper.xml create mode 100644 swlscx/src/main/resources/mapper/day/HyDzCMapper.xml create mode 100644 swlscx/src/main/resources/mapper/excerpt/HyFdheexBMapper.xml create mode 100644 swlscx/src/main/resources/mapper/excerpt/HyHltdzBMapper.xml create mode 100644 swlscx/src/main/resources/mapper/excerpt/HyPrexBMapper.xml create mode 100644 swlscx/src/main/resources/mapper/excerpt/HyRvfhexBMapper.xml create mode 100644 swlscx/src/main/resources/mapper/excerpt/HyWsfhexBMapper.xml create mode 100644 swlscx/src/main/resources/mapper/month/HyMtchpdEMapper.xml create mode 100644 swlscx/src/main/resources/mapper/month/HyMtcsEMapper.xml create mode 100644 swlscx/src/main/resources/mapper/month/HyMtiqEMapper.xml create mode 100644 swlscx/src/main/resources/mapper/month/HyMtpEMapper.xml create mode 100644 swlscx/src/main/resources/mapper/month/HyMtpddbEMapper.xml create mode 100644 swlscx/src/main/resources/mapper/month/HyMtqEMapper.xml create mode 100644 swlscx/src/main/resources/mapper/month/HyMtqsEMapper.xml create mode 100644 swlscx/src/main/resources/mapper/month/HyMttdzEMapper.xml create mode 100644 swlscx/src/main/resources/mapper/month/HyMtweEMapper.xml create mode 100644 swlscx/src/main/resources/mapper/month/HyMtwtEMapper.xml create mode 100644 swlscx/src/main/resources/mapper/month/HyMtzEMapper.xml create mode 100644 swlscx/src/main/resources/mapper/year/HyDmxpFMapper.xml create mode 100644 swlscx/src/main/resources/mapper/year/HyHmxpFMapper.xml create mode 100644 swlscx/src/main/resources/mapper/year/HyImxfwFMapper.xml create mode 100644 swlscx/src/main/resources/mapper/year/HyMmxpFMapper.xml create mode 100644 swlscx/src/main/resources/mapper/year/HyYrcsFMapper.xml create mode 100644 swlscx/src/main/resources/mapper/year/HyYrpFMapper.xml create mode 100644 swlscx/src/main/resources/mapper/year/HyYrqFMapper.xml create mode 100644 swlscx/src/main/resources/mapper/year/HyYrqsFMapper.xml create mode 100644 swlscx/src/main/resources/mapper/year/HyYrtdzFMapper.xml create mode 100644 swlscx/src/main/resources/mapper/year/HyYrweFMapper.xml create mode 100644 swlscx/src/main/resources/mapper/year/HyYrwtFMapper.xml create mode 100644 swlscx/src/main/resources/mapper/year/HyYrzFMapper.xml diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..ed8368a --- /dev/null +++ b/.gitignore @@ -0,0 +1,47 @@ +###################################################################### +# 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 diff --git a/LICENSE b/LICENSE new file mode 100644 index 0000000..8564f29 --- /dev/null +++ b/LICENSE @@ -0,0 +1,20 @@ +The MIT License (MIT) + +Copyright (c) 2018 RuoYi + +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. \ No newline at end of file diff --git a/README.md b/README.md new file mode 100644 index 0000000..ba50d3e --- /dev/null +++ b/README.md @@ -0,0 +1,97 @@ +

+ logo +

+

RuoYi v3.8.2

+

基于SpringBoot+Vue前后端分离的Java快速开发框架

+

+ + + +

+ +## 平台简介 + +若依是一套全部开源的快速开发平台，毫无保留给个人及企业免费使用。 + +* 前端采用Vue、Element UI。 +* 后端采用Spring Boot、Spring Security、Redis & Jwt。 +* 权限认证使用Jwt，支持多终端认证系统。 +* 支持加载动态权限菜单，多方式轻松权限控制。 +* 高效率开发，使用代码生成器可以一键生成前后端代码。 +* 提供了技术栈（[Vue3](https://v3.cn.vuejs.org) [Element Plus](https://element-plus.org/zh-CN) [Vite](https://cn.vitejs.dev)）版本[RuoYi-Vue3](https://github.com/yangzongzhuan/RuoYi-Vue3)，保持同步更新。 +* 提供了单应用版本[RuoYi-Vue-fast](https://github.com/yangzongzhuan/RuoYi-Vue-fast)，Oracle版本[RuoYi-Vue-Oracle](https://github.com/yangzongzhuan/RuoYi-Vue-Oracle)，保持同步更新。 +* 不分离版本，请移步[RuoYi](https://gitee.com/y_project/RuoYi)，微服务版本，请移步[RuoYi-Cloud](https://gitee.com/y_project/RuoYi-Cloud) +* 特别鸣谢：[element](https://github.com/ElemeFE/element)，[vue-element-admin](https://github.com/PanJiaChen/vue-element-admin)，[eladmin-web](https://github.com/elunez/eladmin-web)。 +* 阿里云折扣场：[点我进入](http://aly.ruoyi.vip)，腾讯云秒杀场：[点我进入](http://txy.ruoyi.vip)   +* 阿里云优惠券：[点我领取](https://www.aliyun.com/minisite/goods?userCode=brki8iof&share_source=copy_link)，腾讯云优惠券：[点我领取](https://cloud.tencent.com/redirect.php?redirect=1025&cps_key=198c8df2ed259157187173bc7f4f32fd&from=console)   + +## 内置功能 + +1. 用户管理：用户是系统操作者，该功能主要完成系统用户配置。 +2. 部门管理：配置系统组织机构（公司、部门、小组），树结构展现支持数据权限。 +3. 岗位管理：配置系统用户所属担任职务。 +4. 菜单管理：配置系统菜单，操作权限，按钮权限标识等。 +5. 角色管理：角色菜单权限分配、设置角色按机构进行数据范围权限划分。 +6. 字典管理：对系统中经常使用的一些较为固定的数据进行维护。 +7. 参数管理：对系统动态配置常用参数。 +8. 通知公告：系统通知公告信息发布维护。 +9. 操作日志：系统正常操作日志记录和查询；系统异常信息日志记录和查询。 +10. 登录日志：系统登录日志记录查询包含登录异常。 +11. 在线用户：当前系统中活跃用户状态监控。 +12. 定时任务：在线（添加、修改、删除)任务调度包含执行结果日志。 +13. 代码生成：前后端代码的生成（java、html、xml、sql）支持CRUD下载 。 +14. 系统接口：根据业务代码自动生成相关的api接口文档。 +15. 服务监控：监视当前系统CPU、内存、磁盘、堆栈等相关信息。 +16. 缓存监控：对系统的缓存信息查询，命令统计等。 +17. 在线构建器：拖动表单元素生成相应的HTML代码。 +18. 连接池监视：监视当前系统数据库连接池状态，可进行分析SQL找出系统性能瓶颈。 + +## 在线体验 + +- admin/admin123 +- 陆陆续续收到一些打赏，为了更好的体验已用于演示服务器升级。谢谢各位小伙伴。 + +演示地址：http://vue.ruoyi.vip +文档地址：http://doc.ruoyi.vip + +## 演示图 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ + +## 若依前后端分离交流群 + +QQ群： [![加入QQ群](https://img.shields.io/badge/已满-937441-blue.svg)](https://jq.qq.com/?_wv=1027&k=5bVB1og) [![加入QQ群](https://img.shields.io/badge/已满-887144332-blue.svg)](https://jq.qq.com/?_wv=1027&k=5eiA4DH) [![加入QQ群](https://img.shields.io/badge/已满-180251782-blue.svg)](https://jq.qq.com/?_wv=1027&k=5AxMKlC) [![加入QQ群](https://img.shields.io/badge/已满-104180207-blue.svg)](https://jq.qq.com/?_wv=1027&k=51G72yr) [![加入QQ群](https://img.shields.io/badge/已满-186866453-blue.svg)](https://jq.qq.com/?_wv=1027&k=VvjN2nvu) [![加入QQ群](https://img.shields.io/badge/已满-201396349-blue.svg)](https://jq.qq.com/?_wv=1027&k=5vYAqA05) [![加入QQ群](https://img.shields.io/badge/已满-101456076-blue.svg)](https://jq.qq.com/?_wv=1027&k=kOIINEb5) [![加入QQ群](https://img.shields.io/badge/已满-101539465-blue.svg)](https://jq.qq.com/?_wv=1027&k=UKtX5jhs) [![加入QQ群](https://img.shields.io/badge/已满-264312783-blue.svg)](https://jq.qq.com/?_wv=1027&k=EI9an8lJ) [![加入QQ群](https://img.shields.io/badge/167385320-blue.svg)](https://jq.qq.com/?_wv=1027&k=SWCtLnMz) 点击按钮入群。 \ 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.bat b/bin/run.bat new file mode 100644 index 0000000..41efbd0 --- /dev/null +++ b/bin/run.bat @@ -0,0 +1,14 @@ +@echo off +echo. +echo [Ϣ] ʹJarWeb̡ +echo. + +cd %~dp0 +cd ../ruoyi-admin/target + +set JAVA_OPTS=-Xms256m -Xmx1024m -XX:MetaspaceSize=128m -XX:MaxMetaspaceSize=512m + +java -jar %JAVA_OPTS% ruoyi-admin.jar + +cd bin +pause \ No newline at end of file diff --git a/doc/若依环境使用手册.docx b/doc/若依环境使用手册.docx new file mode 100644 index 0000000000000000000000000000000000000000..9e4daef4d9be2e445419109a02eaf321cd4d537e GIT binary patch literal 428430 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 +HtCx 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 Rli)_iWGz7fMupr%QDEgRC> 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%0DfC-!Au^tv1-R|XemvERC8O1`5!u;Z5%iD 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

K#u)l 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

)q;tSdIrAwYxlSM|Hl};Y` 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 literal 0 HcmV?d00001 diff --git a/pom.xml b/pom.xml new file mode 100644 index 0000000..0758b18 --- /dev/null +++ b/pom.xml @@ -0,0 +1,265 @@ + + + 4.0.0 + + com.ruoyi + ruoyi + 3.8.1 + + ruoyi + http://www.ruoyi.vip + 若依管理系统 + + + 3.8.1 + UTF-8 + UTF-8 + 1.8 + 3.1.1 + 1.2.8 + 1.21 + 3.0.0 + 2.3.2 + 3.4.2 + 1.4.1 + 1.2.80 + 6.1.6 + 2.11.0 + 1.4 + 3.2.2 + 4.1.2 + 2.3 + 0.9.1 + + + + + + + + + org.springframework.boot + spring-boot-dependencies + 2.5.13 + pom + import + + + + + + + + com.alibaba + druid-spring-boot-starter + ${druid.version} + + + + + eu.bitwalker + UserAgentUtils + ${bitwalker.version} + + + + + + + + + + + + com.github.pagehelper + pagehelper-spring-boot-starter + ${pagehelper.boot.version} + + + + + com.github.oshi + oshi-core + ${oshi.version} + + + + + io.springfox + springfox-boot-starter + ${swagger.version} + + + io.swagger + swagger-models + + + + + + + commons-io + commons-io + ${commons.io.version} + + + + + commons-fileupload + commons-fileupload + ${commons.fileupload.version} + + + + + org.apache.poi + poi-ooxml + ${poi.version} + + + + + org.apache.velocity + velocity-engine-core + ${velocity.version} + + + + + commons-collections + commons-collections + ${commons.collections.version} + + + + + com.alibaba + fastjson + ${fastjson.version} + + + + + io.jsonwebtoken + jjwt + ${jwt.version} + + + + + com.github.penggle + kaptcha + ${kaptcha.version} + + + + + com.ruoyi + ruoyi-quartz + ${ruoyi.version} + + + + + com.ruoyi + ruoyi-generator + ${ruoyi.version} + + + + + com.ruoyi + ruoyi-framework + ${ruoyi.version} + + + + + com.ruoyi + ruoyi-system + ${ruoyi.version} + + + + + + com.ruoyi + swlscx + ${ruoyi.version} + + + + + com.ruoyi + ruoyi-common + ${ruoyi.version} + + + + com.ruoyi + ruoyi-api + ${ruoyi.version} + + + + + + ruoyi-admin + ruoyi-framework + ruoyi-system + ruoyi-quartz + ruoyi-generator + ruoyi-common + ruoyi-api + swlscx + + pom + + + + + + + + + + org.apache.maven.plugins + maven-compiler-plugin + 3.1 + + ${java.version} + ${java.version} + ${project.build.sourceEncoding} + + + + + + + + public + aliyun nexus + https://maven.aliyun.com/repository/public + + true + + + + + + + public + aliyun nexus + https://maven.aliyun.com/repository/public + + true + + + false + + + + + diff --git a/ruoyi-admin/pom.xml b/ruoyi-admin/pom.xml new file mode 100644 index 0000000..b6995f6 --- /dev/null +++ b/ruoyi-admin/pom.xml @@ -0,0 +1,135 @@ + + + + ruoyi + com.ruoyi + 3.8.1 + + 4.0.0 + jar + ruoyi-admin + + + web服务入口 + + + + + + + org.springframework.boot + spring-boot-devtools + true + + + + + io.springfox + springfox-boot-starter + + + + + + com.ruoyi + swlscx + + + + + io.swagger + swagger-models + 1.6.2 + + + + + mysql + mysql-connector-java + + + + + com.ruoyi + ruoyi-framework + + + + com.microsoft.sqlserver + mssql-jdbc + 8.4.1.jre8 + + + + + + + + + + + org.springframework.boot + spring-boot-test + test + + + + org.springframework.boot + spring-boot-starter-test + test + + + + + com.ruoyi + ruoyi-quartz + + + + + com.ruoyi + ruoyi-generator + + + + + com.ruoyi + ruoyi-api + + + + + + + + + org.springframework.boot + spring-boot-maven-plugin + 2.1.1.RELEASE + + true + + + + + repackage + + + + + + org.apache.maven.plugins + maven-war-plugin + 3.1.0 + + false + ${project.artifactId} + + + + ${project.artifactId} + + + diff --git a/ruoyi-admin/src/main/java/com/ruoyi/RuoYiApplication.java b/ruoyi-admin/src/main/java/com/ruoyi/RuoYiApplication.java new file mode 100644 index 0000000..f5b7041 --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/RuoYiApplication.java @@ -0,0 +1,28 @@ +package com.ruoyi; + +import com.ruoyi.common.utils.BeanUtil; +import org.springframework.boot.SpringApplication; +import org.springframework.boot.autoconfigure.SpringBootApplication; +import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration; +import org.springframework.boot.builder.SpringApplicationBuilder; +import org.springframework.context.annotation.Bean; + +/** + * 启动程序 + * + * @author ruoyi + */ +@SpringBootApplication(exclude = { DataSourceAutoConfiguration.class }) +public class RuoYiApplication +{ + public static void main(String[] args) + { + SpringApplication.run(RuoYiApplication.class, args); + System.out.println("(♥◠‿◠)ﾉﾞ 启动成功 ლ(´ڡ`ლ)ﾞ "); + } + + @Bean + public BeanUtil beanUtil() { + return new BeanUtil(); + } +} diff --git a/ruoyi-admin/src/main/java/com/ruoyi/RuoYiServletInitializer.java b/ruoyi-admin/src/main/java/com/ruoyi/RuoYiServletInitializer.java new file mode 100644 index 0000000..6de67dc --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/RuoYiServletInitializer.java @@ -0,0 +1,18 @@ +package com.ruoyi; + +import org.springframework.boot.builder.SpringApplicationBuilder; +import org.springframework.boot.web.servlet.support.SpringBootServletInitializer; + +/** + * web容器中进行部署 + * + * @author ruoyi + */ +public class RuoYiServletInitializer extends SpringBootServletInitializer +{ + @Override + protected SpringApplicationBuilder configure(SpringApplicationBuilder application) + { + return application.sources(RuoYiApplication.class); + } +} diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/common/CaptchaController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/common/CaptchaController.java new file mode 100644 index 0000000..6bd8ddd --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/common/CaptchaController.java @@ -0,0 +1,93 @@ +package com.ruoyi.web.controller.common; + +import java.awt.image.BufferedImage; +import java.io.IOException; +import java.util.concurrent.TimeUnit; +import javax.annotation.Resource; +import javax.imageio.ImageIO; +import javax.servlet.http.HttpServletResponse; +import com.ruoyi.common.config.RuoYiConfig; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.util.FastByteArrayOutputStream; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RestController; +import com.google.code.kaptcha.Producer; +import com.ruoyi.common.constant.Constants; +import com.ruoyi.common.core.domain.AjaxResult; +import com.ruoyi.common.core.redis.RedisCache; +import com.ruoyi.common.utils.sign.Base64; +import com.ruoyi.common.utils.uuid.IdUtils; +import com.ruoyi.system.service.ISysConfigService; + +/** + * 验证码操作处理 + * + * @author ruoyi + */ +@RestController +public class CaptchaController +{ + @Resource(name = "captchaProducer") + private Producer captchaProducer; + + @Resource(name = "captchaProducerMath") + private Producer captchaProducerMath; + + @Autowired + private RedisCache redisCache; + + @Autowired + private ISysConfigService configService; + /** + * 生成验证码 + */ + @GetMapping("/captchaImage") + public AjaxResult getCode(HttpServletResponse response) throws IOException + { + AjaxResult ajax = AjaxResult.success(); + boolean captchaOnOff = configService.selectCaptchaOnOff(); + ajax.put("captchaOnOff", captchaOnOff); + if (!captchaOnOff) + { + return ajax; + } + + // 保存验证码信息 + String uuid = IdUtils.simpleUUID(); + String verifyKey = Constants.CAPTCHA_CODE_KEY + uuid; + + String capStr = null, code = null; + BufferedImage image = null; + + // 生成验证码 + String captchaType = RuoYiConfig.getCaptchaType(); + 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); + } + + redisCache.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; + } +} diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/common/CommonController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/common/CommonController.java new file mode 100644 index 0000000..cec5006 --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/common/CommonController.java @@ -0,0 +1,163 @@ +package com.ruoyi.web.controller.common; + +import java.util.ArrayList; +import java.util.List; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.http.MediaType; +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 org.springframework.web.multipart.MultipartFile; +import com.ruoyi.common.config.RuoYiConfig; +import com.ruoyi.common.constant.Constants; +import com.ruoyi.common.core.domain.AjaxResult; +import com.ruoyi.common.utils.StringUtils; +import com.ruoyi.common.utils.file.FileUploadUtils; +import com.ruoyi.common.utils.file.FileUtils; +import com.ruoyi.framework.config.ServerConfig; + +/** + * 通用请求处理 + * + * @author ruoyi + */ +@RestController +@RequestMapping("/common") +public class CommonController +{ + private static final Logger log = LoggerFactory.getLogger(CommonController.class); + + @Autowired + private ServerConfig serverConfig; + + private static final String FILE_DELIMETER = ","; + + /** + * 通用下载请求 + * + * @param fileName 文件名称 + * @param delete 是否删除 + */ + @GetMapping("/download") + public void fileDownload(String fileName, Boolean delete, HttpServletResponse response, HttpServletRequest request) + { + try + { + if (!FileUtils.checkAllowDownload(fileName)) + { + throw new Exception(StringUtils.format("文件名称({})非法，不允许下载。 ", fileName)); + } + String realFileName = System.currentTimeMillis() + fileName.substring(fileName.indexOf("_") + 1); + String filePath = RuoYiConfig.getDownloadPath() + fileName; + + response.setContentType(MediaType.APPLICATION_OCTET_STREAM_VALUE); + FileUtils.setAttachmentResponseHeader(response, realFileName); + FileUtils.writeBytes(filePath, response.getOutputStream()); + if (delete) + { + FileUtils.deleteFile(filePath); + } + } + catch (Exception e) + { + log.error("下载文件失败", e); + } + } + + /** + * 通用上传请求（单个） + */ + @PostMapping("/upload") + public AjaxResult uploadFile(MultipartFile file) throws Exception + { + try + { + // 上传文件路径 + String filePath = RuoYiConfig.getUploadPath(); + // 上传并返回新文件名称 + String fileName = FileUploadUtils.upload(filePath, file); + String url = serverConfig.getUrl() + fileName; + AjaxResult ajax = AjaxResult.success(); + ajax.put("url", url); + ajax.put("fileName", fileName); + ajax.put("newFileName", FileUtils.getName(fileName)); + ajax.put("originalFilename", file.getOriginalFilename()); + return ajax; + } + catch (Exception e) + { + return AjaxResult.error(e.getMessage()); + } + } + + /** + * 通用上传请求（多个） + */ + @PostMapping("/uploads") + public AjaxResult uploadFiles(List files) throws Exception + { + try + { + // 上传文件路径 + String filePath = RuoYiConfig.getUploadPath(); + List urls = new ArrayList(); + List fileNames = new ArrayList(); + List newFileNames = new ArrayList(); + List originalFilenames = new ArrayList(); + for (MultipartFile file : files) + { + // 上传并返回新文件名称 + String fileName = FileUploadUtils.upload(filePath, file); + String url = serverConfig.getUrl() + fileName; + urls.add(url); + fileNames.add(fileName); + newFileNames.add(FileUtils.getName(fileName)); + originalFilenames.add(file.getOriginalFilename()); + } + AjaxResult ajax = AjaxResult.success(); + ajax.put("urls", StringUtils.join(urls, FILE_DELIMETER)); + ajax.put("fileNames", StringUtils.join(fileNames, FILE_DELIMETER)); + ajax.put("newFileNames", StringUtils.join(newFileNames, FILE_DELIMETER)); + ajax.put("originalFilenames", StringUtils.join(originalFilenames, FILE_DELIMETER)); + return ajax; + } + catch (Exception e) + { + return AjaxResult.error(e.getMessage()); + } + } + + /** + * 本地资源通用下载 + */ + @GetMapping("/download/resource") + public void resourceDownload(String resource, HttpServletRequest request, HttpServletResponse response) + throws Exception + { + try + { + if (!FileUtils.checkAllowDownload(resource)) + { + throw new Exception(StringUtils.format("资源文件({})非法，不允许下载。 ", resource)); + } + // 本地资源路径 + String localPath = RuoYiConfig.getProfile(); + // 数据库资源地址 + String downloadPath = localPath + StringUtils.substringAfter(resource, Constants.RESOURCE_PREFIX); + // 下载名称 + String downloadName = StringUtils.substringAfterLast(downloadPath, "/"); + response.setContentType(MediaType.APPLICATION_OCTET_STREAM_VALUE); + FileUtils.setAttachmentResponseHeader(response, downloadName); + FileUtils.writeBytes(downloadPath, response.getOutputStream()); + } + catch (Exception e) + { + log.error("下载文件失败", e); + } + } +} diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitor/CacheController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitor/CacheController.java new file mode 100644 index 0000000..7b97de2 --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitor/CacheController.java @@ -0,0 +1,53 @@ +package com.ruoyi.web.controller.monitor; + +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.Properties; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.data.redis.core.RedisCallback; +import org.springframework.data.redis.core.RedisTemplate; +import org.springframework.security.access.prepost.PreAuthorize; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; +import com.ruoyi.common.core.domain.AjaxResult; +import com.ruoyi.common.utils.StringUtils; + +/** + * 缓存监控 + * + * @author ruoyi + */ +@RestController +@RequestMapping("/monitor/cache") +public class CacheController +{ + @Autowired + private RedisTemplate redisTemplate; + + @PreAuthorize("@ss.hasPermi('monitor:cache:list')") + @GetMapping() + public AjaxResult getInfo() throws Exception + { + Properties info = (Properties) redisTemplate.execute((RedisCallback) connection -> connection.info()); + Properties commandStats = (Properties) redisTemplate.execute((RedisCallback) connection -> connection.info("commandstats")); + Object dbSize = redisTemplate.execute((RedisCallback) connection -> connection.dbSize()); + + Map result = new HashMap<>(3); + result.put("info", info); + result.put("dbSize", dbSize); + + List> pieList = new ArrayList<>(); + commandStats.stringPropertyNames().forEach(key -> { + Map data = new HashMap<>(2); + String property = commandStats.getProperty(key); + data.put("name", StringUtils.removeStart(key, "cmdstat_")); + data.put("value", StringUtils.substringBetween(property, "calls=", ",usec")); + pieList.add(data); + }); + result.put("commandStats", pieList); + return AjaxResult.success(result); + } +} diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitor/ServerController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitor/ServerController.java new file mode 100644 index 0000000..cc805ad --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitor/ServerController.java @@ -0,0 +1,27 @@ +package com.ruoyi.web.controller.monitor; + +import org.springframework.security.access.prepost.PreAuthorize; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; +import com.ruoyi.common.core.domain.AjaxResult; +import com.ruoyi.framework.web.domain.Server; + +/** + * 服务器监控 + * + * @author ruoyi + */ +@RestController +@RequestMapping("/monitor/server") +public class ServerController +{ + @PreAuthorize("@ss.hasPermi('monitor:server:list')") + @GetMapping() + public AjaxResult getInfo() throws Exception + { + Server server = new Server(); + server.copyTo(); + return AjaxResult.success(server); + } +} diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitor/SysLogininforController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitor/SysLogininforController.java new file mode 100644 index 0000000..41dcf98 --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitor/SysLogininforController.java @@ -0,0 +1,69 @@ +package com.ruoyi.web.controller.monitor; + +import java.util.List; +import javax.servlet.http.HttpServletResponse; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.security.access.prepost.PreAuthorize; +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.ruoyi.common.annotation.Log; +import com.ruoyi.common.core.controller.BaseController; +import com.ruoyi.common.core.domain.AjaxResult; +import com.ruoyi.common.core.page.TableDataInfo; +import com.ruoyi.common.enums.BusinessType; +import com.ruoyi.common.utils.poi.ExcelUtil; +import com.ruoyi.system.domain.SysLogininfor; +import com.ruoyi.system.service.ISysLogininforService; + +/** + * 系统访问记录 + * + * @author ruoyi + */ +@RestController +@RequestMapping("/monitor/logininfor") +public class SysLogininforController extends BaseController +{ + @Autowired + private ISysLogininforService logininforService; + + @PreAuthorize("@ss.hasPermi('monitor:logininfor:list')") + @GetMapping("/list") + public TableDataInfo list(SysLogininfor logininfor) + { + startPage(); + List list = logininforService.selectLogininforList(logininfor); + return getDataTable(list); + } + + @Log(title = "登录日志", businessType = BusinessType.EXPORT) + @PreAuthorize("@ss.hasPermi('monitor: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, "登录日志"); + } + + @PreAuthorize("@ss.hasPermi('monitor:logininfor:remove')") + @Log(title = "登录日志", businessType = BusinessType.DELETE) + @DeleteMapping("/{infoIds}") + public AjaxResult remove(@PathVariable Long[] infoIds) + { + return toAjax(logininforService.deleteLogininforByIds(infoIds)); + } + + @PreAuthorize("@ss.hasPermi('monitor:logininfor:remove')") + @Log(title = "登录日志", businessType = BusinessType.CLEAN) + @DeleteMapping("/clean") + public AjaxResult clean() + { + logininforService.cleanLogininfor(); + return AjaxResult.success(); + } +} diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitor/SysOperlogController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitor/SysOperlogController.java new file mode 100644 index 0000000..b6ba56b --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitor/SysOperlogController.java @@ -0,0 +1,69 @@ +package com.ruoyi.web.controller.monitor; + +import java.util.List; +import javax.servlet.http.HttpServletResponse; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.security.access.prepost.PreAuthorize; +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.ruoyi.common.annotation.Log; +import com.ruoyi.common.core.controller.BaseController; +import com.ruoyi.common.core.domain.AjaxResult; +import com.ruoyi.common.core.page.TableDataInfo; +import com.ruoyi.common.enums.BusinessType; +import com.ruoyi.common.utils.poi.ExcelUtil; +import com.ruoyi.system.domain.SysOperLog; +import com.ruoyi.system.service.ISysOperLogService; + +/** + * 操作日志记录 + * + * @author ruoyi + */ +@RestController +@RequestMapping("/monitor/operlog") +public class SysOperlogController extends BaseController +{ + @Autowired + private ISysOperLogService operLogService; + + @PreAuthorize("@ss.hasPermi('monitor:operlog:list')") + @GetMapping("/list") + public TableDataInfo list(SysOperLog operLog) + { + startPage(); + List list = operLogService.selectOperLogList(operLog); + return getDataTable(list); + } + + @Log(title = "操作日志", businessType = BusinessType.EXPORT) + @PreAuthorize("@ss.hasPermi('monitor: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) + @PreAuthorize("@ss.hasPermi('monitor:operlog:remove')") + @DeleteMapping("/{operIds}") + public AjaxResult remove(@PathVariable Long[] operIds) + { + return toAjax(operLogService.deleteOperLogByIds(operIds)); + } + + @Log(title = "操作日志", businessType = BusinessType.CLEAN) + @PreAuthorize("@ss.hasPermi('monitor:operlog:remove')") + @DeleteMapping("/clean") + public AjaxResult clean() + { + operLogService.cleanOperLog(); + return AjaxResult.success(); + } +} diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitor/SysUserOnlineController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitor/SysUserOnlineController.java new file mode 100644 index 0000000..9b157ea --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitor/SysUserOnlineController.java @@ -0,0 +1,92 @@ +package com.ruoyi.web.controller.monitor; + +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.security.access.prepost.PreAuthorize; +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.ruoyi.common.annotation.Log; +import com.ruoyi.common.constant.Constants; +import com.ruoyi.common.core.controller.BaseController; +import com.ruoyi.common.core.domain.AjaxResult; +import com.ruoyi.common.core.domain.model.LoginUser; +import com.ruoyi.common.core.page.TableDataInfo; +import com.ruoyi.common.core.redis.RedisCache; +import com.ruoyi.common.enums.BusinessType; +import com.ruoyi.common.utils.StringUtils; +import com.ruoyi.system.domain.SysUserOnline; +import com.ruoyi.system.service.ISysUserOnlineService; + +/** + * 在线用户监控 + * + * @author ruoyi + */ +@RestController +@RequestMapping("/monitor/online") +public class SysUserOnlineController extends BaseController +{ + @Autowired + private ISysUserOnlineService userOnlineService; + + @Autowired + private RedisCache redisCache; + + @PreAuthorize("@ss.hasPermi('monitor:online:list')") + @GetMapping("/list") + public TableDataInfo list(String ipaddr, String userName) + { + Collection keys = redisCache.keys(Constants.LOGIN_TOKEN_KEY + "*"); + List userOnlineList = new ArrayList(); + for (String key : keys) + { + LoginUser user = redisCache.getCacheObject(key); + if (StringUtils.isNotEmpty(ipaddr) && StringUtils.isNotEmpty(userName)) + { + if (StringUtils.equals(ipaddr, user.getIpaddr()) && StringUtils.equals(userName, user.getUsername())) + { + userOnlineList.add(userOnlineService.selectOnlineByInfo(ipaddr, userName, user)); + } + } + else if (StringUtils.isNotEmpty(ipaddr)) + { + if (StringUtils.equals(ipaddr, user.getIpaddr())) + { + userOnlineList.add(userOnlineService.selectOnlineByIpaddr(ipaddr, user)); + } + } + else if (StringUtils.isNotEmpty(userName) && StringUtils.isNotNull(user.getUser())) + { + if (StringUtils.equals(userName, user.getUsername())) + { + userOnlineList.add(userOnlineService.selectOnlineByUserName(userName, user)); + } + } + else + { + userOnlineList.add(userOnlineService.loginUserToUserOnline(user)); + } + } + Collections.reverse(userOnlineList); + userOnlineList.removeAll(Collections.singleton(null)); + return getDataTable(userOnlineList); + } + + /** + * 强退用户 + */ + @PreAuthorize("@ss.hasPermi('monitor:online:forceLogout')") + @Log(title = "在线用户", businessType = BusinessType.FORCE) + @DeleteMapping("/{tokenId}") + public AjaxResult forceLogout(@PathVariable String tokenId) + { + redisCache.deleteObject(Constants.LOGIN_TOKEN_KEY + tokenId); + return AjaxResult.success(); + } +} diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/LoginSsoController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/LoginSsoController.java new file mode 100644 index 0000000..08dc709 --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/LoginSsoController.java @@ -0,0 +1,86 @@ +package com.ruoyi.web.controller.system; + +import com.alibaba.fastjson.JSON; +import com.ruoyi.common.constant.Constants; +import com.ruoyi.common.constant.HttpStatus; +import com.ruoyi.common.core.domain.AjaxResult; +import com.ruoyi.common.core.domain.model.LoginUser; +import com.ruoyi.common.core.redis.RedisCache; +import com.ruoyi.common.utils.ServletUtils; +import com.ruoyi.common.utils.StringUtils; +import com.ruoyi.framework.manager.AsyncManager; +import com.ruoyi.framework.manager.factory.AsyncFactory; +import com.ruoyi.framework.web.service.ThirdLoginService; +import com.ruoyi.framework.web.service.TokenService; +import lombok.extern.slf4j.Slf4j; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestParam; +import org.springframework.web.bind.annotation.RestController; + +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; +import java.util.concurrent.TimeUnit; + +/** + * 单点登录Controller + * @author sgc + */ +@Slf4j +@RestController +public class LoginSsoController { + + @Autowired + private ThirdLoginService loginService; + + @Autowired + private TokenService tokenService; + + @Autowired + private RedisCache redisCache; + + @PostMapping("/loginSso") + public AjaxResult loginSso(@RequestParam("code") String code) { + System.out.println("token = " + code); + AjaxResult ajax = AjaxResult.success(); + + String token = redisCache.getCacheObject(code); + LoginUser loginUser = tokenService.getThirdLoginUser(token); + + System.out.println("loginUser = " + loginUser); + if(loginUser != null){ + ajax.put(Constants.TOKEN, token); + ajax.put("msg", "登录成功"); + return ajax; + } + // 生成令牌(免密登录) + String tokenNew = loginService.thirdLogin(code); + if(null==tokenNew){ + ajax = AjaxResult.error("获取认证失败,请重新登入"); + }else { + redisCache.setCacheObject(code,tokenNew, 60, TimeUnit.MINUTES); + ajax.put(Constants.TOKEN, tokenNew); + ajax.put("msg", "登录成功"); + } + return ajax; + + } + + + @PostMapping("/logoutSso") + public void logoutSso(HttpServletRequest request, HttpServletResponse response,@RequestParam("token") String token) + { + String thisToken = redisCache.getCacheObject(token); + LoginUser loginUser = tokenService.getThirdLoginUser(thisToken); + if (StringUtils.isNotNull(loginUser)) + { + String userName = loginUser.getUsername(); + // 删除用户缓存记录 + tokenService.delLoginUser(loginUser.getToken()); + // 记录用户退出日志 + AsyncManager.me().execute(AsyncFactory.recordLogininfor(userName, Constants.LOGOUT, "退出成功")); + } + ServletUtils.renderString(response, JSON.toJSONString(AjaxResult.error(HttpStatus.SUCCESS, "退出成功"))); + } + +} diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysConfigController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysConfigController.java new file mode 100644 index 0000000..b6f0518 --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysConfigController.java @@ -0,0 +1,134 @@ +package com.ruoyi.web.controller.system; + +import java.util.List; +import javax.servlet.http.HttpServletResponse; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.security.access.prepost.PreAuthorize; +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.ruoyi.common.annotation.Log; +import com.ruoyi.common.constant.UserConstants; +import com.ruoyi.common.core.controller.BaseController; +import com.ruoyi.common.core.domain.AjaxResult; +import com.ruoyi.common.core.page.TableDataInfo; +import com.ruoyi.common.enums.BusinessType; +import com.ruoyi.common.utils.poi.ExcelUtil; +import com.ruoyi.system.domain.SysConfig; +import com.ruoyi.system.service.ISysConfigService; + +/** + * 参数配置 信息操作处理 + * + * @author ruoyi + */ +@RestController +@RequestMapping("/system/config") +public class SysConfigController extends BaseController +{ + @Autowired + private ISysConfigService configService; + + /** + * 获取参数配置列表 + */ + @PreAuthorize("@ss.hasPermi('system:config:list')") + @GetMapping("/list") + public TableDataInfo list(SysConfig config) + { + startPage(); + List list = configService.selectConfigList(config); + return getDataTable(list); + } + + @Log(title = "参数管理", businessType = BusinessType.EXPORT) + @PreAuthorize("@ss.hasPermi('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, "参数数据"); + } + + /** + * 根据参数编号获取详细信息 + */ + @PreAuthorize("@ss.hasPermi('system:config:query')") + @GetMapping(value = "/{configId}") + public AjaxResult getInfo(@PathVariable Long configId) + { + return AjaxResult.success(configService.selectConfigById(configId)); + } + + /** + * 根据参数键名查询参数值 + */ + @GetMapping(value = "/configKey/{configKey}") + public AjaxResult getConfigKey(@PathVariable String configKey) + { + return AjaxResult.success(configService.selectConfigByKey(configKey)); + } + + /** + * 新增参数配置 + */ + @PreAuthorize("@ss.hasPermi('system:config:add')") + @Log(title = "参数管理", businessType = BusinessType.INSERT) + @PostMapping + public AjaxResult add(@Validated @RequestBody SysConfig config) + { + if (UserConstants.NOT_UNIQUE.equals(configService.checkConfigKeyUnique(config))) + { + return AjaxResult.error("新增参数'" + config.getConfigName() + "'失败，参数键名已存在"); + } + config.setCreateBy(getUsername()); + return toAjax(configService.insertConfig(config)); + } + + /** + * 修改参数配置 + */ + @PreAuthorize("@ss.hasPermi('system:config:edit')") + @Log(title = "参数管理", businessType = BusinessType.UPDATE) + @PutMapping + public AjaxResult edit(@Validated @RequestBody SysConfig config) + { + if (UserConstants.NOT_UNIQUE.equals(configService.checkConfigKeyUnique(config))) + { + return AjaxResult.error("修改参数'" + config.getConfigName() + "'失败，参数键名已存在"); + } + config.setUpdateBy(getUsername()); + return toAjax(configService.updateConfig(config)); + } + + /** + * 删除参数配置 + */ + @PreAuthorize("@ss.hasPermi('system:config:remove')") + @Log(title = "参数管理", businessType = BusinessType.DELETE) + @DeleteMapping("/{configIds}") + public AjaxResult remove(@PathVariable Long[] configIds) + { + configService.deleteConfigByIds(configIds); + return success(); + } + + /** + * 刷新参数缓存 + */ + @PreAuthorize("@ss.hasPermi('system:config:remove')") + @Log(title = "参数管理", businessType = BusinessType.CLEAN) + @DeleteMapping("/refreshCache") + public AjaxResult refreshCache() + { + configService.resetConfigCache(); + return AjaxResult.success(); + } +} diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysDeptController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysDeptController.java new file mode 100644 index 0000000..867ac71 --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysDeptController.java @@ -0,0 +1,165 @@ +package com.ruoyi.web.controller.system; + +import java.util.Iterator; +import java.util.List; +import org.apache.commons.lang3.ArrayUtils; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.security.access.prepost.PreAuthorize; +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.ruoyi.common.annotation.Log; +import com.ruoyi.common.constant.UserConstants; +import com.ruoyi.common.core.controller.BaseController; +import com.ruoyi.common.core.domain.AjaxResult; +import com.ruoyi.common.core.domain.entity.SysDept; +import com.ruoyi.common.enums.BusinessType; +import com.ruoyi.common.utils.StringUtils; +import com.ruoyi.system.service.ISysDeptService; + +/** + * 部门信息 + * + * @author ruoyi + */ +@RestController +@RequestMapping("/system/dept") +public class SysDeptController extends BaseController +{ + @Autowired + private ISysDeptService deptService; + + /** + * 获取部门列表 + */ + @PreAuthorize("@ss.hasPermi('system:dept:list')") + @GetMapping("/list") + public AjaxResult list(SysDept dept) + { + List depts = deptService.selectDeptList(dept); + return AjaxResult.success(depts); + } + + /** + * 查询部门列表（排除节点） + */ + @PreAuthorize("@ss.hasPermi('system:dept:list')") + @GetMapping("/list/exclude/{deptId}") + public AjaxResult excludeChild(@PathVariable(value = "deptId", required = false) Long deptId) + { + List depts = deptService.selectDeptList(new SysDept()); + Iterator it = depts.iterator(); + while (it.hasNext()) + { + SysDept d = (SysDept) it.next(); + if (d.getDeptId().intValue() == deptId + || ArrayUtils.contains(StringUtils.split(d.getAncestors(), ","), deptId + "")) + { + it.remove(); + } + } + return AjaxResult.success(depts); + } + + /** + * 根据部门编号获取详细信息 + */ + @PreAuthorize("@ss.hasPermi('system:dept:query')") + @GetMapping(value = "/{deptId}") + public AjaxResult getInfo(@PathVariable Long deptId) + { + deptService.checkDeptDataScope(deptId); + return AjaxResult.success(deptService.selectDeptById(deptId)); + } + + /** + * 获取部门下拉树列表 + */ + @GetMapping("/treeselect") + public AjaxResult treeselect(SysDept dept) + { + List depts = deptService.selectDeptList(dept); + return AjaxResult.success(deptService.buildDeptTreeSelect(depts)); + } + + /** + * 加载对应角色部门列表树 + */ + @GetMapping(value = "/roleDeptTreeselect/{roleId}") + public AjaxResult roleDeptTreeselect(@PathVariable("roleId") Long roleId) + { + List depts = deptService.selectDeptList(new SysDept()); + AjaxResult ajax = AjaxResult.success(); + ajax.put("checkedKeys", deptService.selectDeptListByRoleId(roleId)); + ajax.put("depts", deptService.buildDeptTreeSelect(depts)); + return ajax; + } + + /** + * 新增部门 + */ + @PreAuthorize("@ss.hasPermi('system:dept:add')") + @Log(title = "部门管理", businessType = BusinessType.INSERT) + @PostMapping + public AjaxResult add(@Validated @RequestBody SysDept dept) + { + if (UserConstants.NOT_UNIQUE.equals(deptService.checkDeptNameUnique(dept))) + { + return AjaxResult.error("新增部门'" + dept.getDeptName() + "'失败，部门名称已存在"); + } + dept.setCreateBy(getUsername()); + return toAjax(deptService.insertDept(dept)); + } + + /** + * 修改部门 + */ + @PreAuthorize("@ss.hasPermi('system:dept:edit')") + @Log(title = "部门管理", businessType = BusinessType.UPDATE) + @PutMapping + public AjaxResult edit(@Validated @RequestBody SysDept dept) + { + Long deptId = dept.getDeptId(); + deptService.checkDeptDataScope(deptId); + if (UserConstants.NOT_UNIQUE.equals(deptService.checkDeptNameUnique(dept))) + { + return AjaxResult.error("修改部门'" + dept.getDeptName() + "'失败，部门名称已存在"); + } + else if (dept.getParentId().equals(deptId)) + { + return AjaxResult.error("修改部门'" + dept.getDeptName() + "'失败，上级部门不能是自己"); + } + else if (StringUtils.equals(UserConstants.DEPT_DISABLE, dept.getStatus()) && deptService.selectNormalChildrenDeptById(deptId) > 0) + { + return AjaxResult.error("该部门包含未停用的子部门！"); + } + dept.setUpdateBy(getUsername()); + return toAjax(deptService.updateDept(dept)); + } + + /** + * 删除部门 + */ + @PreAuthorize("@ss.hasPermi('system:dept:remove')") + @Log(title = "部门管理", businessType = BusinessType.DELETE) + @DeleteMapping("/{deptId}") + public AjaxResult remove(@PathVariable Long deptId) + { + if (deptService.hasChildByDeptId(deptId)) + { + return AjaxResult.error("存在下级部门,不允许删除"); + } + if (deptService.checkDeptExistUser(deptId)) + { + return AjaxResult.error("部门存在用户,不允许删除"); + } + deptService.checkDeptDataScope(deptId); + return toAjax(deptService.deleteDeptById(deptId)); + } +} diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysDictDataController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysDictDataController.java new file mode 100644 index 0000000..b53fe47 --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysDictDataController.java @@ -0,0 +1,121 @@ +package com.ruoyi.web.controller.system; + +import java.util.ArrayList; +import java.util.List; +import javax.servlet.http.HttpServletResponse; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.security.access.prepost.PreAuthorize; +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.ruoyi.common.annotation.Log; +import com.ruoyi.common.core.controller.BaseController; +import com.ruoyi.common.core.domain.AjaxResult; +import com.ruoyi.common.core.domain.entity.SysDictData; +import com.ruoyi.common.core.page.TableDataInfo; +import com.ruoyi.common.enums.BusinessType; +import com.ruoyi.common.utils.StringUtils; +import com.ruoyi.common.utils.poi.ExcelUtil; +import com.ruoyi.system.service.ISysDictDataService; +import com.ruoyi.system.service.ISysDictTypeService; + +/** + * 数据字典信息 + * + * @author ruoyi + */ +@RestController +@RequestMapping("/system/dict/data") +public class SysDictDataController extends BaseController +{ + @Autowired + private ISysDictDataService dictDataService; + + @Autowired + private ISysDictTypeService dictTypeService; + + @PreAuthorize("@ss.hasPermi('system:dict:list')") + @GetMapping("/list") + public TableDataInfo list(SysDictData dictData) + { + startPage(); + List list = dictDataService.selectDictDataList(dictData); + return getDataTable(list); + } + + @Log(title = "字典数据", businessType = BusinessType.EXPORT) + @PreAuthorize("@ss.hasPermi('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, "字典数据"); + } + + /** + * 查询字典数据详细 + */ + @PreAuthorize("@ss.hasPermi('system:dict:query')") + @GetMapping(value = "/{dictCode}") + public AjaxResult getInfo(@PathVariable Long dictCode) + { + return AjaxResult.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 AjaxResult.success(data); + } + + /** + * 新增字典类型 + */ + @PreAuthorize("@ss.hasPermi('system:dict:add')") + @Log(title = "字典数据", businessType = BusinessType.INSERT) + @PostMapping + public AjaxResult add(@Validated @RequestBody SysDictData dict) + { + dict.setCreateBy(getUsername()); + return toAjax(dictDataService.insertDictData(dict)); + } + + /** + * 修改保存字典类型 + */ + @PreAuthorize("@ss.hasPermi('system:dict:edit')") + @Log(title = "字典数据", businessType = BusinessType.UPDATE) + @PutMapping + public AjaxResult edit(@Validated @RequestBody SysDictData dict) + { + dict.setUpdateBy(getUsername()); + return toAjax(dictDataService.updateDictData(dict)); + } + + /** + * 删除字典类型 + */ + @PreAuthorize("@ss.hasPermi('system:dict:remove')") + @Log(title = "字典类型", businessType = BusinessType.DELETE) + @DeleteMapping("/{dictCodes}") + public AjaxResult remove(@PathVariable Long[] dictCodes) + { + dictDataService.deleteDictDataByIds(dictCodes); + return success(); + } +} diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysDictTypeController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysDictTypeController.java new file mode 100644 index 0000000..f8b7dbc --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysDictTypeController.java @@ -0,0 +1,132 @@ +package com.ruoyi.web.controller.system; + +import java.util.List; +import javax.servlet.http.HttpServletResponse; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.security.access.prepost.PreAuthorize; +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.ruoyi.common.annotation.Log; +import com.ruoyi.common.constant.UserConstants; +import com.ruoyi.common.core.controller.BaseController; +import com.ruoyi.common.core.domain.AjaxResult; +import com.ruoyi.common.core.domain.entity.SysDictType; +import com.ruoyi.common.core.page.TableDataInfo; +import com.ruoyi.common.enums.BusinessType; +import com.ruoyi.common.utils.poi.ExcelUtil; +import com.ruoyi.system.service.ISysDictTypeService; + +/** + * 数据字典信息 + * + * @author ruoyi + */ +@RestController +@RequestMapping("/system/dict/type") +public class SysDictTypeController extends BaseController +{ + @Autowired + private ISysDictTypeService dictTypeService; + + @PreAuthorize("@ss.hasPermi('system:dict:list')") + @GetMapping("/list") + public TableDataInfo list(SysDictType dictType) + { + startPage(); + List list = dictTypeService.selectDictTypeList(dictType); + return getDataTable(list); + } + + @Log(title = "字典类型", businessType = BusinessType.EXPORT) + @PreAuthorize("@ss.hasPermi('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, "字典类型"); + } + + /** + * 查询字典类型详细 + */ + @PreAuthorize("@ss.hasPermi('system:dict:query')") + @GetMapping(value = "/{dictId}") + public AjaxResult getInfo(@PathVariable Long dictId) + { + return AjaxResult.success(dictTypeService.selectDictTypeById(dictId)); + } + + /** + * 新增字典类型 + */ + @PreAuthorize("@ss.hasPermi('system:dict:add')") + @Log(title = "字典类型", businessType = BusinessType.INSERT) + @PostMapping + public AjaxResult add(@Validated @RequestBody SysDictType dict) + { + if (UserConstants.NOT_UNIQUE.equals(dictTypeService.checkDictTypeUnique(dict))) + { + return AjaxResult.error("新增字典'" + dict.getDictName() + "'失败，字典类型已存在"); + } + dict.setCreateBy(getUsername()); + return toAjax(dictTypeService.insertDictType(dict)); + } + + /** + * 修改字典类型 + */ + @PreAuthorize("@ss.hasPermi('system:dict:edit')") + @Log(title = "字典类型", businessType = BusinessType.UPDATE) + @PutMapping + public AjaxResult edit(@Validated @RequestBody SysDictType dict) + { + if (UserConstants.NOT_UNIQUE.equals(dictTypeService.checkDictTypeUnique(dict))) + { + return AjaxResult.error("修改字典'" + dict.getDictName() + "'失败，字典类型已存在"); + } + dict.setUpdateBy(getUsername()); + return toAjax(dictTypeService.updateDictType(dict)); + } + + /** + * 删除字典类型 + */ + @PreAuthorize("@ss.hasPermi('system:dict:remove')") + @Log(title = "字典类型", businessType = BusinessType.DELETE) + @DeleteMapping("/{dictIds}") + public AjaxResult remove(@PathVariable Long[] dictIds) + { + dictTypeService.deleteDictTypeByIds(dictIds); + return success(); + } + + /** + * 刷新字典缓存 + */ + @PreAuthorize("@ss.hasPermi('system:dict:remove')") + @Log(title = "字典类型", businessType = BusinessType.CLEAN) + @DeleteMapping("/refreshCache") + public AjaxResult refreshCache() + { + dictTypeService.resetDictCache(); + return AjaxResult.success(); + } + + /** + * 获取字典选择框列表 + */ + @GetMapping("/optionselect") + public AjaxResult optionselect() + { + List dictTypes = dictTypeService.selectDictTypeAll(); + return AjaxResult.success(dictTypes); + } +} diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysIndexController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysIndexController.java new file mode 100644 index 0000000..13007eb --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysIndexController.java @@ -0,0 +1,29 @@ +package com.ruoyi.web.controller.system; + +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; +import com.ruoyi.common.config.RuoYiConfig; +import com.ruoyi.common.utils.StringUtils; + +/** + * 首页 + * + * @author ruoyi + */ +@RestController +public class SysIndexController +{ + /** 系统基础配置 */ + @Autowired + private RuoYiConfig ruoyiConfig; + + /** + * 访问首页，提示语 + */ + @RequestMapping("/") + public String index() + { + return StringUtils.format("欢迎使用{}后台管理框架，当前版本：v{}，请通过前端地址访问。", ruoyiConfig.getName(), ruoyiConfig.getVersion()); + } +} diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysLoginController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysLoginController.java new file mode 100644 index 0000000..1a80755 --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysLoginController.java @@ -0,0 +1,89 @@ +package com.ruoyi.web.controller.system; + +import java.util.List; +import java.util.Set; + +import com.ruoyi.common.utils.sign.RsaUtils; +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.RequestBody; +import org.springframework.web.bind.annotation.RestController; +import com.ruoyi.common.constant.Constants; +import com.ruoyi.common.core.domain.AjaxResult; +import com.ruoyi.common.core.domain.entity.SysMenu; +import com.ruoyi.common.core.domain.entity.SysUser; +import com.ruoyi.common.core.domain.model.LoginBody; +import com.ruoyi.common.utils.SecurityUtils; +import com.ruoyi.framework.web.service.SysLoginService; +import com.ruoyi.framework.web.service.SysPermissionService; +import com.ruoyi.system.service.ISysMenuService; + +/** + * 登录验证 + * + * @author ruoyi + */ +@RestController +public class SysLoginController +{ + @Autowired + private SysLoginService loginService; + + @Autowired + private ISysMenuService menuService; + + @Autowired + private SysPermissionService permissionService; + + /** + * 登录方法 + * + * @param loginBody 登录信息 + * @return 结果 + */ + @PostMapping("/login") + public AjaxResult login(@RequestBody LoginBody loginBody) throws Exception { + AjaxResult ajax = AjaxResult.success(); + // 生成令牌 + String token = loginService.login(loginBody.getUsername(), + RsaUtils.decryptByPrivateKey(loginBody.getPassword()), + loginBody.getCode(), + loginBody.getUuid()); + ajax.put(Constants.TOKEN, token); + return ajax; + } + + /** + * 获取用户信息 + * + * @return 用户信息 + */ + @GetMapping("getInfo") + public AjaxResult getInfo() + { + SysUser user = SecurityUtils.getLoginUser().getUser(); + // 角色集合 + 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; + } + + /** + * 获取路由信息 + * + * @return 路由信息 + */ + @GetMapping("getRouters") + public AjaxResult getRouters() + { + Long userId = SecurityUtils.getUserId(); + List menus = menuService.selectMenuTreeByUserId(userId); + return AjaxResult.success(menuService.buildMenus(menus)); + } +} diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysMenuController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysMenuController.java new file mode 100644 index 0000000..4a9f73f --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysMenuController.java @@ -0,0 +1,142 @@ +package com.ruoyi.web.controller.system; + +import java.util.List; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.security.access.prepost.PreAuthorize; +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.ruoyi.common.annotation.Log; +import com.ruoyi.common.constant.UserConstants; +import com.ruoyi.common.core.controller.BaseController; +import com.ruoyi.common.core.domain.AjaxResult; +import com.ruoyi.common.core.domain.entity.SysMenu; +import com.ruoyi.common.enums.BusinessType; +import com.ruoyi.common.utils.StringUtils; +import com.ruoyi.system.service.ISysMenuService; + +/** + * 菜单信息 + * + * @author ruoyi + */ +@RestController +@RequestMapping("/system/menu") +public class SysMenuController extends BaseController +{ + @Autowired + private ISysMenuService menuService; + + /** + * 获取菜单列表 + */ + @PreAuthorize("@ss.hasPermi('system:menu:list')") + @GetMapping("/list") + public AjaxResult list(SysMenu menu) + { + List menus = menuService.selectMenuList(menu, getUserId()); + return AjaxResult.success(menus); + } + + /** + * 根据菜单编号获取详细信息 + */ + @PreAuthorize("@ss.hasPermi('system:menu:query')") + @GetMapping(value = "/{menuId}") + public AjaxResult getInfo(@PathVariable Long menuId) + { + return AjaxResult.success(menuService.selectMenuById(menuId)); + } + + /** + * 获取菜单下拉树列表 + */ + @GetMapping("/treeselect") + public AjaxResult treeselect(SysMenu menu) + { + List menus = menuService.selectMenuList(menu, getUserId()); + return AjaxResult.success(menuService.buildMenuTreeSelect(menus)); + } + + /** + * 加载对应角色菜单列表树 + */ + @GetMapping(value = "/roleMenuTreeselect/{roleId}") + public AjaxResult roleMenuTreeselect(@PathVariable("roleId") Long roleId) + { + List menus = menuService.selectMenuList(getUserId()); + AjaxResult ajax = AjaxResult.success(); + ajax.put("checkedKeys", menuService.selectMenuListByRoleId(roleId)); + ajax.put("menus", menuService.buildMenuTreeSelect(menus)); + return ajax; + } + + /** + * 新增菜单 + */ + @PreAuthorize("@ss.hasPermi('system:menu:add')") + @Log(title = "菜单管理", businessType = BusinessType.INSERT) + @PostMapping + public AjaxResult add(@Validated @RequestBody SysMenu menu) + { + if (UserConstants.NOT_UNIQUE.equals(menuService.checkMenuNameUnique(menu))) + { + return AjaxResult.error("新增菜单'" + menu.getMenuName() + "'失败，菜单名称已存在"); + } + else if (UserConstants.YES_FRAME.equals(menu.getIsFrame()) && !StringUtils.ishttp(menu.getPath())) + { + return AjaxResult.error("新增菜单'" + menu.getMenuName() + "'失败，地址必须以http(s)://开头"); + } + menu.setCreateBy(getUsername()); + return toAjax(menuService.insertMenu(menu)); + } + + /** + * 修改菜单 + */ + @PreAuthorize("@ss.hasPermi('system:menu:edit')") + @Log(title = "菜单管理", businessType = BusinessType.UPDATE) + @PutMapping + public AjaxResult edit(@Validated @RequestBody SysMenu menu) + { + if (UserConstants.NOT_UNIQUE.equals(menuService.checkMenuNameUnique(menu))) + { + return AjaxResult.error("修改菜单'" + menu.getMenuName() + "'失败，菜单名称已存在"); + } + else if (UserConstants.YES_FRAME.equals(menu.getIsFrame()) && !StringUtils.ishttp(menu.getPath())) + { + return AjaxResult.error("修改菜单'" + menu.getMenuName() + "'失败，地址必须以http(s)://开头"); + } + else if (menu.getMenuId().equals(menu.getParentId())) + { + return AjaxResult.error("修改菜单'" + menu.getMenuName() + "'失败，上级菜单不能选择自己"); + } + menu.setUpdateBy(getUsername()); + return toAjax(menuService.updateMenu(menu)); + } + + /** + * 删除菜单 + */ + @PreAuthorize("@ss.hasPermi('system:menu:remove')") + @Log(title = "菜单管理", businessType = BusinessType.DELETE) + @DeleteMapping("/{menuId}") + public AjaxResult remove(@PathVariable("menuId") Long menuId) + { + if (menuService.hasChildByMenuId(menuId)) + { + return AjaxResult.error("存在子菜单,不允许删除"); + } + if (menuService.checkMenuExistRole(menuId)) + { + return AjaxResult.error("菜单已分配,不允许删除"); + } + return toAjax(menuService.deleteMenuById(menuId)); + } +} \ No newline at end of file diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysNoticeController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysNoticeController.java new file mode 100644 index 0000000..4da9f04 --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysNoticeController.java @@ -0,0 +1,91 @@ +package com.ruoyi.web.controller.system; + +import java.util.List; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.security.access.prepost.PreAuthorize; +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.ruoyi.common.annotation.Log; +import com.ruoyi.common.core.controller.BaseController; +import com.ruoyi.common.core.domain.AjaxResult; +import com.ruoyi.common.core.page.TableDataInfo; +import com.ruoyi.common.enums.BusinessType; +import com.ruoyi.system.domain.SysNotice; +import com.ruoyi.system.service.ISysNoticeService; + +/** + * 公告 信息操作处理 + * + * @author ruoyi + */ +@RestController +@RequestMapping("/system/notice") +public class SysNoticeController extends BaseController +{ + @Autowired + private ISysNoticeService noticeService; + + /** + * 获取通知公告列表 + */ + @PreAuthorize("@ss.hasPermi('system:notice:list')") + @GetMapping("/list") + public TableDataInfo list(SysNotice notice) + { + startPage(); + List list = noticeService.selectNoticeList(notice); + return getDataTable(list); + } + + /** + * 根据通知公告编号获取详细信息 + */ + @PreAuthorize("@ss.hasPermi('system:notice:query')") + @GetMapping(value = "/{noticeId}") + public AjaxResult getInfo(@PathVariable Long noticeId) + { + return AjaxResult.success(noticeService.selectNoticeById(noticeId)); + } + + /** + * 新增通知公告 + */ + @PreAuthorize("@ss.hasPermi('system:notice:add')") + @Log(title = "通知公告", businessType = BusinessType.INSERT) + @PostMapping + public AjaxResult add(@Validated @RequestBody SysNotice notice) + { + notice.setCreateBy(getUsername()); + return toAjax(noticeService.insertNotice(notice)); + } + + /** + * 修改通知公告 + */ + @PreAuthorize("@ss.hasPermi('system:notice:edit')") + @Log(title = "通知公告", businessType = BusinessType.UPDATE) + @PutMapping + public AjaxResult edit(@Validated @RequestBody SysNotice notice) + { + notice.setUpdateBy(getUsername()); + return toAjax(noticeService.updateNotice(notice)); + } + + /** + * 删除通知公告 + */ + @PreAuthorize("@ss.hasPermi('system:notice:remove')") + @Log(title = "通知公告", businessType = BusinessType.DELETE) + @DeleteMapping("/{noticeIds}") + public AjaxResult remove(@PathVariable Long[] noticeIds) + { + return toAjax(noticeService.deleteNoticeByIds(noticeIds)); + } +} diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysPostController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysPostController.java new file mode 100644 index 0000000..f73cea4 --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysPostController.java @@ -0,0 +1,130 @@ +package com.ruoyi.web.controller.system; + +import java.util.List; +import javax.servlet.http.HttpServletResponse; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.security.access.prepost.PreAuthorize; +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.ruoyi.common.annotation.Log; +import com.ruoyi.common.constant.UserConstants; +import com.ruoyi.common.core.controller.BaseController; +import com.ruoyi.common.core.domain.AjaxResult; +import com.ruoyi.common.core.page.TableDataInfo; +import com.ruoyi.common.enums.BusinessType; +import com.ruoyi.common.utils.poi.ExcelUtil; +import com.ruoyi.system.domain.SysPost; +import com.ruoyi.system.service.ISysPostService; + +/** + * 岗位信息操作处理 + * + * @author ruoyi + */ +@RestController +@RequestMapping("/system/post") +public class SysPostController extends BaseController +{ + @Autowired + private ISysPostService postService; + + /** + * 获取岗位列表 + */ + @PreAuthorize("@ss.hasPermi('system:post:list')") + @GetMapping("/list") + public TableDataInfo list(SysPost post) + { + startPage(); + List list = postService.selectPostList(post); + return getDataTable(list); + } + + @Log(title = "岗位管理", businessType = BusinessType.EXPORT) + @PreAuthorize("@ss.hasPermi('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, "岗位数据"); + } + + /** + * 根据岗位编号获取详细信息 + */ + @PreAuthorize("@ss.hasPermi('system:post:query')") + @GetMapping(value = "/{postId}") + public AjaxResult getInfo(@PathVariable Long postId) + { + return AjaxResult.success(postService.selectPostById(postId)); + } + + /** + * 新增岗位 + */ + @PreAuthorize("@ss.hasPermi('system:post:add')") + @Log(title = "岗位管理", businessType = BusinessType.INSERT) + @PostMapping + public AjaxResult add(@Validated @RequestBody SysPost post) + { + if (UserConstants.NOT_UNIQUE.equals(postService.checkPostNameUnique(post))) + { + return AjaxResult.error("新增岗位'" + post.getPostName() + "'失败，岗位名称已存在"); + } + else if (UserConstants.NOT_UNIQUE.equals(postService.checkPostCodeUnique(post))) + { + return AjaxResult.error("新增岗位'" + post.getPostName() + "'失败，岗位编码已存在"); + } + post.setCreateBy(getUsername()); + return toAjax(postService.insertPost(post)); + } + + /** + * 修改岗位 + */ + @PreAuthorize("@ss.hasPermi('system:post:edit')") + @Log(title = "岗位管理", businessType = BusinessType.UPDATE) + @PutMapping + public AjaxResult edit(@Validated @RequestBody SysPost post) + { + if (UserConstants.NOT_UNIQUE.equals(postService.checkPostNameUnique(post))) + { + return AjaxResult.error("修改岗位'" + post.getPostName() + "'失败，岗位名称已存在"); + } + else if (UserConstants.NOT_UNIQUE.equals(postService.checkPostCodeUnique(post))) + { + return AjaxResult.error("修改岗位'" + post.getPostName() + "'失败，岗位编码已存在"); + } + post.setUpdateBy(getUsername()); + return toAjax(postService.updatePost(post)); + } + + /** + * 删除岗位 + */ + @PreAuthorize("@ss.hasPermi('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 AjaxResult.success(posts); + } +} diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysProfileController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysProfileController.java new file mode 100644 index 0000000..ba38bd0 --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysProfileController.java @@ -0,0 +1,142 @@ +package com.ruoyi.web.controller.system; + +import java.io.IOException; +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.ruoyi.common.annotation.Log; +import com.ruoyi.common.config.RuoYiConfig; +import com.ruoyi.common.constant.UserConstants; +import com.ruoyi.common.core.controller.BaseController; +import com.ruoyi.common.core.domain.AjaxResult; +import com.ruoyi.common.core.domain.entity.SysUser; +import com.ruoyi.common.core.domain.model.LoginUser; +import com.ruoyi.common.enums.BusinessType; +import com.ruoyi.common.utils.SecurityUtils; +import com.ruoyi.common.utils.StringUtils; +import com.ruoyi.common.utils.file.FileUploadUtils; +import com.ruoyi.framework.web.service.TokenService; +import com.ruoyi.system.service.ISysUserService; + +/** + * 个人信息 业务处理 + * + * @author ruoyi + */ +@RestController +@RequestMapping("/system/user/profile") +public class SysProfileController extends BaseController +{ + @Autowired + private ISysUserService userService; + + @Autowired + private TokenService tokenService; + + /** + * 个人信息 + */ + @GetMapping + public AjaxResult profile() + { + LoginUser loginUser = getLoginUser(); + SysUser user = loginUser.getUser(); + AjaxResult ajax = AjaxResult.success(user); + ajax.put("roleGroup", userService.selectUserRoleGroup(loginUser.getUsername())); + ajax.put("postGroup", userService.selectUserPostGroup(loginUser.getUsername())); + return ajax; + } + + /** + * 修改用户 + */ + @Log(title = "个人信息", businessType = BusinessType.UPDATE) + @PutMapping + public AjaxResult updateProfile(@RequestBody SysUser user) + { + LoginUser loginUser = getLoginUser(); + SysUser sysUser = loginUser.getUser(); + user.setUserName(sysUser.getUserName()); + if (StringUtils.isNotEmpty(user.getPhonenumber()) + && UserConstants.NOT_UNIQUE.equals(userService.checkPhoneUnique(user))) + { + return AjaxResult.error("修改用户'" + user.getUserName() + "'失败，手机号码已存在"); + } + if (StringUtils.isNotEmpty(user.getEmail()) + && UserConstants.NOT_UNIQUE.equals(userService.checkEmailUnique(user))) + { + return AjaxResult.error("修改用户'" + user.getUserName() + "'失败，邮箱账号已存在"); + } + user.setUserId(sysUser.getUserId()); + user.setPassword(null); + if (userService.updateUserProfile(user) > 0) + { + // 更新缓存用户信息 + sysUser.setNickName(user.getNickName()); + sysUser.setPhonenumber(user.getPhonenumber()); + sysUser.setEmail(user.getEmail()); + sysUser.setSex(user.getSex()); + tokenService.setLoginUser(loginUser); + return AjaxResult.success(); + } + return AjaxResult.error("修改个人信息异常，请联系管理员"); + } + + /** + * 重置密码 + */ + @Log(title = "个人信息", businessType = BusinessType.UPDATE) + @PutMapping("/updatePwd") + public AjaxResult updatePwd(String oldPassword, String newPassword) + { + LoginUser loginUser = getLoginUser(); + String userName = loginUser.getUsername(); + String password = loginUser.getPassword(); + if (!SecurityUtils.matchesPassword(oldPassword, password)) + { + return AjaxResult.error("修改密码失败，旧密码错误"); + } + if (SecurityUtils.matchesPassword(newPassword, password)) + { + return AjaxResult.error("新密码不能与旧密码相同"); + } + if (userService.resetUserPwd(userName, SecurityUtils.encryptPassword(newPassword)) > 0) + { + // 更新缓存用户密码 + loginUser.getUser().setPassword(SecurityUtils.encryptPassword(newPassword)); + tokenService.setLoginUser(loginUser); + return AjaxResult.success(); + } + return AjaxResult.error("修改密码异常，请联系管理员"); + } + + /** + * 头像上传 + */ + @Log(title = "用户头像", businessType = BusinessType.UPDATE) + @PostMapping("/avatar") + public AjaxResult avatar(@RequestParam("avatarfile") MultipartFile file) throws IOException + { + if (!file.isEmpty()) + { + LoginUser loginUser = getLoginUser(); + String avatar = FileUploadUtils.upload(RuoYiConfig.getAvatarPath(), file); + if (userService.updateUserAvatar(loginUser.getUsername(), avatar)) + { + AjaxResult ajax = AjaxResult.success(); + ajax.put("imgUrl", avatar); + // 更新缓存用户头像 + loginUser.getUser().setAvatar(avatar); + tokenService.setLoginUser(loginUser); + return ajax; + } + } + return AjaxResult.error("上传图片异常，请联系管理员"); + } +} diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysRegisterController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysRegisterController.java new file mode 100644 index 0000000..fe19249 --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysRegisterController.java @@ -0,0 +1,38 @@ +package com.ruoyi.web.controller.system; + +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RestController; +import com.ruoyi.common.core.controller.BaseController; +import com.ruoyi.common.core.domain.AjaxResult; +import com.ruoyi.common.core.domain.model.RegisterBody; +import com.ruoyi.common.utils.StringUtils; +import com.ruoyi.framework.web.service.SysRegisterService; +import com.ruoyi.system.service.ISysConfigService; + +/** + * 注册验证 + * + * @author ruoyi + */ +@RestController +public class SysRegisterController extends BaseController +{ + @Autowired + private SysRegisterService registerService; + + @Autowired + private ISysConfigService configService; + + @PostMapping("/register") + public AjaxResult register(@RequestBody RegisterBody user) + { + if (!("true".equals(configService.selectConfigByKey("sys.account.registerUser")))) + { + return error("当前系统没有开启注册功能！"); + } + String msg = registerService.register(user); + return StringUtils.isEmpty(msg) ? success() : error(msg); + } +} diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysRoleController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysRoleController.java new file mode 100644 index 0000000..2abec1b --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysRoleController.java @@ -0,0 +1,245 @@ +package com.ruoyi.web.controller.system; + +import java.util.List; +import javax.servlet.http.HttpServletResponse; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.security.access.prepost.PreAuthorize; +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.ruoyi.common.annotation.Log; +import com.ruoyi.common.constant.UserConstants; +import com.ruoyi.common.core.controller.BaseController; +import com.ruoyi.common.core.domain.AjaxResult; +import com.ruoyi.common.core.domain.entity.SysRole; +import com.ruoyi.common.core.domain.entity.SysUser; +import com.ruoyi.common.core.domain.model.LoginUser; +import com.ruoyi.common.core.page.TableDataInfo; +import com.ruoyi.common.enums.BusinessType; +import com.ruoyi.common.utils.StringUtils; +import com.ruoyi.common.utils.poi.ExcelUtil; +import com.ruoyi.framework.web.service.SysPermissionService; +import com.ruoyi.framework.web.service.TokenService; +import com.ruoyi.system.domain.SysUserRole; +import com.ruoyi.system.service.ISysRoleService; +import com.ruoyi.system.service.ISysUserService; + +/** + * 角色信息 + * + * @author ruoyi + */ +@RestController +@RequestMapping("/system/role") +public class SysRoleController extends BaseController +{ + @Autowired + private ISysRoleService roleService; + + @Autowired + private TokenService tokenService; + + @Autowired + private SysPermissionService permissionService; + + @Autowired + private ISysUserService userService; + + @PreAuthorize("@ss.hasPermi('system:role:list')") + @GetMapping("/list") + public TableDataInfo list(SysRole role) + { + startPage(); + List list = roleService.selectRoleList(role); + return getDataTable(list); + } + + @Log(title = "角色管理", businessType = BusinessType.EXPORT) + @PreAuthorize("@ss.hasPermi('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, "角色数据"); + } + + /** + * 根据角色编号获取详细信息 + */ + @PreAuthorize("@ss.hasPermi('system:role:query')") + @GetMapping(value = "/{roleId}") + public AjaxResult getInfo(@PathVariable Long roleId) + { + roleService.checkRoleDataScope(roleId); + return AjaxResult.success(roleService.selectRoleById(roleId)); + } + + /** + * 新增角色 + */ + @PreAuthorize("@ss.hasPermi('system:role:add')") + @Log(title = "角色管理", businessType = BusinessType.INSERT) + @PostMapping + public AjaxResult add(@Validated @RequestBody SysRole role) + { + if (UserConstants.NOT_UNIQUE.equals(roleService.checkRoleNameUnique(role))) + { + return AjaxResult.error("新增角色'" + role.getRoleName() + "'失败，角色名称已存在"); + } + else if (UserConstants.NOT_UNIQUE.equals(roleService.checkRoleKeyUnique(role))) + { + return AjaxResult.error("新增角色'" + role.getRoleName() + "'失败，角色权限已存在"); + } + role.setCreateBy(getUsername()); + return toAjax(roleService.insertRole(role)); + + } + + /** + * 修改保存角色 + */ + @PreAuthorize("@ss.hasPermi('system:role:edit')") + @Log(title = "角色管理", businessType = BusinessType.UPDATE) + @PutMapping + public AjaxResult edit(@Validated @RequestBody SysRole role) + { + roleService.checkRoleAllowed(role); + roleService.checkRoleDataScope(role.getRoleId()); + if (UserConstants.NOT_UNIQUE.equals(roleService.checkRoleNameUnique(role))) + { + return AjaxResult.error("修改角色'" + role.getRoleName() + "'失败，角色名称已存在"); + } + else if (UserConstants.NOT_UNIQUE.equals(roleService.checkRoleKeyUnique(role))) + { + return AjaxResult.error("修改角色'" + role.getRoleName() + "'失败，角色权限已存在"); + } + role.setUpdateBy(getUsername()); + + if (roleService.updateRole(role) > 0) + { + // 更新缓存用户权限 + LoginUser loginUser = getLoginUser(); + if (StringUtils.isNotNull(loginUser.getUser()) && !loginUser.getUser().isAdmin()) + { + loginUser.setPermissions(permissionService.getMenuPermission(loginUser.getUser())); + loginUser.setUser(userService.selectUserByUserName(loginUser.getUser().getUserName())); + tokenService.setLoginUser(loginUser); + } + return AjaxResult.success(); + } + return AjaxResult.error("修改角色'" + role.getRoleName() + "'失败，请联系管理员"); + } + + /** + * 修改保存数据权限 + */ + @PreAuthorize("@ss.hasPermi('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)); + } + + /** + * 状态修改 + */ + @PreAuthorize("@ss.hasPermi('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(getUsername()); + return toAjax(roleService.updateRoleStatus(role)); + } + + /** + * 删除角色 + */ + @PreAuthorize("@ss.hasPermi('system:role:remove')") + @Log(title = "角色管理", businessType = BusinessType.DELETE) + @DeleteMapping("/{roleIds}") + public AjaxResult remove(@PathVariable Long[] roleIds) + { + return toAjax(roleService.deleteRoleByIds(roleIds)); + } + + /** + * 获取角色选择框列表 + */ + @PreAuthorize("@ss.hasPermi('system:role:query')") + @GetMapping("/optionselect") + public AjaxResult optionselect() + { + return AjaxResult.success(roleService.selectRoleAll()); + } + + /** + * 查询已分配用户角色列表 + */ + @PreAuthorize("@ss.hasPermi('system:role:list')") + @GetMapping("/authUser/allocatedList") + public TableDataInfo allocatedList(SysUser user) + { + startPage(); + List list = userService.selectAllocatedList(user); + return getDataTable(list); + } + + /** + * 查询未分配用户角色列表 + */ + @PreAuthorize("@ss.hasPermi('system:role:list')") + @GetMapping("/authUser/unallocatedList") + public TableDataInfo unallocatedList(SysUser user) + { + startPage(); + List list = userService.selectUnallocatedList(user); + return getDataTable(list); + } + + /** + * 取消授权用户 + */ + @PreAuthorize("@ss.hasPermi('system:role:edit')") + @Log(title = "角色管理", businessType = BusinessType.GRANT) + @PutMapping("/authUser/cancel") + public AjaxResult cancelAuthUser(@RequestBody SysUserRole userRole) + { + return toAjax(roleService.deleteAuthUser(userRole)); + } + + /** + * 批量取消授权用户 + */ + @PreAuthorize("@ss.hasPermi('system:role:edit')") + @Log(title = "角色管理", businessType = BusinessType.GRANT) + @PutMapping("/authUser/cancelAll") + public AjaxResult cancelAuthUserAll(Long roleId, Long[] userIds) + { + return toAjax(roleService.deleteAuthUsers(roleId, userIds)); + } + + /** + * 批量选择用户授权 + */ + @PreAuthorize("@ss.hasPermi('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)); + } +} diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysUserController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysUserController.java new file mode 100644 index 0000000..089f711 --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysUserController.java @@ -0,0 +1,237 @@ +package com.ruoyi.web.controller.system; + +import java.util.List; +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.security.access.prepost.PreAuthorize; +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.ruoyi.common.annotation.Log; +import com.ruoyi.common.constant.UserConstants; +import com.ruoyi.common.core.controller.BaseController; +import com.ruoyi.common.core.domain.AjaxResult; +import com.ruoyi.common.core.domain.entity.SysRole; +import com.ruoyi.common.core.domain.entity.SysUser; +import com.ruoyi.common.core.page.TableDataInfo; +import com.ruoyi.common.enums.BusinessType; +import com.ruoyi.common.utils.SecurityUtils; +import com.ruoyi.common.utils.StringUtils; +import com.ruoyi.common.utils.poi.ExcelUtil; +import com.ruoyi.system.service.ISysPostService; +import com.ruoyi.system.service.ISysRoleService; +import com.ruoyi.system.service.ISysUserService; + +/** + * 用户信息 + * + * @author ruoyi + */ +@RestController +@RequestMapping("/system/user") +public class SysUserController extends BaseController +{ + @Autowired + private ISysUserService userService; + + @Autowired + private ISysRoleService roleService; + + @Autowired + private ISysPostService postService; + + /** + * 获取用户列表 + */ + @PreAuthorize("@ss.hasPermi('system:user:list')") + @GetMapping("/list") + public TableDataInfo list(SysUser user) + { + startPage(); + List list = userService.selectUserList(user); + return getDataTable(list); + } + + @Log(title = "用户管理", businessType = BusinessType.EXPORT) + @PreAuthorize("@ss.hasPermi('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) + @PreAuthorize("@ss.hasPermi('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 = getUsername(); + String message = userService.importUser(userList, updateSupport, operName); + return AjaxResult.success(message); + } + + @PostMapping("/importTemplate") + public void importTemplate(HttpServletResponse response) + { + ExcelUtil util = new ExcelUtil(SysUser.class); + util.importTemplateExcel(response, "用户数据"); + } + + /** + * 根据用户编号获取详细信息 + */ + @PreAuthorize("@ss.hasPermi('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; + } + + /** + * 新增用户 + */ + @PreAuthorize("@ss.hasPermi('system:user:add')") + @Log(title = "用户管理", businessType = BusinessType.INSERT) + @PostMapping + public AjaxResult add(@Validated @RequestBody SysUser user) + { + if (UserConstants.NOT_UNIQUE.equals(userService.checkUserNameUnique(user.getUserName()))) + { + return AjaxResult.error("新增用户'" + user.getUserName() + "'失败，登录账号已存在"); + } + else if (StringUtils.isNotEmpty(user.getPhonenumber()) + && UserConstants.NOT_UNIQUE.equals(userService.checkPhoneUnique(user))) + { + return AjaxResult.error("新增用户'" + user.getUserName() + "'失败，手机号码已存在"); + } + else if (StringUtils.isNotEmpty(user.getEmail()) + && UserConstants.NOT_UNIQUE.equals(userService.checkEmailUnique(user))) + { + return AjaxResult.error("新增用户'" + user.getUserName() + "'失败，邮箱账号已存在"); + } + user.setCreateBy(getUsername()); + user.setPassword(SecurityUtils.encryptPassword(user.getPassword())); + return toAjax(userService.insertUser(user)); + } + + /** + * 修改用户 + */ + @PreAuthorize("@ss.hasPermi('system:user:edit')") + @Log(title = "用户管理", businessType = BusinessType.UPDATE) + @PutMapping + public AjaxResult edit(@Validated @RequestBody SysUser user) + { + userService.checkUserAllowed(user); + userService.checkUserDataScope(user.getUserId()); + if (StringUtils.isNotEmpty(user.getPhonenumber()) + && UserConstants.NOT_UNIQUE.equals(userService.checkPhoneUnique(user))) + { + return AjaxResult.error("修改用户'" + user.getUserName() + "'失败，手机号码已存在"); + } + else if (StringUtils.isNotEmpty(user.getEmail()) + && UserConstants.NOT_UNIQUE.equals(userService.checkEmailUnique(user))) + { + return AjaxResult.error("修改用户'" + user.getUserName() + "'失败，邮箱账号已存在"); + } + user.setUpdateBy(getUsername()); + return toAjax(userService.updateUser(user)); + } + + /** + * 删除用户 + */ + @PreAuthorize("@ss.hasPermi('system:user:remove')") + @Log(title = "用户管理", businessType = BusinessType.DELETE) + @DeleteMapping("/{userIds}") + public AjaxResult remove(@PathVariable Long[] userIds) + { + if (ArrayUtils.contains(userIds, getUserId())) + { + return error("当前用户不能删除"); + } + return toAjax(userService.deleteUserByIds(userIds)); + } + + /** + * 重置密码 + */ + @PreAuthorize("@ss.hasPermi('system:user:resetPwd')") + @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(getUsername()); + return toAjax(userService.resetPwd(user)); + } + + /** + * 状态修改 + */ + @PreAuthorize("@ss.hasPermi('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(getUsername()); + return toAjax(userService.updateUserStatus(user)); + } + + /** + * 根据用户编号获取授权角色 + */ + @PreAuthorize("@ss.hasPermi('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; + } + + /** + * 用户授权角色 + */ + @PreAuthorize("@ss.hasPermi('system:user:edit')") + @Log(title = "用户管理", businessType = BusinessType.GRANT) + @PutMapping("/authRole") + public AjaxResult insertAuthRole(Long userId, Long[] roleIds) + { + userService.checkUserDataScope(userId); + userService.insertUserAuth(userId, roleIds); + return success(); + } +} diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/tool/SwaggerController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/tool/SwaggerController.java new file mode 100644 index 0000000..f66ca24 --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/tool/SwaggerController.java @@ -0,0 +1,24 @@ +package com.ruoyi.web.controller.tool; + +import org.springframework.security.access.prepost.PreAuthorize; +import org.springframework.stereotype.Controller; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import com.ruoyi.common.core.controller.BaseController; + +/** + * swagger 接口 + * + * @author ruoyi + */ +@Controller +@RequestMapping("/tool/swagger") +public class SwaggerController extends BaseController +{ + @PreAuthorize("@ss.hasPermi('tool:swagger:view')") + @GetMapping() + public String index() + { + return redirect("/swagger-ui.html"); + } +} diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/tool/TestController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/tool/TestController.java new file mode 100644 index 0000000..3361ef9 --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/tool/TestController.java @@ -0,0 +1,181 @@ +package com.ruoyi.web.controller.tool; + +import java.util.ArrayList; +import java.util.LinkedHashMap; +import java.util.List; +import java.util.Map; +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.ruoyi.common.core.controller.BaseController; +import com.ruoyi.common.core.domain.AjaxResult; +import com.ruoyi.common.utils.StringUtils; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiImplicitParam; +import io.swagger.annotations.ApiImplicitParams; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import io.swagger.annotations.ApiOperation; + +/** + * swagger 用户测试方法 + * + * @author ruoyi + */ +@Api("用户信息管理") +@RestController +@RequestMapping("/test/user") +public class TestController extends BaseController +{ + private final static Map users = new LinkedHashMap(); + { + users.put(1, new UserEntity(1, "admin", "admin123", "15888888888")); + users.put(2, new UserEntity(2, "ry", "admin123", "15666666666")); + } + + @ApiOperation("获取用户列表") + @GetMapping("/list") + public AjaxResult userList() + { + List userList = new ArrayList(users.values()); + return AjaxResult.success(userList); + } + + @ApiOperation("获取用户详细") + @ApiImplicitParam(name = "userId", value = "用户ID", required = true, dataType = "int", paramType = "path", dataTypeClass = Integer.class) + @GetMapping("/{userId}") + public AjaxResult getUser(@PathVariable Integer userId) + { + if (!users.isEmpty() && users.containsKey(userId)) + { + return AjaxResult.success(users.get(userId)); + } + else + { + return error("用户不存在"); + } + } + + @ApiOperation("新增用户") + @ApiImplicitParams({ + @ApiImplicitParam(name = "userId", value = "用户id", dataType = "Integer", dataTypeClass = Integer.class), + @ApiImplicitParam(name = "username", value = "用户名称", dataType = "String", dataTypeClass = String.class), + @ApiImplicitParam(name = "password", value = "用户密码", dataType = "String", dataTypeClass = String.class), + @ApiImplicitParam(name = "mobile", value = "用户手机", dataType = "String", dataTypeClass = String.class) + }) + @PostMapping("/save") + public AjaxResult save(UserEntity user) + { + if (StringUtils.isNull(user) || StringUtils.isNull(user.getUserId())) + { + return error("用户ID不能为空"); + } + return AjaxResult.success(users.put(user.getUserId(), user)); + } + + @ApiOperation("更新用户") + @PutMapping("/update") + public AjaxResult update(@RequestBody UserEntity user) + { + if (StringUtils.isNull(user) || StringUtils.isNull(user.getUserId())) + { + return error("用户ID不能为空"); + } + if (users.isEmpty() || !users.containsKey(user.getUserId())) + { + return error("用户不存在"); + } + users.remove(user.getUserId()); + return AjaxResult.success(users.put(user.getUserId(), user)); + } + + @ApiOperation("删除用户信息") + @ApiImplicitParam(name = "userId", value = "用户ID", required = true, dataType = "int", paramType = "path", dataTypeClass = Integer.class) + @DeleteMapping("/{userId}") + public AjaxResult delete(@PathVariable Integer userId) + { + if (!users.isEmpty() && users.containsKey(userId)) + { + users.remove(userId); + return success(); + } + else + { + return error("用户不存在"); + } + } +} + +@ApiModel(value = "UserEntity", description = "用户实体") +class UserEntity +{ + @ApiModelProperty("用户ID") + private Integer userId; + + @ApiModelProperty("用户名称") + private String username; + + @ApiModelProperty("用户密码") + private String password; + + @ApiModelProperty("用户手机") + private String mobile; + + public UserEntity() + { + + } + + public UserEntity(Integer userId, String username, String password, String mobile) + { + this.userId = userId; + this.username = username; + this.password = password; + this.mobile = mobile; + } + + public Integer getUserId() + { + return userId; + } + + public void setUserId(Integer userId) + { + this.userId = userId; + } + + 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; + } + + public String getMobile() + { + return mobile; + } + + public void setMobile(String mobile) + { + this.mobile = mobile; + } +} diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/core/config/SwaggerConfig.java b/ruoyi-admin/src/main/java/com/ruoyi/web/core/config/SwaggerConfig.java new file mode 100644 index 0000000..ae1c3ec --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/core/config/SwaggerConfig.java @@ -0,0 +1,125 @@ +package com.ruoyi.web.core.config; + +import java.util.ArrayList; +import java.util.List; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.beans.factory.annotation.Value; +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; +import com.ruoyi.common.config.RuoYiConfig; +import io.swagger.annotations.ApiOperation; +import io.swagger.models.auth.In; +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.Docket; + +/** + * Swagger2的接口配置 + * + * @author ruoyi + */ +@Configuration +public class SwaggerConfig +{ + /** 系统基础配置 */ + @Autowired + private RuoYiConfig ruoyiConfig; + + /** 是否开启swagger */ + @Value("${swagger.enabled}") + private boolean enabled; + + /** 设置请求的统一前缀 */ + @Value("${swagger.pathMapping}") + private String pathMapping; + + /** + * 创建API + */ + @Bean + public Docket createRestApi() + { + return new Docket(DocumentationType.OAS_30) + // 是否启用Swagger + .enable(enabled) + // 用来创建该API的基本信息，展示在文档的页面中（自定义展示的信息） + .apiInfo(apiInfo()) + // 设置哪些接口暴露给Swagger展示 + .select() + // 扫描所有有注解的api，用这种方式更灵活 + .apis(RequestHandlerSelectors.withMethodAnnotation(ApiOperation.class)) + // 扫描指定包中的swagger注解 + // .apis(RequestHandlerSelectors.basePackage("com.ruoyi.project.tool.swagger")) + // 扫描所有 .apis(RequestHandlerSelectors.any()) + .paths(PathSelectors.any()) + .build() + /* 设置安全模式，swagger可以设置访问token */ + .securitySchemes(securitySchemes()) + .securityContexts(securityContexts()) + .pathMapping(pathMapping); + } + + /** + * 安全模式，这里指定token通过Authorization头请求头传递 + */ + private List securitySchemes() + { + List apiKeyList = new ArrayList(); + apiKeyList.add(new ApiKey("Authorization", "Authorization", In.HEADER.toValue())); + return apiKeyList; + } + + /** + * 安全上下文 + */ + private List securityContexts() + { + List securityContexts = new ArrayList<>(); + securityContexts.add( + SecurityContext.builder() + .securityReferences(defaultAuth()) + .operationSelector(o -> o.requestMappingPattern().matches("/.*")) + .build()); + return securityContexts; + } + + /** + * 默认的安全上引用 + */ + 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() + { + // 用ApiInfoBuilder进行定制 + return new ApiInfoBuilder() + // 设置标题 + .title("标题：若依管理系统_接口文档") + // 描述 + .description("描述：用于管理集团旗下公司的人员信息,具体包括XXX,XXX模块...") + // 作者信息 + .contact(new Contact(ruoyiConfig.getName(), null, null)) + // 版本 + .version("版本号:" + ruoyiConfig.getVersion()) + .build(); + } +} diff --git a/ruoyi-admin/src/main/resources/META-INF/spring-devtools.properties b/ruoyi-admin/src/main/resources/META-INF/spring-devtools.properties new file mode 100644 index 0000000..2b23f85 --- /dev/null +++ b/ruoyi-admin/src/main/resources/META-INF/spring-devtools.properties @@ -0,0 +1 @@ +restart.include.json=/com.alibaba.fastjson.*.jar \ No newline at end of file diff --git a/ruoyi-admin/src/main/resources/application-druid.yml b/ruoyi-admin/src/main/resources/application-druid.yml new file mode 100644 index 0000000..290afe7 --- /dev/null +++ b/ruoyi-admin/src/main/resources/application-druid.yml @@ -0,0 +1,57 @@ +# 数据源配置 +spring: + datasource: + type: com.alibaba.druid.pool.DruidDataSource + driverClassName: com.mysql.cj.jdbc.Driver + druid: + # 主库数据源 + master: + url: jdbc:mysql://192.168.16.219:3306/ywpt?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&serverTimezone=Asia/Shanghai&allowMultiQueries=true&allowPublicKeyRetrieval=true + username: ywpt + password: ywPT_2022! + # 从库数据源 + slave: + # 从数据源开关/默认关闭 + enabled: false + url: + username: + password: + # 初始连接数 + initialSize: 5 + # 最小连接池数量 + minIdle: 10 + # 最大连接池数量 + maxActive: 20 + # 配置获取连接等待超时的时间 + maxWait: 60000 + # 配置间隔多久才进行一次检测，检测需要关闭的空闲连接，单位是毫秒 + timeBetweenEvictionRunsMillis: 60000 + # 配置一个连接在池中最小生存的时间，单位是毫秒 + minEvictableIdleTimeMillis: 300000 + # 配置一个连接在池中最大生存的时间，单位是毫秒 + maxEvictableIdleTimeMillis: 900000 + # 配置检测连接是否有效 + validationQuery: SELECT 1 FROM DUAL + testWhileIdle: true + testOnBorrow: false + testOnReturn: false + webStatFilter: + enabled: true + statViewServlet: + enabled: true + # 设置白名单，不填则允许所有访问 + allow: + url-pattern: /druid/* + # 控制台管理用户名和密码 + login-username: ruoyi + login-password: 123456 + filter: + stat: + enabled: true + # 慢SQL记录 + log-slow-sql: true + slow-sql-millis: 1000 + merge-sql: true + wall: + config: + multi-statement-allow: true diff --git a/ruoyi-admin/src/main/resources/application-test.yml b/ruoyi-admin/src/main/resources/application-test.yml new file mode 100644 index 0000000..b684930 --- /dev/null +++ b/ruoyi-admin/src/main/resources/application-test.yml @@ -0,0 +1,60 @@ +# 数据源配置 +spring: + datasource: + type: com.alibaba.druid.pool.DruidDataSource + druid: + # 主库数据源 + master: + driverClassName: com.mysql.cj.jdbc.Driver + url: jdbc:mysql://192.168.16.219:3306/lscx?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&serverTimezone=Asia/Shanghai&allowMultiQueries=true&allowPublicKeyRetrieval=true&rewriteBatchedStatements=true + username: lscx + password: lscx_2024! + # 从库数据源 + shardsource: + # 从数据源开关/默认关闭 + enabled: true + driverClassName: com.microsoft.sqlserver.jdbc.SQLServerDriver +# url: jdbc:sqlserver://localhost:1433;DatabaseName=softdb;encrypt=false; + url: jdbc:sqlserver://192.168.16.232:1433;DatabaseName=hy_shdp;ncrypt=false; + username: sa +# password: 1q2w#E$R + password: admin + # 初始连接数 + initialSize: 5 + # 最小连接池数量 + minIdle: 10 + # 最大连接池数量 + maxActive: 20 + # 配置获取连接等待超时的时间 + maxWait: 60000 + # 配置间隔多久才进行一次检测，检测需要关闭的空闲连接，单位是毫秒 + timeBetweenEvictionRunsMillis: 60000 + # 配置一个连接在池中最小生存的时间，单位是毫秒 + minEvictableIdleTimeMillis: 300000 + # 配置一个连接在池中最大生存的时间，单位是毫秒 + maxEvictableIdleTimeMillis: 900000 + # 配置检测连接是否有效 + validationQuery: SELECT 1 + testWhileIdle: true + testOnBorrow: false + testOnReturn: false + webStatFilter: + enabled: true + statViewServlet: + enabled: true + # 设置白名单，不填则允许所有访问 + allow: + url-pattern: /druid/* + # 控制台管理用户名和密码 + login-username: ruoyi + login-password: 123456 + filter: + stat: + enabled: true + # 慢SQL记录 + log-slow-sql: true + slow-sql-millis: 1000 + merge-sql: true + wall: + config: + multi-statement-allow: true diff --git a/ruoyi-admin/src/main/resources/application.yml b/ruoyi-admin/src/main/resources/application.yml new file mode 100644 index 0000000..7dceacb --- /dev/null +++ b/ruoyi-admin/src/main/resources/application.yml @@ -0,0 +1,147 @@ +# 项目相关配置 +ruoyi: + # 名称 + name: RuoYi + # 版本 + version: 3.8.2 + # 版权年份 + copyrightYear: 2022 + # 实例演示开关 + demoEnabled: true + # 文件路径 示例（ Windows配置D:/ruoyi/uploadPath，Linux配置 /home/ruoyi/uploadPath） + profile: profile + # 获取ip地址开关 + addressEnabled: false + # 验证码类型 math 数组计算 char 字符验证 + captchaType: math + +# 开发环境配置 +server: + # 服务器的HTTP端口，默认为8080 + port: 8111 + servlet: + # 应用的访问路径 + context-path: /swls + tomcat: + # tomcat的URI编码 + uri-encoding: UTF-8 + # 连接数满后的排队数，默认为100 + accept-count: 1000 + threads: + # tomcat最大线程数，默认为200 + max: 800 + # Tomcat启动初始化的线程数，默认值10 + min-spare: 100 + +# 日志配置 +logging: + level: + com.ruoyi: debug + org.springframework: warn + +# Spring配置 +spring: + # 资源信息 + messages: + # 国际化资源文件路径 + basename: i18n/messages + profiles: +# active: druid + active: test + # 文件上传 + servlet: + multipart: + # 单个文件大小 + max-file-size: 10MB + # 设置总上传的文件大小 + max-request-size: 20MB + jackson: + date-format: yyyy-MM-dd HH:mm:ss + time-zone: GMT+8 + # 服务模块 +# devtools: +# restart: +# # 热部署开关 +# enabled: true + # redis 配置 + redis: + # 地址 + host: 127.0.0.1 + # 端口，默认为6379 + port: 6379 + # 数据库索引 + database: 8 + # 密码 + password: + # 连接超时时间 + timeout: 10s + lettuce: + pool: + # 连接池中的最小空闲连接 + min-idle: 0 + # 连接池中的最大空闲连接 + max-idle: 8 + # 连接池的最大数据库连接数 + max-active: 8 + # #连接池最大阻塞等待时间（使用负值表示没有限制） + max-wait: -1ms + +# token配置 +token: + # 令牌自定义标识 + header: Authorization + # 令牌密钥 + secret: abcdefghijklmnopqrstuvwxyz + # 令牌有效期（默认30分钟） + expireTime: 30 + +# MyBatis-plus配置 +mybatis-plus: + # 搜索指定包别名 + typeAliasesPackage: com.ruoyi.**.domain + # 配置mapper的扫描，找到所有的mapper.xml映射文件 + mapperLocations: classpath*:mapper/**/*Mapper.xml + # 加载全局的配置文件 + configLocation: classpath:mybatis/mybatis-config.xml +# global-config: +# db-config: +# logic-delete-field: flag # 全局逻辑删除的实体字段名(since 3.3.0,配置后可以忽略不配置步骤2) +# logic-delete-value: 1 # 逻辑已删除值(默认为 1) +# logic-not-delete-value: 0 # 逻辑未删除值(默认为 0) + + +# PageHelper分页插件 +pagehelper: + helperDialect: mysql + supportMethodsArguments: true + params: count=countSql + +# Swagger配置 +swagger: + # 是否开启swagger + enabled: true + # 请求前缀 + pathMapping: /dev-api + +# 防止XSS攻击 +xss: + # 过滤开关 + enabled: true + # 排除链接（多个用逗号分隔） + excludes: /system/notice + # 匹配链接 + urlPatterns: /system/*,/monitor/*,/tool/* + +#camera: +# register: +# ip: 192.168.1.11 +## ip: 172.17.0.2 +# port: 8020 +# username: admin +# password: admin123 +localip: 172.16.46.58 +serverip: 121.40.203.197 + + +ssoip: localhost +ssoport: 9000 diff --git a/ruoyi-admin/src/main/resources/banner.txt b/ruoyi-admin/src/main/resources/banner.txt new file mode 100644 index 0000000..0931cb8 --- /dev/null +++ b/ruoyi-admin/src/main/resources/banner.txt @@ -0,0 +1,24 @@ +Application Version: ${ruoyi.version} +Spring Boot Version: ${spring-boot.version} +//////////////////////////////////////////////////////////////////// +// _ooOoo_ // +// o8888888o // +// 88" . "88 // +// (| ^_^ |) // +// O\ = /O // +// ____/`---'\____ // +// .' \\| |// `. // +// / \\||| : |||// \ // +// / _||||| -:- |||||- \ // +// | | \\\ - /// | | // +// | \_| ''\---/'' | | // +// \ .-\__ `-` ___/-. / // +// ___`. .' /--.--\ `. . ___ // +// ."" '< `.___\_<|>_/___.' >'"". // +// | | : `- \`.;`\ _ /`;.`/ - ` : | | // +// \ \ `-. \_ __\ /__ _/ .-` / / // +// ========`-.____`-.___\_____/___.-`____.-'======== // +// `=---=' // +// ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ // +// 佛祖保佑 永不宕机 永无BUG // +//////////////////////////////////////////////////////////////////// \ No newline at end of file diff --git a/ruoyi-admin/src/main/resources/excel/blank.xls b/ruoyi-admin/src/main/resources/excel/blank.xls new file mode 100644 index 0000000000000000000000000000000000000000..857a6dc1ca13bc93739e61ba7ebb95f9222f99f5 GIT binary patch literal 20480 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 H!yfn_4_1sr literal 0 HcmV?d00001 diff --git a/ruoyi-admin/src/main/resources/excel/dayEvaporationWater.xls b/ruoyi-admin/src/main/resources/excel/dayEvaporationWater.xls new file mode 100644 index 0000000000000000000000000000000000000000..5073a455266ab7319f806b287eec11a2d8f00a51 GIT binary patch literal 20480 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 TwuiegSoqU;0QH~ng&z2CoBY~w literal 0 HcmV?d00001 diff --git a/ruoyi-admin/src/main/resources/excel/dayFlow.xls b/ruoyi-admin/src/main/resources/excel/dayFlow.xls new file mode 100644 index 0000000000000000000000000000000000000000..927ce8559eb80a011c33bf55c09552ac38418880 GIT binary patch literal 20480 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 rD2X5F`M?3x669p#B>^lY##Ms1D2# literal 0 HcmV?d00001 diff --git a/ruoyi-admin/src/main/resources/excel/dayMaxRain.xls b/ruoyi-admin/src/main/resources/excel/dayMaxRain.xls new file mode 100644 index 0000000000000000000000000000000000000000..b91245cccccdfd0cccc58a5555dbecf46a7fb50f GIT binary patch literal 20992 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 literal 0 HcmV?d00001 diff --git a/ruoyi-admin/src/main/resources/excel/dayRain.xls b/ruoyi-admin/src/main/resources/excel/dayRain.xls new file mode 100644 index 0000000000000000000000000000000000000000..07e01acb95284f5ad5a072ff0c247ceb7a35490d GIT binary patch literal 20480 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 literal 0 HcmV?d00001 diff --git a/ruoyi-admin/src/main/resources/excel/daySedimentConcentration.xls b/ruoyi-admin/src/main/resources/excel/daySedimentConcentration.xls new file mode 100644 index 0000000000000000000000000000000000000000..f4d5a821bde94462b25e2b3b59252b4b978018c0 GIT binary patch literal 20480 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 literal 0 HcmV?d00001 diff --git a/ruoyi-admin/src/main/resources/excel/dayWaterLever.xls b/ruoyi-admin/src/main/resources/excel/dayWaterLever.xls new file mode 100644 index 0000000000000000000000000000000000000000..f7b8f4d5a970782ee65cc7aaed60f463c7ff12a3 GIT binary patch literal 20480 zcmeHP2UrwW*S@6TGfcDwVX55IFsB_y;lY34Cn~ji&=q0#O$t zwz)n;DMSN^bs!o-G=gXhu`Wath|mRy8ANl4^&nb6w1j8{u|C8G5UnBFK(vL}5Mm>U zb`b3$${;#G#QuX(4(Cl+*Z&|I|FN$2B4go`0BsRY#y~oOOo0}teXxQa!&F`jW-=)r z2`QkCq&=O`$B=h3oews-Epoz3>}U}BL+KO9C^D4tV-zj?jH5Xbidf=JkgVe*w9HfZSgIUn-z)CZKOBAg?DNHxQ6>+r>`e2IHz85jm2F zN=M>E+#xyYQn`$qa0U1GDVe$|SCbDV=UExesUzE2Z>bdH5=hJWmb{r`y+BSqbx0CcIP2oco zCR7Z{g$lqtA?PX4L@kBuL06a0SM|b#_2`0wVF;*Dn0gH-ZZIYA)QbzJSvx)rZAE#) z*taC2NFrBjrKZqIk;DZeTOJ8)+eunL&$Qt;QS}ia<5ti+ZMnvb)BL5-2Zs z^%I{Q*HnCRTxU`8s|36Wfu$7953arV(|Jk-?Hn4J)F{CY-YC1a2fdT zN%@cKIYxfW{+K_6OI8)$$=B zGOwC?;hK?>@2mDx;!5G*I#ONUjFN*PNA5<+alNUo??uUR4XQ4;*DBY*NfrV39J?= zUDZ0ZF5Cf%H4Sh$s0>m`YR$s7+8~)z0*(_scv?f3uxHPn8iP7KGJPJIlt(71mMN7* zHFyFZ7)&H8dWrW{Nq&^0v&CVGqmlW&ONEjSYdyrZ9FGgUnE;-ZFk z@L;7zCIHd|3ef=%=&4j$s0orw^!^IOSskPzx5j|!mbr?*^u(nGM2HiH4@?EB)073G zi2XuhU0EPSUB3{-jRoT4%Lf7qH9?>{?w~-o4sufc6qzz&CiNNwI1vD823ZV!Z@@#O)n& z2LcK;L7+OVL4m0bz1_)JFx6qMF%Q;(RgX$7 zQuV3SGF3{YR;dP%8o9qe}0ih5#l;f1m@617{fzE2@%E4@7yO{;XXWDYNzgz z*ib1UOfGF=Ky3<%^y8K<*Fe`X0d&lvRZZYAA?#z_pL>3hb2N=Fxi;@RqOB(={D5Qf(WTO<3ZSg?3u zv+f!NiyA_~m_w^t!UJ_F5w#qwlaa3IKQMRsgc)=)lexLP!X13ZDROGG}f znbVlaU|U3{p_nbjZiwo15J~Kmbzx6N*aG!(#161?1JHh26g8pk0a}{{1MP;;%|8oT z2GH6pXlP5=r_taP3E*<-pus6K9vy&2t(+npms3ZroT{Kbv~$V_?WC1c6||>zPWhna zS~+E)Euoz>IK_#I%V}c`PMHbI0j5u_oFW{T(Z+Af6?Aj$obo}tY2{P}9iW|4K4^EX zoHEdsBv6x6e;!VoX>f|S`}CyOLOZ7j$K}*RE2k>xmfAVxgZ9+QsS3K4c24=Ay|i-5 zKwFa5nw&Q0;nZ7$Q(XPfoVL-@yWb1JlnJ;xPKZ;CR(J~Q;2tBbqtdhh znUq2sHD#$)GF;7rh!4Bjn$&r>A!CLNS4{9o8Xa$3)UD1*nQ2IQ^7_dOZw3rIcb+itnlvEga= z`0_%_M^BO(oZFXK@0U(zCq^VYl`fpMWB*;*wf%0T4lmsAM*Sck*=Bx+{*SLzHoX^K z;nt*%IPjAQE2wfi?fnO%KjC@FQP_Au@-*D`Mu(pbD9*C=w>akXDmdfO&(Gz>g^8u{ z``QJ%q{tj|^yU@sm2giqmPFsaL*yQNjPhTOE=rmq zKm7XK#W@>&FRi+?dV)o1qItU#uZ|JokuTQ#apKdgi*n8JiVt zoYxx7>*Tg%WL{#=$JdGL_3^8x=3m=t`QDEhr)Y~*(%3`y?)jfB+dk^gE)i}c`!)Pz6Z3Mv|MdKS zjp*B|Zq&@7olBnBw48T-e|P^5^%r_?Opi)B()+31zKMUD>&Clm$=lpuZ=b1im#+Je zF}ZwuScJTj&Dkll3*)5wMmu!Y%awG9G4JB9f9vGg_hV+y9y+>XxB7D&oL9uB*~d!j z4B7go^!FE0ZBlFwPpx|Jv3&3E>A`D)rzTXr)Zci)taZC5r>v&GE6z`u{wCt(hby}V z2UXq4s^7e7*^A(+clkek3~||z7w&m9>2<|kXV0S_AACR7ep;D+L*w|Qweqhd0WSxP zo8P!>Ro#qHE$m)i&v{%pC(ztQ@2*{GBkNWLwiDYWA8e91b8>oH_2gU+4G-D=B7*t+B^Px)0S_F?}ly7xpmQf=FU#jT?cw6 z7PVgQvLtRsZ+D$HncckKCQZ&Vb>3MRb9P1aFzY)`q4mthc6=XGW;&v2LPztn7w!y~ zZMrqL_|@ul=eGP*(L89($r)&V6==zGv3mJ>D(QHKvKA@U&&9J zZMfEB@%C{R%B+KVao=T+TY2kA{)lmUlPz4shIq9b;MDNsH%4|jM)%}bV|6bZL=H1* z955xh-qD!Iv(3%FJNM(}>;a9;9lcFlI@y%(Jh!NmQ8)j-KfB(q>V7#;vOVtWW`U7c ze>>JQpmC48ha<*(v&_TfRZ>QJN$h6-4F{v6e(!fOHe^*)>z0Ok31`MStQ*KQU9?n^5`rM?$%Lz?WT1SlTH*NpR@4wBBeABUktEKTI)PJR@Rp>Ngc< z>pzOWFmu(i+^=TN{a2mQHZ3cnB1X+Nw!L2XEbP4P!OHCRmlaE5ubAm(7skiT?lSf6 z`B6KU4{Y_QX!m1xx2?^dEVsN+KGgf}iNp)r!siTm^ZgE=T*T1~m7)IQ?(4X} z>SFI$y5n%r!BK}VZ(HJ#C{A45Uwk09$h+Hs!_rNPTNAGOk1m&uJ8ryd)U5;03Omb3 z8t!)+|Dj^E=tj>?+iv_|ab(o*7j+->8(`S>{^_?p_J%8WL@RX*^eWe1*jIjjQu{ow zMj5}ICX;fPlsHG*+qMv}-+&a5rxlzUHl6|L!UJY|>r z!*I!%fW=)$JQ%uui|75`M;2~TY`bcAY5&1@*XXZI{`&@V&Q~TMCB~N*uH6NCwm=E) zXR*IxX?^bfK{Z|7>YVVhNUNMNSvq#?l^;zPHMu+I(vGV-X%GC3n+MAyetTxT(_QM3 zKIG_%5r>woK38v;&(Gd*+iavQpDY=_^7!b3zby#qWz~J|%~mnHqh~A_8}Q6>_@XW@ z-I~aIxp;UlpHSDib58E1d41lc?hM?R)$f7h#?7H;4_)e5IVpMFt5u@ur{zb6nocVv z)=PV?RPOy0Xft=Xr@hsns)*2uH)rX(Y&cU?=Co>CSIPN-KmK^?7xmi;*|+kNKcTJ- zVSBS4qyyWI9h0CKlQ6i?lyQoQgYceW$D#|}PkNb#S9bh3^I@~jxqCvSji1aYTu``S zdcoNha;tMU_T=~dP}#MlPuLcjRlNJn`#=1e6uGnV{<_2lIluRL(l;t@R!s8!E!+S2 z@TlpbQdjSuIy0TW{X>)!b$wa=hmTCXnm*aw=gFEDcdT>bvz#{F(U))C7qp;YPv&Za z=-_p2Cl0a*I5Tyq{9@AiOOxKEHjCHqmo=?L(8_iVv-?#R&abz<#Pmd&`|jl{8~Oj@ zax?5~-o&FhQ|p&3iHn=K)T{5;dhW@)d{#cT=`+^!oo@TfUhY|^c2&44+f-zHJ9gmk z?_MRgIxlu>9TFiXJ_?h{P7KE6UtBa;bt0cr+%1W26Bu zaWnvbe^l-A;G1dQu))FfNcBRw!xWUO3+-EDL-oSi7lsgY*Vbl(H_>!J2jvji!$F%R z4mCQUWgy(zvn~0n$sKxVPjef`YtK6nX{S^T#=T`$f$G8tXFElmQ#a6D4DM<{g@KPV zH85Cfhn`(@sYW({H&TLObj_kVLI(W)B!jcs$&|*BOqL8cdiCJ(uMyD)KOrdfU{R(| zZy>`%SADfBsoIr++LaM?<%5r3z%El7s!6*RT?+S$(darv@IqKVDrGMJ&2ZSA{;$lzxFpKaEm!)x7@FhWUSO ziofUun$)qo;^(%LOoKuA(Un>!&4e8hZjY*+j(XSU$KmSq&?pN>Y0VJOUU_=tG2@A$ zVvq(T?pN0mlIDVeM#qWNn`2_?heqo974>J7OgNFw|gGC{z?N5djZ+L>gr%EmX&@Q28sUpDT? zEre~sg)B6Hf^TFxaPv^kL~b6wHivnba`SM;#ym{9c}P3vVamZjhlxo zpfC9I3T__56#m45n}@!m9sZnx%c7Y2fxPt>^iXao3{!ZY$jxJzGULf(YK(W9Tsx*# zxR~MQVL4bP-Xe1IupG>@ur9gps(CH4@PZ1BxyjMv(E9213J76Zpu1e z4{v7}fLHK_1ANeDco=dZ8ve?HnN&n_VS6%{0ia<7j(q_`N|K?jb>S0jh_wZu#W=+1 zDUhC+q+;xfc;1L^O_2#f8D6kupD3;g2|;CYl=}Uc2)-zok1jzCvo09`5qey1|)b1-fDIu-Zj5)Fs2E^&#Rp9iVIAYuGyN=zhhB|6M6^h1?(`$OG0M ztA~RHy~2qZ|2GFtwAk1299s`3LTodfCUDxp=>_xt8~#}g;JhW$BPJ`wrP$Z8m&#_Xef_RS zoay#OQsU;k_of%f7D7bMF+UI@gwzl?;9S)aBKr3gM7+Vn*%{}iaS(Bi+YOD5^OOXX z?IFcE&u#4FC6JI1JRDdjJC$}*gy*Tx9I5|RgL*jk^@rQL-b4ns60z_ZK`l%`409g8 z|5%>5w74|a!`3us8Tjx1Zf84?>2hQlAVa^gKVqF+AVNsRx?;IlM^lI)5V>{0d<;yA z062eRKzqbXzze{e4hOVPgNXIsU45-f+QFh~81+AB=%v=@{Xd#OKxNN(0Q;8#+a?2@ z`uTLbe?E+6{@j)^YNyL&(%p8&lf271FV=s97Kj)0|k4BSvFAO{0;pU{c4 z1*vAA#PNb-4&N;GhhsBXI{Oe0IO6|Vz|as-CIkNiQ=iEn literal 0 HcmV?d00001 diff --git a/ruoyi-admin/src/main/resources/excel/dayWaterTemperature.xls b/ruoyi-admin/src/main/resources/excel/dayWaterTemperature.xls new file mode 100644 index 0000000000000000000000000000000000000000..789ab2f685c453afeb27ef0312336cba6274c7c9 GIT binary patch literal 20480 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 literal 0 HcmV?d00001 diff --git a/ruoyi-admin/src/main/resources/excel/floodExcerpt.xls b/ruoyi-admin/src/main/resources/excel/floodExcerpt.xls new file mode 100644 index 0000000000000000000000000000000000000000..18ce9e988ed7c0169e65e4b612b8c1b50567af33 GIT binary patch literal 20480 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 literal 0 HcmV?d00001 diff --git a/ruoyi-admin/src/main/resources/excel/followingTheTideExcerpt.xls b/ruoyi-admin/src/main/resources/excel/followingTheTideExcerpt.xls new file mode 100644 index 0000000000000000000000000000000000000000..e7ca1e007c0083f534de9699a99e9782660ce86b GIT binary patch literal 20480 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 kz#DY@;GYkLLs?s}_61o0NISt_7f}%0lMJ$OL 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 literal 0 HcmV?d00001 diff --git a/ruoyi-admin/src/main/resources/excel/maxFloodScale.xls b/ruoyi-admin/src/main/resources/excel/maxFloodScale.xls new file mode 100644 index 0000000000000000000000000000000000000000..f4891e6f5bd421acf7b35c24557c033372317604 GIT binary patch literal 20992 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 dih!~li3&_qJu^1tC9WPuN$s}nSy7DNd| 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 Kf5S&w;C}!*qWSj# literal 0 HcmV?d00001 diff --git a/ruoyi-admin/src/main/resources/excel/monthEvaporationWater.xls b/ruoyi-admin/src/main/resources/excel/monthEvaporationWater.xls new file mode 100644 index 0000000000000000000000000000000000000000..ca0b48f28b4e1c9b0e2c291c3ab5213cb4b5f76d GIT binary patch literal 20992 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 T9pEYw7Jg_vfckIvNDKTA3wZcm literal 0 HcmV?d00001 diff --git a/ruoyi-admin/src/main/resources/excel/monthRain.xls b/ruoyi-admin/src/main/resources/excel/monthRain.xls new file mode 100644 index 0000000000000000000000000000000000000000..2fd53f90d5299c77659f260b05377cf7081b79e5 GIT binary patch literal 20992 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 literal 0 HcmV?d00001 diff --git a/ruoyi-admin/src/main/resources/excel/monthSedimentConcentration.xls b/ruoyi-admin/src/main/resources/excel/monthSedimentConcentration.xls new file mode 100644 index 0000000000000000000000000000000000000000..42d20eba43f9bbac80e761a9c5efdf533cc9a074 GIT binary patch literal 20992 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 literal 0 HcmV?d00001 diff --git a/ruoyi-admin/src/main/resources/excel/monthTideLever.xls b/ruoyi-admin/src/main/resources/excel/monthTideLever.xls new file mode 100644 index 0000000000000000000000000000000000000000..cb594bb34cb7466e7c033fc44672d93cad8af4e5 GIT binary patch literal 22528 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 Ie542d2V|44kpKVy literal 0 HcmV?d00001 diff --git a/ruoyi-admin/src/main/resources/excel/monthWaterLever.xls b/ruoyi-admin/src/main/resources/excel/monthWaterLever.xls new file mode 100644 index 0000000000000000000000000000000000000000..294a4335038467e284105edb33bb035c91ce82f2 GIT binary patch literal 20992 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 F_#dwl@KXQ) literal 0 HcmV?d00001 diff --git a/ruoyi-admin/src/main/resources/excel/rainExcerpt.xls b/ruoyi-admin/src/main/resources/excel/rainExcerpt.xls new file mode 100644 index 0000000000000000000000000000000000000000..8041d8f0d8f272ba52d95a1c9752ddd3e5029936 GIT binary patch literal 20480 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 B&gcLD literal 0 HcmV?d00001 diff --git a/ruoyi-admin/src/main/resources/excel/rsverFloodExcerpt.xls b/ruoyi-admin/src/main/resources/excel/rsverFloodExcerpt.xls new file mode 100644 index 0000000000000000000000000000000000000000..4917c9d90e24f7af65090588eb033b14d6d00747 GIT binary patch literal 20992 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 literal 0 HcmV?d00001 diff --git a/ruoyi-admin/src/main/resources/excel/station.xls b/ruoyi-admin/src/main/resources/excel/station.xls new file mode 100644 index 0000000000000000000000000000000000000000..aebe2d73f7ea409877b0fdaba0b2d3420686f680 GIT binary patch literal 21504 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 aHAwpdFA%ux;Vcq1{%Aaa`Zs){1^yeyjAr5h literal 0 HcmV?d00001 diff --git a/ruoyi-admin/src/main/resources/excel/szFloodExcerpt.xls b/ruoyi-admin/src/main/resources/excel/szFloodExcerpt.xls new file mode 100644 index 0000000000000000000000000000000000000000..387609e9a14228e36aa61c68748f89b20da18d20 GIT binary patch literal 20992 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 literal 0 HcmV?d00001 diff --git a/ruoyi-admin/src/main/resources/excel/yearEvaporationWater.xls b/ruoyi-admin/src/main/resources/excel/yearEvaporationWater.xls new file mode 100644 index 0000000000000000000000000000000000000000..ef03cf579327c1a9161617be3b26bb6e180ced75 GIT binary patch literal 20992 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 literal 0 HcmV?d00001 diff --git a/ruoyi-admin/src/main/resources/excel/yearFlow.xls b/ruoyi-admin/src/main/resources/excel/yearFlow.xls new file mode 100644 index 0000000000000000000000000000000000000000..14b8678da4d152587e25cb7875081a6efcb70157 GIT binary patch literal 20992 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%0A0ju7Yo literal 0 HcmV?d00001 diff --git a/ruoyi-admin/src/main/resources/excel/yearRain.xls b/ruoyi-admin/src/main/resources/excel/yearRain.xls new file mode 100644 index 0000000000000000000000000000000000000000..c5758b5cd72b0b88235cf49dec562b0a965b2e95 GIT binary patch literal 20992 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 J4IgQN{{dR7^5y^l literal 0 HcmV?d00001 diff --git a/ruoyi-admin/src/main/resources/excel/yearTideLever.xls b/ruoyi-admin/src/main/resources/excel/yearTideLever.xls new file mode 100644 index 0000000000000000000000000000000000000000..02928c9b66686defd61f3fca13331195a6806004 GIT binary patch literal 22528 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 QSXlU{cmVa^@R1()AN1?7%K!iX literal 0 HcmV?d00001 diff --git a/ruoyi-admin/src/main/resources/excel/yearWaterLever.xls b/ruoyi-admin/src/main/resources/excel/yearWaterLever.xls new file mode 100644 index 0000000000000000000000000000000000000000..d9d43e8f0684205f537544707e3a817dbe8a08f5 GIT binary patch literal 20992 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 literal 0 HcmV?d00001 diff --git a/ruoyi-admin/src/main/resources/excel/yearWaterTemperature.xls b/ruoyi-admin/src/main/resources/excel/yearWaterTemperature.xls new file mode 100644 index 0000000000000000000000000000000000000000..30222fb53d46b5b634912b76c582b14e17f62097 GIT binary patch literal 20992 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 I;S(+JKmC;MivR!s literal 0 HcmV?d00001 diff --git a/ruoyi-admin/src/main/resources/i18n/messages.properties b/ruoyi-admin/src/main/resources/i18n/messages.properties new file mode 100644 index 0000000..71cf52d --- /dev/null +++ b/ruoyi-admin/src/main/resources/i18n/messages.properties @@ -0,0 +1,37 @@ +#错误消息 +not.null=* 必须填写 +user.jcaptcha.error=验证码错误 +user.jcaptcha.expire=验证码已失效 +user.not.exists=用户不存在/密码错误 +user.password.not.match=用户不存在/密码错误 +user.password.retry.limit.count=密码输入错误{0}次 +user.password.retry.limit.exceed=密码输入错误{0}次，帐户锁定10分钟 +user.password.delete=对不起，您的账号已被删除 +user.blocked=用户已封禁，请联系管理员 +role.blocked=角色已封禁，请联系管理员 +user.logout.success=退出成功 + +length.not.valid=长度必须在{min}到{max}个字符之间 + +user.username.not.valid=* 2到20个汉字、字母、数字或下划线组成，且必须以非数字开头 +user.password.not.valid=* 5-50个字符 + +user.email.not.valid=邮箱格式错误 +user.mobile.phone.number.not.valid=手机号格式错误 +user.login.success=登录成功 +user.register.success=注册成功 +user.notfound=请重新登录 +user.forcelogout=管理员强制退出，请重新登录 +user.unknown.error=未知错误，请重新登录 + +##文件上传消息 +upload.exceed.maxSize=上传的文件大小超出限制的文件大小！
允许的文件最大大小是：{0}MB！ +upload.filename.exceed.length=上传的文件名最长{0}个字符 + +##权限 +no.permission=您没有数据的权限，请联系管理员添加权限 [{0}] +no.create.permission=您没有创建数据的权限，请联系管理员添加权限 [{0}] +no.update.permission=您没有修改数据的权限，请联系管理员添加权限 [{0}] +no.delete.permission=您没有删除数据的权限，请联系管理员添加权限 [{0}] +no.export.permission=您没有导出数据的权限，请联系管理员添加权限 [{0}] +no.view.permission=您没有查看数据的权限，请联系管理员添加权限 [{0}] diff --git a/ruoyi-admin/src/main/resources/logback.xml b/ruoyi-admin/src/main/resources/logback.xml new file mode 100644 index 0000000..05ad0da --- /dev/null +++ b/ruoyi-admin/src/main/resources/logback.xml @@ -0,0 +1,93 @@ + + + + + + + + + + + ${log.pattern} + + + + + + ${log.path}/sys-info.log + + + + ${log.path}/sys-info.%d{yyyy-MM-dd}.log + + 60 + + + ${log.pattern} + + + + INFO + + ACCEPT + + DENY + + + + + ${log.path}/sys-error.log + + + + ${log.path}/sys-error.%d{yyyy-MM-dd}.log + + 60 + + + ${log.pattern} + + + + ERROR + + ACCEPT + + DENY + + + + + + ${log.path}/sys-user.log + + + ${log.path}/sys-user.%d{yyyy-MM-dd}.log + + 60 + + + ${log.pattern} + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/ruoyi-admin/src/main/resources/mybatis/mybatis-config.xml b/ruoyi-admin/src/main/resources/mybatis/mybatis-config.xml new file mode 100644 index 0000000..ac47c03 --- /dev/null +++ b/ruoyi-admin/src/main/resources/mybatis/mybatis-config.xml @@ -0,0 +1,20 @@ + + + + + + + + + + + + + + + + + + diff --git a/ruoyi-admin/src/test/java/com/ruoyi/swlscx/day/service/impl/HyDpCServiceImplTest.java b/ruoyi-admin/src/test/java/com/ruoyi/swlscx/day/service/impl/HyDpCServiceImplTest.java new file mode 100644 index 0000000..0d34a0f --- /dev/null +++ b/ruoyi-admin/src/test/java/com/ruoyi/swlscx/day/service/impl/HyDpCServiceImplTest.java @@ -0,0 +1,77 @@ +package com.ruoyi.swlscx.day.service.impl; + +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.ruoyi.common.core.page.R; +import com.ruoyi.swlscx.basic.domain.vo.HyStscAVo; +import com.ruoyi.swlscx.basic.service.HyStscAService; +import com.ruoyi.swlscx.basic.service.YcExportTaskService; +import com.ruoyi.swlscx.common.PageParams; +import com.ruoyi.swlscx.day.service.HyDcsFService; +import com.ruoyi.swlscx.day.service.HyDwtCService; +import com.ruoyi.swlscx.excerpt.service.HyHltdzBService; +import org.junit.jupiter.api.Test; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.boot.test.context.SpringBootTest; +import org.springframework.mock.web.MockMultipartFile; +import org.springframework.web.multipart.MultipartFile; + +import java.io.File; +import java.io.FileInputStream; +import java.util.Arrays; +import java.util.List; + + +/** + * @Author al + * @Date 2024/10/16 9:48 + * @Description: TODO + * @Version + */ +@SpringBootTest(classes = com.ruoyi.RuoYiApplication.class) +class HyDpCServiceImplTest { + + + @Autowired + private HyDcsFService hyDcsFService; + @Autowired + private YcExportTaskService ycExportTaskService; + + @Autowired + private HyStscAService hyStscAService; + + @Test + public void importData() throws Exception { + +// List stringList = Arrays.asList("逐潮高低潮位表200501-200801" +// , "逐潮高低潮位表200801-201001", +// "逐潮高低潮位表201001-201301" +// , "逐潮高低潮位表201301-201501", +// "逐潮高低潮位表201501-201701", +// "逐潮高低潮位表201701-202001" +// ,"逐潮高低潮位表202001-"); + List stringList = Arrays.asList("日平均含沙量表195001-199001","日平均含沙量表199001-"); + long newTime = System.currentTimeMillis(); + System.out.println("当前时间：" + newTime); + for (String s : stringList) { + File file = new File("C:\\Users\\12974\\Desktop\\历史查询子系统\\历史数据\\日表类\\日平均含沙量表-已完成\\" + s + ".xls"); + + // 创建 FileInputStream 对象 + FileInputStream fileInputStream = new FileInputStream(file); + + // 创建 MockMultipartFile 对象 + MultipartFile multipartFile = new MockMultipartFile( + "file", + file.getName(), + "application/vnd.ms-excel", + fileInputStream + ); + hyDcsFService.importHyDcsFData(multipartFile); + } + System.out.println("总耗时：" + (System.currentTimeMillis() - newTime)); + } + + @Test + public void test() { + System.out.println(hyStscAService.testSqlServer()); + } +} \ No newline at end of file diff --git a/ruoyi-api/pom.xml b/ruoyi-api/pom.xml new file mode 100644 index 0000000..7cd5133 --- /dev/null +++ b/ruoyi-api/pom.xml @@ -0,0 +1,28 @@ + + + + ruoyi + com.ruoyi + 3.8.1 + + 4.0.0 + + ruoyi-api + + + ruoyi-api + + + + + + + com.ruoyi + ruoyi-common + + + + + diff --git a/ruoyi-common/pom.xml b/ruoyi-common/pom.xml new file mode 100644 index 0000000..0612064 --- /dev/null +++ b/ruoyi-common/pom.xml @@ -0,0 +1,160 @@ + + + + ruoyi + com.ruoyi + 3.8.1 + + 4.0.0 + + ruoyi-common + + + common通用工具 + + + + + + + org.springframework + spring-context-support + + + + + org.springframework + spring-web + + + + + org.springframework.boot + spring-boot-starter-security + + + + + com.github.pagehelper + pagehelper-spring-boot-starter + + + + + org.springframework.boot + spring-boot-starter-validation + + + + + org.apache.commons + commons-lang3 + + + + + com.fasterxml.jackson.core + jackson-databind + + + + + com.alibaba + fastjson + + + + + commons-io + commons-io + + + + + commons-fileupload + commons-fileupload + + + + + org.apache.poi + poi-ooxml + + + + + org.yaml + snakeyaml + + + + + io.jsonwebtoken + jjwt + + + + + javax.xml.bind + jaxb-api + + + + + org.springframework.boot + spring-boot-starter-data-redis + + + + + org.apache.commons + commons-pool2 + + + + + eu.bitwalker + UserAgentUtils + + + + + javax.servlet + javax.servlet-api + + + + + com.baomidou + mybatis-plus-boot-starter + 3.4.2 + + + + org.projectlombok + lombok + 1.18.4 + + + + org.bouncycastle + bcprov-jdk16 + 1.46 + + + + com.alibaba + easyexcel + 4.0.1 + + + + org.apache.poi + poi-ooxml + + + + + diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/annotation/DataScope.java b/ruoyi-common/src/main/java/com/ruoyi/common/annotation/DataScope.java new file mode 100644 index 0000000..176878e --- /dev/null +++ b/ruoyi-common/src/main/java/com/ruoyi/common/annotation/DataScope.java @@ -0,0 +1,28 @@ +package com.ruoyi.common.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 ""; +} diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/annotation/DataSource.java b/ruoyi-common/src/main/java/com/ruoyi/common/annotation/DataSource.java new file mode 100644 index 0000000..79cd191 --- /dev/null +++ b/ruoyi-common/src/main/java/com/ruoyi/common/annotation/DataSource.java @@ -0,0 +1,28 @@ +package com.ruoyi.common.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 com.ruoyi.common.enums.DataSourceType; + +/** + * 自定义多数据源切换注解 + * + * 优先级：先方法，后类，如果方法覆盖了类上的数据源类型，以方法的为准，否则以类上的为准 + * + * @author ruoyi + */ +@Target({ ElementType.METHOD, ElementType.TYPE }) +@Retention(RetentionPolicy.RUNTIME) +@Documented +@Inherited +public @interface DataSource +{ + /** + * 切换数据源名称 + */ + public DataSourceType value() default DataSourceType.MASTER; +} diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/annotation/Excel.java b/ruoyi-common/src/main/java/com/ruoyi/common/annotation/Excel.java new file mode 100644 index 0000000..6626986 --- /dev/null +++ b/ruoyi-common/src/main/java/com/ruoyi/common/annotation/Excel.java @@ -0,0 +1,183 @@ +package com.ruoyi.common.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.ruoyi.common.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 ""; + + /** + * 如果是字典类型，请设置字典的type值 (如: sys_user_sex) + */ + public String dictType() default ""; + + /** + * 读取内容转表达式 (如: 0=男,1=女,2=未知) + */ + public String readConverterExp() 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 {}; + + /** + * 是否导出数据,应对需求:有时我们需要导出一份模板,这是标题需要但内容需要用户手工填写. + */ + public boolean isExport() default true; + + /** + * 另一个类中的属性名称,支持多级获取,以小数点隔开 + */ + public String targetAttr() default ""; + + /** + * 是否自动统计数据,在最后追加一行统计数据总和 + */ + public boolean isStatistics() default false; + + /** + * 导出类型（0数字 1字符串） + */ + public ColumnType cellType() default ColumnType.STRING; + + /** + * 导出字体颜色 + */ + public IndexedColors color() default IndexedColors.BLACK; + + /** + * 导出字段对齐方式 + */ + public HorizontalAlignment align() default HorizontalAlignment.CENTER; + + /** + * 自定义数据处理器 + */ + public Class handler() default ExcelHandlerAdapter.class; + + /** + * 自定义数据处理器参数 + */ + public String[] args() default {}; + + public enum Align + { + AUTO(0), LEFT(1), CENTER(2), RIGHT(3); + private final int value; + + Align(int value) + { + this.value = value; + } + + public int value() + { + return this.value; + } + } + + /** + * 字段类型（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); + 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/ruoyi-common/src/main/java/com/ruoyi/common/annotation/Excels.java b/ruoyi-common/src/main/java/com/ruoyi/common/annotation/Excels.java new file mode 100644 index 0000000..1f1cc81 --- /dev/null +++ b/ruoyi-common/src/main/java/com/ruoyi/common/annotation/Excels.java @@ -0,0 +1,18 @@ +package com.ruoyi.common.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 +{ + public Excel[] value(); +} diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/annotation/Log.java b/ruoyi-common/src/main/java/com/ruoyi/common/annotation/Log.java new file mode 100644 index 0000000..ca02c6c --- /dev/null +++ b/ruoyi-common/src/main/java/com/ruoyi/common/annotation/Log.java @@ -0,0 +1,46 @@ +package com.ruoyi.common.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.ruoyi.common.enums.BusinessType; +import com.ruoyi.common.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; +} diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/annotation/RateLimiter.java b/ruoyi-common/src/main/java/com/ruoyi/common/annotation/RateLimiter.java new file mode 100644 index 0000000..69461ea --- /dev/null +++ b/ruoyi-common/src/main/java/com/ruoyi/common/annotation/RateLimiter.java @@ -0,0 +1,40 @@ +package com.ruoyi.common.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.ruoyi.common.constant.Constants; +import com.ruoyi.common.enums.LimitType; + +/** + * 限流注解 + * + * @author ruoyi + */ +@Target(ElementType.METHOD) +@Retention(RetentionPolicy.RUNTIME) +@Documented +public @interface RateLimiter +{ + /** + * 限流key + */ + public String key() default Constants.RATE_LIMIT_KEY; + + /** + * 限流时间,单位秒 + */ + public int time() default 60; + + /** + * 限流次数 + */ + public int count() default 100; + + /** + * 限流类型 + */ + public LimitType limitType() default LimitType.DEFAULT; +} diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/annotation/RepeatSubmit.java b/ruoyi-common/src/main/java/com/ruoyi/common/annotation/RepeatSubmit.java new file mode 100644 index 0000000..b769748 --- /dev/null +++ b/ruoyi-common/src/main/java/com/ruoyi/common/annotation/RepeatSubmit.java @@ -0,0 +1,31 @@ +package com.ruoyi.common.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; + +/** + * 自定义注解防止表单重复提交 + * + * @author ruoyi + * + */ +@Inherited +@Target(ElementType.METHOD) +@Retention(RetentionPolicy.RUNTIME) +@Documented +public @interface RepeatSubmit +{ + /** + * 间隔时间(ms)，小于此时间视为重复提交 + */ + public int interval() default 5000; + + /** + * 提示消息 + */ + public String message() default "不允许重复提交，请稍候再试"; +} diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/config/RuoYiConfig.java b/ruoyi-common/src/main/java/com/ruoyi/common/config/RuoYiConfig.java new file mode 100644 index 0000000..751fe3b --- /dev/null +++ b/ruoyi-common/src/main/java/com/ruoyi/common/config/RuoYiConfig.java @@ -0,0 +1,144 @@ +package com.ruoyi.common.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 boolean demoEnabled; + + /** 上传路径 */ + 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 boolean isDemoEnabled() + { + return demoEnabled; + } + + public void setDemoEnabled(boolean demoEnabled) + { + this.demoEnabled = demoEnabled; + } + + 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"; + } + + + /** + * 获取上传路径 + */ + public static String getExportPath() + { + return getProfile() + "/report"; + } +} diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/constant/Constants.java b/ruoyi-common/src/main/java/com/ruoyi/common/constant/Constants.java new file mode 100644 index 0000000..3d05ccf --- /dev/null +++ b/ruoyi-common/src/main/java/com/ruoyi/common/constant/Constants.java @@ -0,0 +1,189 @@ +package com.ruoyi.common.constant; + +import io.jsonwebtoken.Claims; + +/** + * 通用常量信息 + * + * @author ruoyi + */ +public class Constants +{ + /** + * UTF-8 字符集 + */ + public static final String UTF8 = "UTF-8"; + + /** + * GBK 字符集 + */ + public static final String GBK = "GBK"; + + /** + * http请求 + */ + public static final String HTTP = "http://"; + + /** + * https请求 + */ + public static final String HTTPS = "https://"; + + /** + * 通用成功标识 + */ + public static final String SUCCESS = "0"; + + /** + * 通用失败标识 + */ + public static final String FAIL = "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"; + + /** + * 验证码 redis key + */ + public static final String CAPTCHA_CODE_KEY = "captcha_codes:"; + + /** + * 登录用户 redis key + */ + public static final String LOGIN_TOKEN_KEY = "login_tokens:"; + + /** + * 防重提交 redis key + */ + public static final String REPEAT_SUBMIT_KEY = "repeat_submit:"; + + /** + * 限流 redis key + */ + public static final String RATE_LIMIT_KEY = "rate_limit:"; + + /** + * 验证码有效期（分钟） + */ + public static final Integer CAPTCHA_EXPIRATION = 2; + + /** + * 令牌 + */ + public static final String TOKEN = "token"; + + /** + * 令牌前缀 + */ + public static final String TOKEN_PREFIX = "Bearer "; + + /** + * 令牌前缀 + */ + public static final String LOGIN_USER_KEY = "login_user_key"; + + /** + * 用户ID + */ + public static final String JWT_USERID = "userid"; + + /** + * 用户名称 + */ + public static final String JWT_USERNAME = Claims.SUBJECT; + + /** + * 用户头像 + */ + public static final String JWT_AVATAR = "avatar"; + + /** + * 创建时间 + */ + public static final String JWT_CREATED = "created"; + + /** + * 用户权限 + */ + public static final String JWT_AUTHORITIES = "authorities"; + + /** + * 参数管理 cache key + */ + public static final String SYS_CONFIG_KEY = "sys_config:"; + + /** + * 字典管理 cache key + */ + public static final String SYS_DICT_KEY = "sys_dict:"; + + /** + * 资源映射路径 前缀 + */ + public static final String RESOURCE_PREFIX = "/profile"; + + /** + * RMI 远程方法调用 + */ + public static final String LOOKUP_RMI = "rmi:"; + + /** + * LDAP 远程方法调用 + */ + public static final String LOOKUP_LDAP = "ldap:"; + + /** + * LDAPS 远程方法调用 + */ + public static final String LOOKUP_LDAPS = "ldaps:"; + + /** + * 定时任务白名单配置（仅允许访问的包名，如其他需要可以自行添加） + */ + public static final String[] JOB_WHITELIST_STR = { "com.ruoyi" }; + + /** + * 定时任务违规的字符 + */ + public static final String[] JOB_ERROR_STR = { "java.net.URL", "javax.naming.InitialContext", "org.yaml.snakeyaml", + "org.springframework", "org.apache", "com.ruoyi.common.utils.file" }; + + + /** + * 当前页码 + */ + public static final String PAGE = "page"; + /** + * 每页显示记录数 + */ + public static final String LIMIT = "limit"; + /** + * 排序字段 + */ + public static final String ORDER_FIELD = "sidx"; + /** + * 排序方式 + */ + public static final String ORDER = "order"; + /** + * 升序 + */ + public static final String ASC = "asc"; +} diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/constant/GenConstants.java b/ruoyi-common/src/main/java/com/ruoyi/common/constant/GenConstants.java new file mode 100644 index 0000000..7d899d4 --- /dev/null +++ b/ruoyi-common/src/main/java/com/ruoyi/common/constant/GenConstants.java @@ -0,0 +1,117 @@ +package com.ruoyi.common.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", "children" }; + + /** 文本框 */ + 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/ruoyi-common/src/main/java/com/ruoyi/common/constant/HttpStatus.java b/ruoyi-common/src/main/java/com/ruoyi/common/constant/HttpStatus.java new file mode 100644 index 0000000..d60afee --- /dev/null +++ b/ruoyi-common/src/main/java/com/ruoyi/common/constant/HttpStatus.java @@ -0,0 +1,89 @@ +package com.ruoyi.common.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; +} diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/constant/ScheduleConstants.java b/ruoyi-common/src/main/java/com/ruoyi/common/constant/ScheduleConstants.java new file mode 100644 index 0000000..62ad815 --- /dev/null +++ b/ruoyi-common/src/main/java/com/ruoyi/common/constant/ScheduleConstants.java @@ -0,0 +1,50 @@ +package com.ruoyi.common.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/ruoyi-common/src/main/java/com/ruoyi/common/constant/UserConstants.java b/ruoyi-common/src/main/java/com/ruoyi/common/constant/UserConstants.java new file mode 100644 index 0000000..4ed6009 --- /dev/null +++ b/ruoyi-common/src/main/java/com/ruoyi/common/constant/UserConstants.java @@ -0,0 +1,78 @@ +package com.ruoyi.common.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 String UNIQUE = "0"; + public final static String NOT_UNIQUE = "1"; + + /** + * 用户名长度限制 + */ + 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/ruoyi-common/src/main/java/com/ruoyi/common/core/controller/BaseController.java b/ruoyi-common/src/main/java/com/ruoyi/common/core/controller/BaseController.java new file mode 100644 index 0000000..80e31cb --- /dev/null +++ b/ruoyi-common/src/main/java/com/ruoyi/common/core/controller/BaseController.java @@ -0,0 +1,186 @@ +package com.ruoyi.common.core.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.PageHelper; +import com.github.pagehelper.PageInfo; +import com.ruoyi.common.constant.HttpStatus; +import com.ruoyi.common.core.domain.AjaxResult; +import com.ruoyi.common.core.domain.model.LoginUser; +import com.ruoyi.common.core.page.PageDomain; +import com.ruoyi.common.core.page.TableDataInfo; +import com.ruoyi.common.core.page.TableSupport; +import com.ruoyi.common.utils.DateUtils; +import com.ruoyi.common.utils.PageUtils; +import com.ruoyi.common.utils.SecurityUtils; +import com.ruoyi.common.utils.StringUtils; +import com.ruoyi.common.utils.sql.SqlUtil; + +/** + * 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 startOrderBy() + { + PageDomain pageDomain = TableSupport.buildPageRequest(); + if (StringUtils.isNotEmpty(pageDomain.getOrderBy())) + { + String orderBy = SqlUtil.escapeOrderBySql(pageDomain.getOrderBy()); + PageHelper.orderBy(orderBy); + } + } + + /** + * 清理分页的线程变量 + */ + protected void clearPage() + { + PageUtils.clearPage(); + } + + /** + * 响应请求分页数据 + */ + @SuppressWarnings({ "rawtypes", "unchecked" }) + protected TableDataInfo getDataTable(List list) + { + TableDataInfo rspData = new TableDataInfo(); + rspData.setCode(HttpStatus.SUCCESS); + rspData.setMsg("查询成功"); + rspData.setRows(list); + rspData.setTotal(new PageInfo(list).getTotal()); + return rspData; + } + + /** + * 返回成功 + */ + public AjaxResult success() + { + return AjaxResult.success(); + } + + /** + * 返回失败消息 + */ + public AjaxResult error() + { + return AjaxResult.error(); + } + + /** + * 返回成功消息 + */ + public AjaxResult success(String message) + { + return AjaxResult.success(message); + } + + /** + * 返回失败消息 + */ + public AjaxResult error(String message) + { + return AjaxResult.error(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(); + } + + /** + * 页面跳转 + */ + public String redirect(String url) + { + return StringUtils.format("redirect:{}", url); + } + + /** + * 获取用户缓存信息 + */ + public LoginUser getLoginUser() + { + return SecurityUtils.getLoginUser(); + } + + /** + * 获取登录用户id + */ + public Long getUserId() + { + return getLoginUser().getUserId(); + } + + /** + * 获取登录部门id + */ + public Long getDeptId() + { + return getLoginUser().getDeptId(); + } + + /** + * 获取登录用户名 + */ + public String getUsername() + { + return getLoginUser().getUsername(); + } +} diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/AjaxResult.java b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/AjaxResult.java new file mode 100644 index 0000000..4950bd0 --- /dev/null +++ b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/AjaxResult.java @@ -0,0 +1,162 @@ +package com.ruoyi.common.core.domain; + +import java.util.HashMap; +import com.ruoyi.common.constant.HttpStatus; +import com.ruoyi.common.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); + } + + /** + * 返回错误消息 + * + * @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); + } + + /** + * 方便链式调用 + * + * @param key 键 + * @param value 值 + * @return 数据对象 + */ + @Override + public AjaxResult put(String key, Object value) + { + super.put(key, value); + return this; + } +} diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/BaseEntity.java b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/BaseEntity.java new file mode 100644 index 0000000..f7d5bf4 --- /dev/null +++ b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/BaseEntity.java @@ -0,0 +1,114 @@ +package com.ruoyi.common.core.domain; + +import java.io.Serializable; +import java.util.Date; +import java.util.HashMap; +import java.util.Map; +import com.fasterxml.jackson.annotation.JsonFormat; + +/** + * Entity基类 + * + * @author ruoyi + */ +public class BaseEntity implements Serializable +{ + private static final long serialVersionUID = 1L; + + /** 搜索值 */ + 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; + + /** 请求参数 */ + 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/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/TreeEntity.java b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/TreeEntity.java new file mode 100644 index 0000000..a180a18 --- /dev/null +++ b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/TreeEntity.java @@ -0,0 +1,79 @@ +package com.ruoyi.common.core.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/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/TreeSelect.java b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/TreeSelect.java new file mode 100644 index 0000000..bd835db --- /dev/null +++ b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/TreeSelect.java @@ -0,0 +1,77 @@ +package com.ruoyi.common.core.domain; + +import java.io.Serializable; +import java.util.List; +import java.util.stream.Collectors; +import com.fasterxml.jackson.annotation.JsonInclude; +import com.ruoyi.common.core.domain.entity.SysDept; +import com.ruoyi.common.core.domain.entity.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(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/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysDept.java b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysDept.java new file mode 100644 index 0000000..fb18c5c --- /dev/null +++ b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysDept.java @@ -0,0 +1,203 @@ +package com.ruoyi.common.core.domain.entity; + +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.ruoyi.common.core.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/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysDictData.java b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysDictData.java new file mode 100644 index 0000000..3f152b3 --- /dev/null +++ b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysDictData.java @@ -0,0 +1,176 @@ +package com.ruoyi.common.core.domain.entity; + +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.ruoyi.common.annotation.Excel; +import com.ruoyi.common.annotation.Excel.ColumnType; +import com.ruoyi.common.constant.UserConstants; +import com.ruoyi.common.core.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) ? true : false; + } + + 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/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysDictType.java b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysDictType.java new file mode 100644 index 0000000..e324fcf --- /dev/null +++ b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysDictType.java @@ -0,0 +1,96 @@ +package com.ruoyi.common.core.domain.entity; + +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.ruoyi.common.annotation.Excel; +import com.ruoyi.common.annotation.Excel.ColumnType; +import com.ruoyi.common.core.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/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysMenu.java b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysMenu.java new file mode 100644 index 0000000..042bc76 --- /dev/null +++ b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysMenu.java @@ -0,0 +1,259 @@ +package com.ruoyi.common.core.domain.entity; + +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.ruoyi.common.core.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; + + /** 是否为外链（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 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("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/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysRole.java b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysRole.java new file mode 100644 index 0000000..36629eb --- /dev/null +++ b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysRole.java @@ -0,0 +1,226 @@ +package com.ruoyi.common.core.domain.entity; + +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.ruoyi.common.annotation.Excel; +import com.ruoyi.common.annotation.Excel.ColumnType; +import com.ruoyi.common.core.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 String 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; + + 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; + } + + @NotBlank(message = "显示顺序不能为空") + public String getRoleSort() + { + return roleSort; + } + + public void setRoleSort(String 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; + } + + @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/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysUser.java b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysUser.java new file mode 100644 index 0000000..432ea56 --- /dev/null +++ b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysUser.java @@ -0,0 +1,342 @@ +package com.ruoyi.common.core.domain.entity; + +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.fasterxml.jackson.annotation.JsonIgnore; +import com.fasterxml.jackson.annotation.JsonProperty; +import com.ruoyi.common.annotation.Excel; +import com.ruoyi.common.annotation.Excel.ColumnType; +import com.ruoyi.common.annotation.Excel.Type; +import com.ruoyi.common.annotation.Excels; +import com.ruoyi.common.core.domain.BaseEntity; +import com.ruoyi.common.xss.Xss; + +/** + * 用户对象 sys_user + * + * @author ruoyi + */ +public class SysUser extends BaseEntity +{ + private static final long serialVersionUID = 1L; + + /** 用户ID */ + @Excel(name = "用户序号", 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 = "手机号码") + private String phonenumber; + + /** 用户性别 */ + @Excel(name = "用户性别", readConverterExp = "0=男,1=女,2=未知") + private String sex; + + /** 用户头像 */ + private String avatar; + + /** 密码 */ + private String password; + + /** 盐加密 */ + private String salt; + + /** 帐号状态（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; + } + + @JsonIgnore + @JsonProperty + public String getPassword() + { + return password; + } + + public void setPassword(String password) + { + this.password = password; + } + + public String getSalt() + { + return salt; + } + + public void setSalt(String salt) + { + this.salt = salt; + } + + 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("salt", getSalt()) + .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/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/model/LoginBody.java b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/model/LoginBody.java new file mode 100644 index 0000000..b5bc8c8 --- /dev/null +++ b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/model/LoginBody.java @@ -0,0 +1,69 @@ +package com.ruoyi.common.core.domain.model; + +/** + * 用户登录对象 + * + * @author ruoyi + */ +public class LoginBody +{ + /** + * 用户名 + */ + private String username; + + /** + * 用户密码 + */ + private String password; + + /** + * 验证码 + */ + private String code; + + /** + * 唯一标识 + */ + private String uuid; + + 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; + } + + public String getCode() + { + return code; + } + + public void setCode(String code) + { + this.code = code; + } + + public String getUuid() + { + return uuid; + } + + public void setUuid(String uuid) + { + this.uuid = uuid; + } +} diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/model/LoginUser.java b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/model/LoginUser.java new file mode 100644 index 0000000..db4d2a5 --- /dev/null +++ b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/model/LoginUser.java @@ -0,0 +1,266 @@ +package com.ruoyi.common.core.domain.model; + +import java.util.Collection; +import java.util.Set; +import org.springframework.security.core.GrantedAuthority; +import org.springframework.security.core.userdetails.UserDetails; +import com.alibaba.fastjson.annotation.JSONField; +import com.ruoyi.common.core.domain.entity.SysUser; + +/** + * 登录用户身份权限 + * + * @author ruoyi + */ +public class LoginUser implements UserDetails +{ + private static final long serialVersionUID = 1L; + + /** + * 用户ID + */ + private Long userId; + + /** + * 部门ID + */ + private Long deptId; + + /** + * 用户唯一标识 + */ + private String token; + + /** + * 登录时间 + */ + private Long loginTime; + + /** + * 过期时间 + */ + private Long expireTime; + + /** + * 登录IP地址 + */ + private String ipaddr; + + /** + * 登录地点 + */ + private String loginLocation; + + /** + * 浏览器类型 + */ + private String browser; + + /** + * 操作系统 + */ + private String os; + + /** + * 权限列表 + */ + private Set permissions; + + /** + * 用户信息 + */ + private SysUser user; + + public Long getUserId() + { + return userId; + } + + public void setUserId(Long userId) + { + this.userId = userId; + } + + public Long getDeptId() + { + return deptId; + } + + public void setDeptId(Long deptId) + { + this.deptId = deptId; + } + + public String getToken() + { + return token; + } + + public void setToken(String token) + { + this.token = token; + } + + public LoginUser() + { + } + + public LoginUser(SysUser user, Set permissions) + { + this.user = user; + this.permissions = permissions; + } + + public LoginUser(Long userId, Long deptId, SysUser user, Set permissions) + { + this.userId = userId; + this.deptId = deptId; + this.user = user; + this.permissions = permissions; + } + + @JSONField(serialize = false) + @Override + public String getPassword() + { + return user.getPassword(); + } + + @Override + public String getUsername() + { + return user.getUserName(); + } + + /** + * 账户是否未过期,过期无法验证 + */ + @JSONField(serialize = false) + @Override + public boolean isAccountNonExpired() + { + return true; + } + + /** + * 指定用户是否解锁,锁定的用户无法进行身份验证 + * + * @return + */ + @JSONField(serialize = false) + @Override + public boolean isAccountNonLocked() + { + return true; + } + + /** + * 指示是否已过期的用户的凭据(密码),过期的凭据防止认证 + * + * @return + */ + @JSONField(serialize = false) + @Override + public boolean isCredentialsNonExpired() + { + return true; + } + + /** + * 是否可用 ,禁用的用户不能身份验证 + * + * @return + */ + @JSONField(serialize = false) + @Override + public boolean isEnabled() + { + return true; + } + + public Long getLoginTime() + { + return loginTime; + } + + public void setLoginTime(Long loginTime) + { + this.loginTime = loginTime; + } + + 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 getExpireTime() + { + return expireTime; + } + + public void setExpireTime(Long expireTime) + { + this.expireTime = expireTime; + } + + public Set getPermissions() + { + return permissions; + } + + public void setPermissions(Set permissions) + { + this.permissions = permissions; + } + + public SysUser getUser() + { + return user; + } + + public void setUser(SysUser user) + { + this.user = user; + } + + @Override + public Collection getAuthorities() + { + return null; + } +} diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/model/RegisterBody.java b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/model/RegisterBody.java new file mode 100644 index 0000000..868a1fc --- /dev/null +++ b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/model/RegisterBody.java @@ -0,0 +1,11 @@ +package com.ruoyi.common.core.domain.model; + +/** + * 用户注册对象 + * + * @author ruoyi + */ +public class RegisterBody extends LoginBody +{ + +} diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/core/page/PageDomain.java b/ruoyi-common/src/main/java/com/ruoyi/common/core/page/PageDomain.java new file mode 100644 index 0000000..8966cb4 --- /dev/null +++ b/ruoyi-common/src/main/java/com/ruoyi/common/core/page/PageDomain.java @@ -0,0 +1,101 @@ +package com.ruoyi.common.core.page; + +import com.ruoyi.common.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/ruoyi-common/src/main/java/com/ruoyi/common/core/page/R.java b/ruoyi-common/src/main/java/com/ruoyi/common/core/page/R.java new file mode 100644 index 0000000..7329aed --- /dev/null +++ b/ruoyi-common/src/main/java/com/ruoyi/common/core/page/R.java @@ -0,0 +1,66 @@ +/** + * Copyright (c) 2016-2019 人人开源 All rights reserved. + * + * https://www.renren.io + * + * 版权所有，侵权必究！ + */ + +package com.ruoyi.common.core.page; + +import java.util.HashMap; +import java.util.Map; + +/** + * 返回数据 + * + * @author Mark sunlightcs@gmail.com + */ +public class R extends HashMap { + private static final long serialVersionUID = 1L; + + public R() { + put("code", 0); + put("msg", "操作成功"); + } + + public R(Object o) {} + + public static R error() { + return error(500, "发生错误，请联系管理员"); + } + + public static R error(String msg) { + return error(500, msg); + } + + public static R error(int code, String msg) { + R r = new R(); + r.put("code", code); + r.put("msg", msg); + return r; + } + + public static R ok(String msg) { + R r = new R(); + r.put("msg", msg); + return r; + } + + public static R ok(Map map) { + R r = new R(); + r.putAll(map); + return r; + } + + public static R ok() { + return new R(); + } + + @Override + public R put(String key, Object value) { + super.put(key, value); + return this; + } + +} diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/core/page/TableDataInfo.java b/ruoyi-common/src/main/java/com/ruoyi/common/core/page/TableDataInfo.java new file mode 100644 index 0000000..847685b --- /dev/null +++ b/ruoyi-common/src/main/java/com/ruoyi/common/core/page/TableDataInfo.java @@ -0,0 +1,85 @@ +package com.ruoyi.common.core.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; + } +} diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/core/page/TableSupport.java b/ruoyi-common/src/main/java/com/ruoyi/common/core/page/TableSupport.java new file mode 100644 index 0000000..a120c30 --- /dev/null +++ b/ruoyi-common/src/main/java/com/ruoyi/common/core/page/TableSupport.java @@ -0,0 +1,56 @@ +package com.ruoyi.common.core.page; + +import com.ruoyi.common.core.text.Convert; +import com.ruoyi.common.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/ruoyi-common/src/main/java/com/ruoyi/common/core/redis/RedisCache.java b/ruoyi-common/src/main/java/com/ruoyi/common/core/redis/RedisCache.java new file mode 100644 index 0000000..de4a9d4 --- /dev/null +++ b/ruoyi-common/src/main/java/com/ruoyi/common/core/redis/RedisCache.java @@ -0,0 +1,246 @@ +package com.ruoyi.common.core.redis; + +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 RedisCache +{ + @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 Integer 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 缓存键值 + * @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 long deleteObject(final Collection collection) + { + return redisTemplate.delete(collection); + } + + /** + * 缓存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 + * @param hKey + */ + public void delCacheMapValue(final String key, final String hKey) + { + HashOperations hashOperations = redisTemplate.opsForHash(); + hashOperations.delete(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); + } + + /** + * 获得缓存的基本对象列表 + * + * @param pattern 字符串前缀 + * @return 对象列表 + */ + public Collection keys(final String pattern) + { + return redisTemplate.keys(pattern); + } +} diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/core/text/CharsetKit.java b/ruoyi-common/src/main/java/com/ruoyi/common/core/text/CharsetKit.java new file mode 100644 index 0000000..84124aa --- /dev/null +++ b/ruoyi-common/src/main/java/com/ruoyi/common/core/text/CharsetKit.java @@ -0,0 +1,86 @@ +package com.ruoyi.common.core.text; + +import java.nio.charset.Charset; +import java.nio.charset.StandardCharsets; +import com.ruoyi.common.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/ruoyi-common/src/main/java/com/ruoyi/common/core/text/Convert.java b/ruoyi-common/src/main/java/com/ruoyi/common/core/text/Convert.java new file mode 100644 index 0000000..1fb7461 --- /dev/null +++ b/ruoyi-common/src/main/java/com/ruoyi/common/core/text/Convert.java @@ -0,0 +1,1005 @@ +package com.ruoyi.common.core.text; + +import java.math.BigDecimal; +import java.math.BigInteger; +import java.nio.ByteBuffer; +import java.nio.charset.Charset; +import java.text.NumberFormat; +import java.util.Set; +import com.ruoyi.common.utils.StringUtils; +import org.apache.commons.lang3.ArrayUtils; + +/** + * 类型转换器 + * + * @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 split 被转换的值 + * @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) + { + return toStrArray(",", str); + } + + /** + * 转换为String数组
+ * + * @param split 分隔符 + * @param split 被转换的值 + * @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": + return true; + case "false": + return false; + case "yes": + return true; + case "ok": + return true; + case "no": + return false; + case "1": + return true; + 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 new BigDecimal((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[]) + { + return str((byte[]) obj, charset); + } + else if (obj instanceof Byte[]) + { + byte[] bytes = ArrayUtils.toPrimitive((Byte[]) obj); + return str(bytes, 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); + } + } + String returnString = new String(c); + + return returnString; + } + + /** + * 数字金额大写转换 先写个完整的然后将如零拾替换成零 + * + * @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++) + { + s += (digit[(int) (Math.floor(n * 10 * 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/ruoyi-common/src/main/java/com/ruoyi/common/core/text/StrFormatter.java b/ruoyi-common/src/main/java/com/ruoyi/common/core/text/StrFormatter.java new file mode 100644 index 0000000..c78ac77 --- /dev/null +++ b/ruoyi-common/src/main/java/com/ruoyi/common/core/text/StrFormatter.java @@ -0,0 +1,92 @@ +package com.ruoyi.common.core.text; + +import com.ruoyi.common.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/ruoyi-common/src/main/java/com/ruoyi/common/enums/BusinessStatus.java b/ruoyi-common/src/main/java/com/ruoyi/common/enums/BusinessStatus.java new file mode 100644 index 0000000..10b7306 --- /dev/null +++ b/ruoyi-common/src/main/java/com/ruoyi/common/enums/BusinessStatus.java @@ -0,0 +1,20 @@ +package com.ruoyi.common.enums; + +/** + * 操作状态 + * + * @author ruoyi + * + */ +public enum BusinessStatus +{ + /** + * 成功 + */ + SUCCESS, + + /** + * 失败 + */ + FAIL, +} diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/enums/BusinessType.java b/ruoyi-common/src/main/java/com/ruoyi/common/enums/BusinessType.java new file mode 100644 index 0000000..2e17c4a --- /dev/null +++ b/ruoyi-common/src/main/java/com/ruoyi/common/enums/BusinessType.java @@ -0,0 +1,59 @@ +package com.ruoyi.common.enums; + +/** + * 业务操作类型 + * + * @author ruoyi + */ +public enum BusinessType +{ + /** + * 其它 + */ + OTHER, + + /** + * 新增 + */ + INSERT, + + /** + * 修改 + */ + UPDATE, + + /** + * 删除 + */ + DELETE, + + /** + * 授权 + */ + GRANT, + + /** + * 导出 + */ + EXPORT, + + /** + * 导入 + */ + IMPORT, + + /** + * 强退 + */ + FORCE, + + /** + * 生成代码 + */ + GENCODE, + + /** + * 清空数据 + */ + CLEAN, +} diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/enums/DataSourceType.java b/ruoyi-common/src/main/java/com/ruoyi/common/enums/DataSourceType.java new file mode 100644 index 0000000..e7cc6bb --- /dev/null +++ b/ruoyi-common/src/main/java/com/ruoyi/common/enums/DataSourceType.java @@ -0,0 +1,23 @@ +package com.ruoyi.common.enums; + +/** + * 数据源 + * + * @author ruoyi + */ +public enum DataSourceType +{ + /** + * 主库 + */ + MASTER, + + /** + * 从库 + */ + SLAVE, + /** + * 分库分表 + */ + SHARDING +} diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/enums/HttpMethod.java b/ruoyi-common/src/main/java/com/ruoyi/common/enums/HttpMethod.java new file mode 100644 index 0000000..be6f739 --- /dev/null +++ b/ruoyi-common/src/main/java/com/ruoyi/common/enums/HttpMethod.java @@ -0,0 +1,36 @@ +package com.ruoyi.common.enums; + +import java.util.HashMap; +import java.util.Map; +import org.springframework.lang.Nullable; + +/** + * 请求方式 + * + * @author ruoyi + */ +public enum HttpMethod +{ + GET, HEAD, POST, PUT, PATCH, DELETE, OPTIONS, TRACE; + + private static final Map mappings = new HashMap<>(16); + + static + { + for (HttpMethod httpMethod : values()) + { + mappings.put(httpMethod.name(), httpMethod); + } + } + + @Nullable + public static HttpMethod resolve(@Nullable String method) + { + return (method != null ? mappings.get(method) : null); + } + + public boolean matches(String method) + { + return (this == resolve(method)); + } +} diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/enums/LimitType.java b/ruoyi-common/src/main/java/com/ruoyi/common/enums/LimitType.java new file mode 100644 index 0000000..c609fd8 --- /dev/null +++ b/ruoyi-common/src/main/java/com/ruoyi/common/enums/LimitType.java @@ -0,0 +1,20 @@ +package com.ruoyi.common.enums; + +/** + * 限流类型 + * + * @author ruoyi + */ + +public enum LimitType +{ + /** + * 默认策略全局限流 + */ + DEFAULT, + + /** + * 根据请求者IP进行限流 + */ + IP +} diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/enums/OperatorType.java b/ruoyi-common/src/main/java/com/ruoyi/common/enums/OperatorType.java new file mode 100644 index 0000000..bdd143c --- /dev/null +++ b/ruoyi-common/src/main/java/com/ruoyi/common/enums/OperatorType.java @@ -0,0 +1,24 @@ +package com.ruoyi.common.enums; + +/** + * 操作人类别 + * + * @author ruoyi + */ +public enum OperatorType +{ + /** + * 其它 + */ + OTHER, + + /** + * 后台用户 + */ + MANAGE, + + /** + * 手机端用户 + */ + MOBILE +} diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/enums/UserStatus.java b/ruoyi-common/src/main/java/com/ruoyi/common/enums/UserStatus.java new file mode 100644 index 0000000..d7ff44a --- /dev/null +++ b/ruoyi-common/src/main/java/com/ruoyi/common/enums/UserStatus.java @@ -0,0 +1,30 @@ +package com.ruoyi.common.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/ruoyi-common/src/main/java/com/ruoyi/common/exception/DemoModeException.java b/ruoyi-common/src/main/java/com/ruoyi/common/exception/DemoModeException.java new file mode 100644 index 0000000..f6ad2ab --- /dev/null +++ b/ruoyi-common/src/main/java/com/ruoyi/common/exception/DemoModeException.java @@ -0,0 +1,15 @@ +package com.ruoyi.common.exception; + +/** + * 演示模式异常 + * + * @author ruoyi + */ +public class DemoModeException extends RuntimeException +{ + private static final long serialVersionUID = 1L; + + public DemoModeException() + { + } +} diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/exception/GlobalException.java b/ruoyi-common/src/main/java/com/ruoyi/common/exception/GlobalException.java new file mode 100644 index 0000000..211441b --- /dev/null +++ b/ruoyi-common/src/main/java/com/ruoyi/common/exception/GlobalException.java @@ -0,0 +1,58 @@ +package com.ruoyi.common.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; + } + + public String getMessage() + { + return message; + } + + public GlobalException setMessage(String message) + { + this.message = message; + return this; + } +} \ No newline at end of file diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/exception/RYException.java b/ruoyi-common/src/main/java/com/ruoyi/common/exception/RYException.java new file mode 100644 index 0000000..7bb2fb5 --- /dev/null +++ b/ruoyi-common/src/main/java/com/ruoyi/common/exception/RYException.java @@ -0,0 +1,61 @@ +/** + * Copyright (c) 2016-2019 人人开源 All rights reserved. + * + * https://www.renren.io + * + * 版权所有，侵权必究！ + */ + +package com.ruoyi.common.exception; + +/** + * 自定义异常 + * + * @author Mark sunlightcs@gmail.com + */ +public class RYException extends RuntimeException { + private static final long serialVersionUID = 1L; + + private String msg; + private int code = 500; + + public RYException(String msg) { + super(msg); + this.msg = msg; + } + + public RYException(String msg, Throwable e) { + super(msg, e); + this.msg = msg; + } + + public RYException(String msg, int code) { + super(msg); + this.msg = msg; + this.code = code; + } + + public RYException(String msg, int code, Throwable e) { + super(msg, e); + this.msg = msg; + this.code = code; + } + + public String getMsg() { + return msg; + } + + public void setMsg(String msg) { + this.msg = msg; + } + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + +} diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/exception/ServiceException.java b/ruoyi-common/src/main/java/com/ruoyi/common/exception/ServiceException.java new file mode 100644 index 0000000..6297f87 --- /dev/null +++ b/ruoyi-common/src/main/java/com/ruoyi/common/exception/ServiceException.java @@ -0,0 +1,73 @@ +package com.ruoyi.common.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; + } + + 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/ruoyi-common/src/main/java/com/ruoyi/common/exception/UtilException.java b/ruoyi-common/src/main/java/com/ruoyi/common/exception/UtilException.java new file mode 100644 index 0000000..980fa46 --- /dev/null +++ b/ruoyi-common/src/main/java/com/ruoyi/common/exception/UtilException.java @@ -0,0 +1,26 @@ +package com.ruoyi.common.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/ruoyi-common/src/main/java/com/ruoyi/common/exception/base/BaseException.java b/ruoyi-common/src/main/java/com/ruoyi/common/exception/base/BaseException.java new file mode 100644 index 0000000..b55d72e --- /dev/null +++ b/ruoyi-common/src/main/java/com/ruoyi/common/exception/base/BaseException.java @@ -0,0 +1,97 @@ +package com.ruoyi.common.exception.base; + +import com.ruoyi.common.utils.MessageUtils; +import com.ruoyi.common.utils.StringUtils; + +/** + * 基础异常 + * + * @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); + } + + @Override + public String getMessage() + { + String message = null; + if (!StringUtils.isEmpty(code)) + { + message = MessageUtils.message(code, args); + } + if (message == null) + { + message = defaultMessage; + } + return message; + } + + public String getModule() + { + return module; + } + + public String getCode() + { + return code; + } + + public Object[] getArgs() + { + return args; + } + + public String getDefaultMessage() + { + return defaultMessage; + } +} diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/exception/file/FileException.java b/ruoyi-common/src/main/java/com/ruoyi/common/exception/file/FileException.java new file mode 100644 index 0000000..871f09b --- /dev/null +++ b/ruoyi-common/src/main/java/com/ruoyi/common/exception/file/FileException.java @@ -0,0 +1,19 @@ +package com.ruoyi.common.exception.file; + +import com.ruoyi.common.exception.base.BaseException; + +/** + * 文件信息异常类 + * + * @author ruoyi + */ +public class FileException extends BaseException +{ + private static final long serialVersionUID = 1L; + + public FileException(String code, Object[] args) + { + super("file", code, args, null); + } + +} diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/exception/file/FileNameLengthLimitExceededException.java b/ruoyi-common/src/main/java/com/ruoyi/common/exception/file/FileNameLengthLimitExceededException.java new file mode 100644 index 0000000..70e0ec9 --- /dev/null +++ b/ruoyi-common/src/main/java/com/ruoyi/common/exception/file/FileNameLengthLimitExceededException.java @@ -0,0 +1,16 @@ +package com.ruoyi.common.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 }); + } +} diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/exception/file/FileSizeLimitExceededException.java b/ruoyi-common/src/main/java/com/ruoyi/common/exception/file/FileSizeLimitExceededException.java new file mode 100644 index 0000000..ec6ab05 --- /dev/null +++ b/ruoyi-common/src/main/java/com/ruoyi/common/exception/file/FileSizeLimitExceededException.java @@ -0,0 +1,16 @@ +package com.ruoyi.common.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 }); + } +} diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/exception/file/InvalidExtensionException.java b/ruoyi-common/src/main/java/com/ruoyi/common/exception/file/InvalidExtensionException.java new file mode 100644 index 0000000..f1c8e83 --- /dev/null +++ b/ruoyi-common/src/main/java/com/ruoyi/common/exception/file/InvalidExtensionException.java @@ -0,0 +1,81 @@ +package com.ruoyi.common.exception.file; + +import java.util.Arrays; +import org.apache.commons.fileupload.FileUploadException; + +/** + * 文件上传 误异常类 + * + * @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/ruoyi-common/src/main/java/com/ruoyi/common/exception/job/TaskException.java b/ruoyi-common/src/main/java/com/ruoyi/common/exception/job/TaskException.java new file mode 100644 index 0000000..a567b40 --- /dev/null +++ b/ruoyi-common/src/main/java/com/ruoyi/common/exception/job/TaskException.java @@ -0,0 +1,34 @@ +package com.ruoyi.common.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/ruoyi-common/src/main/java/com/ruoyi/common/exception/user/CaptchaException.java b/ruoyi-common/src/main/java/com/ruoyi/common/exception/user/CaptchaException.java new file mode 100644 index 0000000..389dbc7 --- /dev/null +++ b/ruoyi-common/src/main/java/com/ruoyi/common/exception/user/CaptchaException.java @@ -0,0 +1,16 @@ +package com.ruoyi.common.exception.user; + +/** + * 验证码错误异常类 + * + * @author ruoyi + */ +public class CaptchaException extends UserException +{ + private static final long serialVersionUID = 1L; + + public CaptchaException() + { + super("user.jcaptcha.error", null); + } +} diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/exception/user/CaptchaExpireException.java b/ruoyi-common/src/main/java/com/ruoyi/common/exception/user/CaptchaExpireException.java new file mode 100644 index 0000000..85f9486 --- /dev/null +++ b/ruoyi-common/src/main/java/com/ruoyi/common/exception/user/CaptchaExpireException.java @@ -0,0 +1,16 @@ +package com.ruoyi.common.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/ruoyi-common/src/main/java/com/ruoyi/common/exception/user/UserException.java b/ruoyi-common/src/main/java/com/ruoyi/common/exception/user/UserException.java new file mode 100644 index 0000000..c292d70 --- /dev/null +++ b/ruoyi-common/src/main/java/com/ruoyi/common/exception/user/UserException.java @@ -0,0 +1,18 @@ +package com.ruoyi.common.exception.user; + +import com.ruoyi.common.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/ruoyi-common/src/main/java/com/ruoyi/common/exception/user/UserPasswordNotMatchException.java b/ruoyi-common/src/main/java/com/ruoyi/common/exception/user/UserPasswordNotMatchException.java new file mode 100644 index 0000000..a7f3e5f --- /dev/null +++ b/ruoyi-common/src/main/java/com/ruoyi/common/exception/user/UserPasswordNotMatchException.java @@ -0,0 +1,16 @@ +package com.ruoyi.common.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/ruoyi-common/src/main/java/com/ruoyi/common/filter/RepeatableFilter.java b/ruoyi-common/src/main/java/com/ruoyi/common/filter/RepeatableFilter.java new file mode 100644 index 0000000..a1bcfe2 --- /dev/null +++ b/ruoyi-common/src/main/java/com/ruoyi/common/filter/RepeatableFilter.java @@ -0,0 +1,52 @@ +package com.ruoyi.common.filter; + +import java.io.IOException; +import javax.servlet.Filter; +import javax.servlet.FilterChain; +import javax.servlet.FilterConfig; +import javax.servlet.ServletException; +import javax.servlet.ServletRequest; +import javax.servlet.ServletResponse; +import javax.servlet.http.HttpServletRequest; +import org.springframework.http.MediaType; +import com.ruoyi.common.utils.StringUtils; + +/** + * Repeatable 过滤器 + * + * @author ruoyi + */ +public class RepeatableFilter implements Filter +{ + @Override + public void init(FilterConfig filterConfig) throws ServletException + { + + } + + @Override + public void doFilter(ServletRequest request, ServletResponse response, FilterChain chain) + throws IOException, ServletException + { + ServletRequest requestWrapper = null; + if (request instanceof HttpServletRequest + && StringUtils.startsWithIgnoreCase(request.getContentType(), MediaType.APPLICATION_JSON_VALUE)) + { + requestWrapper = new RepeatedlyRequestWrapper((HttpServletRequest) request, response); + } + if (null == requestWrapper) + { + chain.doFilter(request, response); + } + else + { + chain.doFilter(requestWrapper, response); + } + } + + @Override + public void destroy() + { + + } +} diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/filter/RepeatedlyRequestWrapper.java b/ruoyi-common/src/main/java/com/ruoyi/common/filter/RepeatedlyRequestWrapper.java new file mode 100644 index 0000000..614c24c --- /dev/null +++ b/ruoyi-common/src/main/java/com/ruoyi/common/filter/RepeatedlyRequestWrapper.java @@ -0,0 +1,75 @@ +package com.ruoyi.common.filter; + +import java.io.BufferedReader; +import java.io.ByteArrayInputStream; +import java.io.IOException; +import java.io.InputStreamReader; +import javax.servlet.ReadListener; +import javax.servlet.ServletInputStream; +import javax.servlet.ServletResponse; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletRequestWrapper; +import com.ruoyi.common.utils.http.HttpHelper; + +/** + * 构建可重复读取inputStream的request + * + * @author ruoyi + */ +public class RepeatedlyRequestWrapper extends HttpServletRequestWrapper +{ + private final byte[] body; + + public RepeatedlyRequestWrapper(HttpServletRequest request, ServletResponse response) throws IOException + { + super(request); + request.setCharacterEncoding("UTF-8"); + response.setCharacterEncoding("UTF-8"); + + body = HttpHelper.getBodyString(request).getBytes("UTF-8"); + } + + @Override + public BufferedReader getReader() throws IOException + { + return new BufferedReader(new InputStreamReader(getInputStream())); + } + + @Override + public ServletInputStream getInputStream() throws IOException + { + final ByteArrayInputStream bais = new ByteArrayInputStream(body); + return new ServletInputStream() + { + @Override + public int read() throws IOException + { + return bais.read(); + } + + @Override + public int available() throws IOException + { + return body.length; + } + + @Override + public boolean isFinished() + { + return false; + } + + @Override + public boolean isReady() + { + return false; + } + + @Override + public void setReadListener(ReadListener readListener) + { + + } + }; + } +} diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/filter/XssFilter.java b/ruoyi-common/src/main/java/com/ruoyi/common/filter/XssFilter.java new file mode 100644 index 0000000..99323ed --- /dev/null +++ b/ruoyi-common/src/main/java/com/ruoyi/common/filter/XssFilter.java @@ -0,0 +1,74 @@ +package com.ruoyi.common.filter; + +import java.io.IOException; +import java.util.ArrayList; +import java.util.List; +import javax.servlet.Filter; +import javax.servlet.FilterChain; +import javax.servlet.FilterConfig; +import javax.servlet.ServletException; +import javax.servlet.ServletRequest; +import javax.servlet.ServletResponse; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; +import com.ruoyi.common.utils.StringUtils; + +/** + * 防止XSS攻击的过滤器 + * + * @author ruoyi + */ +public class XssFilter implements Filter +{ + /** + * 排除链接 + */ + public List excludes = new ArrayList<>(); + + @Override + public void init(FilterConfig filterConfig) throws ServletException + { + String tempExcludes = filterConfig.getInitParameter("excludes"); + if (StringUtils.isNotEmpty(tempExcludes)) + { + String[] url = tempExcludes.split(","); + for (int i = 0; url != null && i < url.length; i++) + { + excludes.add(url[i]); + } + } + } + + @Override + public void doFilter(ServletRequest request, ServletResponse response, FilterChain chain) + throws IOException, ServletException + { + HttpServletRequest req = (HttpServletRequest) request; + HttpServletResponse resp = (HttpServletResponse) response; + if (handleExcludeURL(req, resp)) + { + chain.doFilter(request, response); + return; + } + XssHttpServletRequestWrapper xssRequest = new XssHttpServletRequestWrapper((HttpServletRequest) request); + chain.doFilter(xssRequest, response); + } + + private boolean handleExcludeURL(HttpServletRequest request, HttpServletResponse response) + { + String url = request.getServletPath(); + String method = request.getMethod(); + // GET DELETE 不过滤 + if (method == null || method.matches("GET") || method.matches("DELETE")) + { + return true; + } + return StringUtils.matches(url, excludes); + } + + @Override + public void destroy() + { + + } +} \ No newline at end of file diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/filter/XssHttpServletRequestWrapper.java b/ruoyi-common/src/main/java/com/ruoyi/common/filter/XssHttpServletRequestWrapper.java new file mode 100644 index 0000000..b1eeb65 --- /dev/null +++ b/ruoyi-common/src/main/java/com/ruoyi/common/filter/XssHttpServletRequestWrapper.java @@ -0,0 +1,111 @@ +package com.ruoyi.common.filter; + +import java.io.ByteArrayInputStream; +import java.io.IOException; +import javax.servlet.ReadListener; +import javax.servlet.ServletInputStream; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletRequestWrapper; +import org.apache.commons.io.IOUtils; +import org.springframework.http.HttpHeaders; +import org.springframework.http.MediaType; +import com.ruoyi.common.utils.StringUtils; +import com.ruoyi.common.utils.html.EscapeUtil; + +/** + * XSS过滤处理 + * + * @author ruoyi + */ +public class XssHttpServletRequestWrapper extends HttpServletRequestWrapper +{ + /** + * @param request + */ + public XssHttpServletRequestWrapper(HttpServletRequest request) + { + super(request); + } + + @Override + public String[] getParameterValues(String name) + { + String[] values = super.getParameterValues(name); + if (values != null) + { + int length = values.length; + String[] escapseValues = new String[length]; + for (int i = 0; i < length; i++) + { + // 防xss攻击和过滤前后空格 + escapseValues[i] = EscapeUtil.clean(values[i]).trim(); + } + return escapseValues; + } + return super.getParameterValues(name); + } + + @Override + public ServletInputStream getInputStream() throws IOException + { + // 非json类型，直接返回 + if (!isJsonRequest()) + { + return super.getInputStream(); + } + + // 为空，直接返回 + String json = IOUtils.toString(super.getInputStream(), "utf-8"); + if (StringUtils.isEmpty(json)) + { + return super.getInputStream(); + } + + // xss过滤 + json = EscapeUtil.clean(json).trim(); + byte[] jsonBytes = json.getBytes("utf-8"); + final ByteArrayInputStream bis = new ByteArrayInputStream(jsonBytes); + return new ServletInputStream() + { + @Override + public boolean isFinished() + { + return true; + } + + @Override + public boolean isReady() + { + return true; + } + + @Override + public int available() throws IOException + { + return jsonBytes.length; + } + + @Override + public void setReadListener(ReadListener readListener) + { + } + + @Override + public int read() throws IOException + { + return bis.read(); + } + }; + } + + /** + * 是否是Json请求 + * + * @param request + */ + public boolean isJsonRequest() + { + String header = super.getHeader(HttpHeaders.CONTENT_TYPE); + return StringUtils.startsWithIgnoreCase(header, MediaType.APPLICATION_JSON_VALUE); + } +} \ No newline at end of file diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/utils/Arith.java b/ruoyi-common/src/main/java/com/ruoyi/common/utils/Arith.java new file mode 100644 index 0000000..b6326c2 --- /dev/null +++ b/ruoyi-common/src/main/java/com/ruoyi/common/utils/Arith.java @@ -0,0 +1,114 @@ +package com.ruoyi.common.utils; + +import java.math.BigDecimal; +import java.math.RoundingMode; + +/** + * 精确的浮点数运算 + * + * @author ruoyi + */ +public class Arith +{ + + /** 默认除法运算精度 */ + private static final int DEF_DIV_SCALE = 10; + + /** 这个类不能实例化 */ + private Arith() + { + } + + /** + * 提供精确的加法运算。 + * @param v1 被加数 + * @param v2 加数 + * @return 两个参数的和 + */ + public static double add(double v1, double v2) + { + BigDecimal b1 = new BigDecimal(Double.toString(v1)); + BigDecimal b2 = new BigDecimal(Double.toString(v2)); + return b1.add(b2).doubleValue(); + } + + /** + * 提供精确的减法运算。 + * @param v1 被减数 + * @param v2 减数 + * @return 两个参数的差 + */ + public static double sub(double v1, double v2) + { + BigDecimal b1 = new BigDecimal(Double.toString(v1)); + BigDecimal b2 = new BigDecimal(Double.toString(v2)); + return b1.subtract(b2).doubleValue(); + } + + /** + * 提供精确的乘法运算。 + * @param v1 被乘数 + * @param v2 乘数 + * @return 两个参数的积 + */ + public static double mul(double v1, double v2) + { + BigDecimal b1 = new BigDecimal(Double.toString(v1)); + BigDecimal b2 = new BigDecimal(Double.toString(v2)); + return b1.multiply(b2).doubleValue(); + } + + /** + * 提供（相对）精确的除法运算，当发生除不尽的情况时，精确到 + * 小数点以后10位，以后的数字四舍五入。 + * @param v1 被除数 + * @param v2 除数 + * @return 两个参数的商 + */ + public static double div(double v1, double v2) + { + return div(v1, v2, DEF_DIV_SCALE); + } + + /** + * 提供（相对）精确的除法运算。当发生除不尽的情况时，由scale参数指 + * 定精度，以后的数字四舍五入。 + * @param v1 被除数 + * @param v2 除数 + * @param scale 表示表示需要精确到小数点以后几位。 + * @return 两个参数的商 + */ + public static double div(double v1, double v2, int scale) + { + if (scale < 0) + { + throw new IllegalArgumentException( + "The scale must be a positive integer or zero"); + } + BigDecimal b1 = new BigDecimal(Double.toString(v1)); + BigDecimal b2 = new BigDecimal(Double.toString(v2)); + if (b1.compareTo(BigDecimal.ZERO) == 0) + { + return BigDecimal.ZERO.doubleValue(); + } + return b1.divide(b2, scale, RoundingMode.HALF_UP).doubleValue(); + } + + /** + * 提供精确的小数位四舍五入处理。 + * @param v 需要四舍五入的数字 + * @param scale 小数点后保留几位 + * @return 四舍五入后的结果 + */ + public static double round(double v, int scale) + { + if (scale < 0) + { + throw new IllegalArgumentException( + "The scale must be a positive integer or zero"); + } + BigDecimal b = new BigDecimal(Double.toString(v)); + BigDecimal one = BigDecimal.ONE; + return b.divide(one, scale, RoundingMode.HALF_UP).doubleValue(); + } +} diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/utils/BeanUtil.java b/ruoyi-common/src/main/java/com/ruoyi/common/utils/BeanUtil.java new file mode 100644 index 0000000..4f399f2 --- /dev/null +++ b/ruoyi-common/src/main/java/com/ruoyi/common/utils/BeanUtil.java @@ -0,0 +1,36 @@ +package com.ruoyi.common.utils; +import lombok.extern.slf4j.Slf4j; +import org.apache.commons.io.output.CloseShieldOutputStream; +import org.springframework.beans.BeansException; +import org.springframework.beans.factory.DisposableBean; +import org.springframework.context.ApplicationContext; +import org.springframework.context.ApplicationContextAware; +import java.util.ArrayList; +import java.util.List; + +public class BeanUtil implements ApplicationContextAware, DisposableBean { + private static ApplicationContext applicationContext = null; + + /** + * 从静态变量applicationContext中取得Bean, 自动转型为所赋值对象的类型. + */ + public static T getBean(Class requiredType) { + if(applicationContext==null){ + throw new IllegalStateException("applicaitonContext属性未注入, 请在SpringBoot启动类中注册BeanUtil."); + } + return applicationContext.getBean(requiredType); + } + + @Override + public void destroy() { + applicationContext = null; + } + + @Override + public void setApplicationContext(ApplicationContext applicationContext) throws BeansException { + if (BeanUtil.applicationContext != null) { + System.out.println("BeanUtil中的ApplicationContext被覆盖, 原有ApplicationContext为:" + BeanUtil.applicationContext); + } + BeanUtil.applicationContext = applicationContext; + } +} diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/utils/ClassReflection.java b/ruoyi-common/src/main/java/com/ruoyi/common/utils/ClassReflection.java new file mode 100644 index 0000000..15acf9d --- /dev/null +++ b/ruoyi-common/src/main/java/com/ruoyi/common/utils/ClassReflection.java @@ -0,0 +1,36 @@ +package com.ruoyi.common.utils; + +import java.lang.reflect.Field; + +public class ClassReflection { + + /** + * @param class1 from 用于赋值的实体类 + * @param class2 to 需要待赋值的实体类 + * 描述：反射实体类赋值 + */ + public static void reflectionAttr(Object class1, Object class2) throws Exception { + Class clazz1 = class1.getClass(); + Class clazz2 = class2.getClass(); + // 获取两个实体类的所有属性 + Field[] fields1 = clazz1.getDeclaredFields(); + Field[] fields2 = clazz2.getDeclaredFields(); + // 遍历class1Bean，获取逐个属性值，然后遍历class2Bean查找是否有相同的属性，如有相同则赋值 + for (Field f1 : fields1) { + if (f1.getName().equals("serialVersionUID")) + continue; + //设置访问权限 + f1.setAccessible(true); + Object value = f1.get(class1); + for (Field f2 : fields2) { + //字段名称相同、字段类型相同，进行赋值 + if (f1.getName().equals(f2.getName()) + && f1.getType().getName().equals(f2.getType().getName())) { + //设置访问权限 + f2.setAccessible(true); + f2.set(class2, value); + } + } + } + } +} diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/utils/DateUtils.java b/ruoyi-common/src/main/java/com/ruoyi/common/utils/DateUtils.java new file mode 100644 index 0000000..d0f8c69 --- /dev/null +++ b/ruoyi-common/src/main/java/com/ruoyi/common/utils/DateUtils.java @@ -0,0 +1,187 @@ +package com.ruoyi.common.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); + } + + /** + * 计算相差天数 + */ + public static int differentDaysByMillisecond(Date date1, Date date2) + { + return Math.abs((int) ((date2.getTime() - date1.getTime()) / (1000 * 3600 * 24))); + } + + /** + * 计算两个时间差 + */ + public static String getDatePoor(Date endDate, Date nowDate) + { + long nd = 1000 * 24 * 60 * 60; + long nh = 1000 * 60 * 60; + long nm = 1000 * 60; + // long ns = 1000; + // 获得两个时间的毫秒时间差异 + long diff = endDate.getTime() - nowDate.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/ruoyi-common/src/main/java/com/ruoyi/common/utils/DictUtils.java b/ruoyi-common/src/main/java/com/ruoyi/common/utils/DictUtils.java new file mode 100644 index 0000000..34909ff --- /dev/null +++ b/ruoyi-common/src/main/java/com/ruoyi/common/utils/DictUtils.java @@ -0,0 +1,182 @@ +package com.ruoyi.common.utils; + +import java.util.Collection; +import java.util.List; +import com.ruoyi.common.constant.Constants; +import com.ruoyi.common.core.domain.entity.SysDictData; +import com.ruoyi.common.core.redis.RedisCache; +import com.ruoyi.common.utils.spring.SpringUtils; + +/** + * 字典工具类 + * + * @author ruoyi + */ +public class DictUtils +{ + /** + * 分隔符 + */ + public static final String SEPARATOR = ","; + + /** + * 设置字典缓存 + * + * @param key 参数键 + * @param dictDatas 字典数据列表 + */ + public static void setDictCache(String key, List dictDatas) + { + SpringUtils.getBean(RedisCache.class).setCacheObject(getCacheKey(key), dictDatas); + } + + /** + * 获取字典缓存 + * + * @param key 参数键 + * @return dictDatas 字典数据列表 + */ + public static List getDictCache(String key) + { + Object cacheObj = SpringUtils.getBean(RedisCache.class).getCacheObject(getCacheKey(key)); + if (StringUtils.isNotNull(cacheObj)) + { + return StringUtils.cast(cacheObj); + } + return null; + } + + /** + * 根据字典类型和字典值获取字典标签 + * + * @param dictType 字典类型 + * @param dictValue 字典值 + * @return 字典标签 + */ + public static String getDictLabel(String dictType, String dictValue) + { + return getDictLabel(dictType, dictValue, SEPARATOR); + } + + /** + * 根据字典类型和字典标签获取字典值 + * + * @param dictType 字典类型 + * @param dictLabel 字典标签 + * @return 字典值 + */ + public static String getDictValue(String dictType, String dictLabel) + { + return getDictValue(dictType, dictLabel, SEPARATOR); + } + + /** + * 根据字典类型和字典值获取字典标签 + * + * @param dictType 字典类型 + * @param dictValue 字典值 + * @param separator 分隔符 + * @return 字典标签 + */ + public static String getDictLabel(String dictType, String dictValue, String separator) + { + StringBuilder propertyString = new StringBuilder(); + List datas = getDictCache(dictType); + + if (StringUtils.containsAny(separator, dictValue) && StringUtils.isNotEmpty(datas)) + { + for (SysDictData dict : datas) + { + for (String value : dictValue.split(separator)) + { + if (value.equals(dict.getDictValue())) + { + propertyString.append(dict.getDictLabel()).append(separator); + break; + } + } + } + } + else + { + for (SysDictData dict : datas) + { + if (dictValue.equals(dict.getDictValue())) + { + return dict.getDictLabel(); + } + } + } + return StringUtils.stripEnd(propertyString.toString(), separator); + } + + /** + * 根据字典类型和字典标签获取字典值 + * + * @param dictType 字典类型 + * @param dictLabel 字典标签 + * @param separator 分隔符 + * @return 字典值 + */ + public static String getDictValue(String dictType, String dictLabel, String separator) + { + StringBuilder propertyString = new StringBuilder(); + List datas = getDictCache(dictType); + + if (StringUtils.containsAny(separator, dictLabel) && StringUtils.isNotEmpty(datas)) + { + for (SysDictData dict : datas) + { + for (String label : dictLabel.split(separator)) + { + if (label.equals(dict.getDictLabel())) + { + propertyString.append(dict.getDictValue()).append(separator); + break; + } + } + } + } + else + { + for (SysDictData dict : datas) + { + if (dictLabel.equals(dict.getDictLabel())) + { + return dict.getDictValue(); + } + } + } + return StringUtils.stripEnd(propertyString.toString(), separator); + } + + /** + * 删除指定字典缓存 + * + * @param key 字典键 + */ + public static void removeDictCache(String key) + { + SpringUtils.getBean(RedisCache.class).deleteObject(getCacheKey(key)); + } + + /** + * 清空字典缓存 + */ + public static void clearDictCache() + { + Collection keys = SpringUtils.getBean(RedisCache.class).keys(Constants.SYS_DICT_KEY + "*"); + SpringUtils.getBean(RedisCache.class).deleteObject(keys); + } + + /** + * 设置cache key + * + * @param configKey 参数键 + * @return 缓存键key + */ + public static String getCacheKey(String configKey) + { + return Constants.SYS_DICT_KEY + configKey; + } +} diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/utils/ExceptionUtil.java b/ruoyi-common/src/main/java/com/ruoyi/common/utils/ExceptionUtil.java new file mode 100644 index 0000000..214e4a0 --- /dev/null +++ b/ruoyi-common/src/main/java/com/ruoyi/common/utils/ExceptionUtil.java @@ -0,0 +1,39 @@ +package com.ruoyi.common.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/ruoyi-common/src/main/java/com/ruoyi/common/utils/IPUtils.java b/ruoyi-common/src/main/java/com/ruoyi/common/utils/IPUtils.java new file mode 100644 index 0000000..2e3bef6 --- /dev/null +++ b/ruoyi-common/src/main/java/com/ruoyi/common/utils/IPUtils.java @@ -0,0 +1,91 @@ +/** + * Copyright (c) 2016-2019 人人开源 All rights reserved. + * + * https://www.renren.io + * + * 版权所有，侵权必究！ + */ + +package com.ruoyi.common.utils; + +import lombok.extern.slf4j.Slf4j; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +import javax.servlet.http.HttpServletRequest; +import java.net.Inet4Address; +import java.net.InetAddress; +import java.net.NetworkInterface; +import java.util.Enumeration; + +/** + * IP地址 + * + * @author Mark sunlightcs@gmail.com + */ +@Slf4j +public class IPUtils { + private static Logger logger = LoggerFactory.getLogger(IPUtils.class); + + /** + * 获取IP地址 + * + * 使用Nginx等反向代理软件， 则不能通过request.getRemoteAddr()获取IP地址 + * 如果使用了多级反向代理的话，X-Forwarded-For的值并不止一个，而是一串IP地址，X-Forwarded-For中第一个非unknown的有效IP字符串，则为真实IP地址 + */ + public static String getIpAddr(HttpServletRequest request) { + String ip = null; + try { + ip = request.getHeader("x-forwarded-for"); + if (StringUtils.isEmpty(ip) || "unknown".equalsIgnoreCase(ip)) { + ip = request.getHeader("Proxy-Client-IP"); + } + if (StringUtils.isEmpty(ip) || ip.length() == 0 || "unknown".equalsIgnoreCase(ip)) { + ip = request.getHeader("WL-Proxy-Client-IP"); + } + if (StringUtils.isEmpty(ip) || "unknown".equalsIgnoreCase(ip)) { + ip = request.getHeader("HTTP_CLIENT_IP"); + } + if (StringUtils.isEmpty(ip) || "unknown".equalsIgnoreCase(ip)) { + ip = request.getHeader("HTTP_X_FORWARDED_FOR"); + } + if (StringUtils.isEmpty(ip) || "unknown".equalsIgnoreCase(ip)) { + ip = request.getRemoteAddr(); + } + } catch (Exception e) { + logger.error("IPUtils ERROR ", e); + } + +// //使用代理，则获取第一个IP地址 +// if(StringUtils.isEmpty(ip) && ip.length() > 15) { +// if(ip.indexOf(",") > 0) { +// ip = ip.substring(0, ip.indexOf(",")); +// } +// } + + return ip; + } + + + public static String getLocalIpAddress() { + try { + Enumeration allNetInterfaces = NetworkInterface.getNetworkInterfaces(); + InetAddress ip; + while (allNetInterfaces.hasMoreElements()) { + NetworkInterface netInterface = allNetInterfaces.nextElement(); + if (!netInterface.isLoopback() && !netInterface.isVirtual() && netInterface.isUp()) { + Enumeration addresses = netInterface.getInetAddresses(); + while (addresses.hasMoreElements()) { + ip = addresses.nextElement(); + if (ip instanceof Inet4Address) { + return ip.getHostAddress(); + } + } + } + } + } catch (Exception e) { + logger.error("本地IP地址获取失败", e); + } + return ""; + } +} diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/utils/LogUtils.java b/ruoyi-common/src/main/java/com/ruoyi/common/utils/LogUtils.java new file mode 100644 index 0000000..0de30c6 --- /dev/null +++ b/ruoyi-common/src/main/java/com/ruoyi/common/utils/LogUtils.java @@ -0,0 +1,18 @@ +package com.ruoyi.common.utils; + +/** + * 处理并记录日志文件 + * + * @author ruoyi + */ +public class LogUtils +{ + public static String getBlock(Object msg) + { + if (msg == null) + { + msg = ""; + } + return "[" + msg.toString() + "]"; + } +} diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/utils/MessageUtils.java b/ruoyi-common/src/main/java/com/ruoyi/common/utils/MessageUtils.java new file mode 100644 index 0000000..7dac75a --- /dev/null +++ b/ruoyi-common/src/main/java/com/ruoyi/common/utils/MessageUtils.java @@ -0,0 +1,26 @@ +package com.ruoyi.common.utils; + +import org.springframework.context.MessageSource; +import org.springframework.context.i18n.LocaleContextHolder; +import com.ruoyi.common.utils.spring.SpringUtils; + +/** + * 获取i18n资源文件 + * + * @author ruoyi + */ +public class MessageUtils +{ + /** + * 根据消息键和参数 获取消息 委托给spring messageSource + * + * @param code 消息键 + * @param args 参数 + * @return 获取国际化翻译值 + */ + public static String message(String code, Object... args) + { + MessageSource messageSource = SpringUtils.getBean(MessageSource.class); + return messageSource.getMessage(code, args, LocaleContextHolder.getLocale()); + } +} diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/utils/PageUtils.java b/ruoyi-common/src/main/java/com/ruoyi/common/utils/PageUtils.java new file mode 100644 index 0000000..70e9b08 --- /dev/null +++ b/ruoyi-common/src/main/java/com/ruoyi/common/utils/PageUtils.java @@ -0,0 +1,35 @@ +package com.ruoyi.common.utils; + +import com.github.pagehelper.PageHelper; +import com.ruoyi.common.core.page.PageDomain; +import com.ruoyi.common.core.page.TableSupport; +import com.ruoyi.common.utils.sql.SqlUtil; + +/** + * 分页工具类 + * + * @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/ruoyi-common/src/main/java/com/ruoyi/common/utils/Query.java b/ruoyi-common/src/main/java/com/ruoyi/common/utils/Query.java new file mode 100644 index 0000000..98c9788 --- /dev/null +++ b/ruoyi-common/src/main/java/com/ruoyi/common/utils/Query.java @@ -0,0 +1,75 @@ +/** + * Copyright (c) 2016-2019 人人开源 All rights reserved. + * + * https://www.renren.io + * + * 版权所有，侵权必究！ + */ + +package com.ruoyi.common.utils; + +import com.baomidou.mybatisplus.core.metadata.OrderItem; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.ruoyi.common.constant.Constants; +import com.ruoyi.common.xss.SQLFilter; + +import java.util.Map; + +/** + * 查询参数 + * + * @author Mark sunlightcs@gmail.com + */ +public class Query { + + public Page getPage(Map params) { + return this.getPage(params, null, false); + } + + public Page getPage(Map params, String defaultOrderField, boolean isAsc) { + //分页参数 + long curPage = 1; + long limit = 10; + + if(params.get(Constants.PAGE) != null){ + curPage = Long.parseLong((String)params.get(Constants.PAGE)); + } + if(params.get(Constants.LIMIT) != null){ + limit = Long.parseLong((String)params.get(Constants.LIMIT)); + } + + //分页对象 + Page page = new Page<>(curPage, limit); + + //分页参数 + params.put(Constants.PAGE, page); + + //排序字段 + //防止SQL注入（因为sidx、order是通过拼接SQL实现排序的，会有SQL注入风险） + String orderField = SQLFilter.sqlInject((String)params.get(Constants.ORDER_FIELD)); + String order = (String)params.get(Constants.ORDER); + + //前端字段排序 + if(StringUtils.isNotEmpty(orderField) && StringUtils.isNotEmpty(order)){ + if(Constants.ASC.equalsIgnoreCase(order)) { + return page.addOrder(OrderItem.asc(orderField)); + }else { + return page.addOrder(OrderItem.desc(orderField)); + } + } + + //没有排序字段，则不排序 + if(StringUtils.isBlank(defaultOrderField)){ + return page; + } + + //默认排序 + if(isAsc) { + page.addOrder(OrderItem.asc(defaultOrderField)); + }else { + page.addOrder(OrderItem.desc(defaultOrderField)); + } + + return page; + } +} diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/utils/SecurityUtils.java b/ruoyi-common/src/main/java/com/ruoyi/common/utils/SecurityUtils.java new file mode 100644 index 0000000..a6f3d53 --- /dev/null +++ b/ruoyi-common/src/main/java/com/ruoyi/common/utils/SecurityUtils.java @@ -0,0 +1,120 @@ +package com.ruoyi.common.utils; + +import org.springframework.security.core.Authentication; +import org.springframework.security.core.context.SecurityContextHolder; +import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder; +import com.ruoyi.common.constant.HttpStatus; +import com.ruoyi.common.core.domain.model.LoginUser; +import com.ruoyi.common.exception.ServiceException; + +/** + * 安全服务工具类 + * + * @author ruoyi + */ +public class SecurityUtils +{ + /** + * 用户ID + **/ + public static Long getUserId() + { + try + { + return getLoginUser().getUserId(); + } + catch (Exception e) + { + throw new ServiceException("获取用户ID异常", HttpStatus.UNAUTHORIZED); + } + } + + /** + * 获取部门ID + **/ + public static Long getDeptId() + { + try + { + return getLoginUser().getDeptId(); + } + catch (Exception e) + { + throw new ServiceException("获取部门ID异常", HttpStatus.UNAUTHORIZED); + } + } + + /** + * 获取用户账户 + **/ + public static String getUsername() + { + try + { + return getLoginUser().getUsername(); + } + catch (Exception e) + { + throw new ServiceException("获取用户账户异常", HttpStatus.UNAUTHORIZED); + } + } + + /** + * 获取用户 + **/ + public static LoginUser getLoginUser() + { + try + { + return (LoginUser) getAuthentication().getPrincipal(); + } + catch (Exception e) + { + throw new ServiceException("获取用户信息异常", HttpStatus.UNAUTHORIZED); + } + } + + /** + * 获取Authentication + */ + public static Authentication getAuthentication() + { + return SecurityContextHolder.getContext().getAuthentication(); + } + + /** + * 生成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); + } + + /** + * 是否为管理员 + * + * @param userId 用户ID + * @return 结果 + */ + public static boolean isAdmin(Long userId) + { + return userId != null && 1L == userId; + } +} diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/utils/ServletUtils.java b/ruoyi-common/src/main/java/com/ruoyi/common/utils/ServletUtils.java new file mode 100644 index 0000000..85af068 --- /dev/null +++ b/ruoyi-common/src/main/java/com/ruoyi/common/utils/ServletUtils.java @@ -0,0 +1,146 @@ +package com.ruoyi.common.utils; + +import java.io.IOException; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; +import javax.servlet.http.HttpSession; +import org.springframework.web.context.request.RequestAttributes; +import org.springframework.web.context.request.RequestContextHolder; +import org.springframework.web.context.request.ServletRequestAttributes; +import com.ruoyi.common.core.text.Convert; + +/** + * 客户端工具类 + * + * @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); + } + + /** + * 获取request + */ + public static HttpServletRequest getRequest() + { + return getRequestAttributes().getRequest(); + } + + /** + * 获取response + */ + public static HttpServletResponse getResponse() + { + return getRequestAttributes().getResponse(); + } + + /** + * 获取session + */ + public static HttpSession getSession() + { + return getRequest().getSession(); + } + + public static ServletRequestAttributes getRequestAttributes() + { + RequestAttributes attributes = RequestContextHolder.getRequestAttributes(); + return (ServletRequestAttributes) attributes; + } + + /** + * 将字符串渲染到客户端 + * + * @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"); + } +} diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/utils/StringUtils.java b/ruoyi-common/src/main/java/com/ruoyi/common/utils/StringUtils.java new file mode 100644 index 0000000..6b70889 --- /dev/null +++ b/ruoyi-common/src/main/java/com/ruoyi/common/utils/StringUtils.java @@ -0,0 +1,583 @@ +package com.ruoyi.common.utils; + +import java.util.ArrayList; +import java.util.Collection; +import java.util.HashSet; +import java.util.List; +import java.util.Map; +import java.util.Set; +import org.springframework.util.AntPathMatcher; +import com.ruoyi.common.constant.Constants; +import com.ruoyi.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 = '_'; + + /** + * 获取参数不为空值 + * + * @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 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); + } + + /** + * 格式化文本, {} 表示占位符
+ * 此方法只是简单将占位符 {} 按照顺序替换为参数
+ * 如果想输出 {} 使用 \\转义 { 即可，如果想输出 {} 之前的 \ 使用双转义符 \\\\ 即可
+ * 例：
+ * 通常使用：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); + } + + /** + * 字符串转set + * + * @param str 字符串 + * @param sep 分隔符 + * @return set集合 + */ + public static final Set str2Set(String str, String sep) + { + return new HashSet(str2List(str, sep, true, false)); + } + + /** + * 字符串转list + * + * @param str 字符串 + * @param sep 分隔符 + * @param filterBlank 过滤纯空白 + * @param trim 去掉首尾空白 + * @return list集合 + */ + public static final List str2List(String str, String sep, boolean filterBlank, boolean trim) + { + List list = new ArrayList(); + if (StringUtils.isEmpty(str)) + { + return list; + } + + // 过滤空白字符串 + if (filterBlank && StringUtils.isBlank(str)) + { + return list; + } + String[] split = str.split(sep); + for (String string : split) + { + if (filterBlank && StringUtils.isBlank(string)) + { + continue; + } + if (trim) + { + string = string.trim(); + } + list.add(string); + } + + return list; + } + + /** + * 查找指定字符串是否包含指定字符串列表中的任意一个字符串同时串忽略大小写 + * + * @param cs 指定字符串 + * @param searchCharSequences 需要检查的字符串数组 + * @return 是否包含任意一个字符串 + */ + public static boolean containsAnyIgnoreCase(CharSequence cs, CharSequence... searchCharSequences) + { + if (isEmpty(cs) || isEmpty(searchCharSequences)) + { + return false; + } + for (CharSequence testStr : searchCharSequences) + { + if (containsIgnoreCase(cs, testStr)) + { + 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; + } + 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(); + } +} \ No newline at end of file diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/utils/Threads.java b/ruoyi-common/src/main/java/com/ruoyi/common/utils/Threads.java new file mode 100644 index 0000000..71fe6d5 --- /dev/null +++ b/ruoyi-common/src/main/java/com/ruoyi/common/utils/Threads.java @@ -0,0 +1,99 @@ +package com.ruoyi.common.utils; + +import java.util.concurrent.CancellationException; +import java.util.concurrent.ExecutionException; +import java.util.concurrent.ExecutorService; +import java.util.concurrent.Future; +import java.util.concurrent.TimeUnit; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +/** + * 线程相关工具类. + * + * @author ruoyi + */ +public class Threads +{ + private static final Logger logger = LoggerFactory.getLogger(Threads.class); + + /** + * sleep等待,单位为毫秒 + */ + public static void sleep(long milliseconds) + { + try + { + Thread.sleep(milliseconds); + } + catch (InterruptedException e) + { + return; + } + } + + /** + * 停止线程池 + * 先使用shutdown, 停止接收新任务并尝试完成所有已存在任务. + * 如果超时, 则调用shutdownNow, 取消在workQueue中Pending的任务,并中断所有阻塞函数. + * 如果仍然超時，則強制退出. + * 另对在shutdown时线程本身被调用中断做了处理. + */ + public static void shutdownAndAwaitTermination(ExecutorService pool) + { + if (pool != null && !pool.isShutdown()) + { + pool.shutdown(); + try + { + if (!pool.awaitTermination(120, TimeUnit.SECONDS)) + { + pool.shutdownNow(); + if (!pool.awaitTermination(120, TimeUnit.SECONDS)) + { + logger.info("Pool did not terminate"); + } + } + } + catch (InterruptedException ie) + { + pool.shutdownNow(); + Thread.currentThread().interrupt(); + } + } + } + + /** + * 打印线程异常信息 + */ + public static void printException(Runnable r, Throwable t) + { + if (t == null && r instanceof Future) + { + try + { + Future future = (Future) r; + if (future.isDone()) + { + future.get(); + } + } + catch (CancellationException ce) + { + t = ce; + } + catch (ExecutionException ee) + { + t = ee.getCause(); + } + catch (InterruptedException ie) + { + Thread.currentThread().interrupt(); + } + } + if (t != null) + { + logger.error(t.getMessage(), t); + } + } +} diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/utils/bean/BeanUtils.java b/ruoyi-common/src/main/java/com/ruoyi/common/utils/bean/BeanUtils.java new file mode 100644 index 0000000..4463662 --- /dev/null +++ b/ruoyi-common/src/main/java/com/ruoyi/common/utils/bean/BeanUtils.java @@ -0,0 +1,110 @@ +package com.ruoyi.common.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/ruoyi-common/src/main/java/com/ruoyi/common/utils/bean/BeanValidators.java b/ruoyi-common/src/main/java/com/ruoyi/common/utils/bean/BeanValidators.java new file mode 100644 index 0000000..80bfed7 --- /dev/null +++ b/ruoyi-common/src/main/java/com/ruoyi/common/utils/bean/BeanValidators.java @@ -0,0 +1,24 @@ +package com.ruoyi.common.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/ruoyi-common/src/main/java/com/ruoyi/common/utils/file/FileTypeUtils.java b/ruoyi-common/src/main/java/com/ruoyi/common/utils/file/FileTypeUtils.java new file mode 100644 index 0000000..68130b9 --- /dev/null +++ b/ruoyi-common/src/main/java/com/ruoyi/common/utils/file/FileTypeUtils.java @@ -0,0 +1,76 @@ +package com.ruoyi.common.utils.file; + +import java.io.File; +import org.apache.commons.lang3.StringUtils; + +/** + * 文件类型工具类 + * + * @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 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/ruoyi-common/src/main/java/com/ruoyi/common/utils/file/FileUploadUtils.java b/ruoyi-common/src/main/java/com/ruoyi/common/utils/file/FileUploadUtils.java new file mode 100644 index 0000000..23b4cf1 --- /dev/null +++ b/ruoyi-common/src/main/java/com/ruoyi/common/utils/file/FileUploadUtils.java @@ -0,0 +1,233 @@ +package com.ruoyi.common.utils.file; + +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.ruoyi.common.config.RuoYiConfig; +import com.ruoyi.common.constant.Constants; +import com.ruoyi.common.exception.file.FileNameLengthLimitExceededException; +import com.ruoyi.common.exception.file.FileSizeLimitExceededException; +import com.ruoyi.common.exception.file.InvalidExtensionException; +import com.ruoyi.common.utils.DateUtils; +import com.ruoyi.common.utils.StringUtils; +import com.ruoyi.common.utils.uuid.Seq; + +/** + * 文件上传工具类 + * + * @author ruoyi + */ +public class FileUploadUtils +{ + /** + * 默认大小 50M + */ + public static final long DEFAULT_MAX_SIZE = 50 * 1024 * 1024; + + /** + * 默认的文件名最大长度 100 + */ + public static final int DEFAULT_FILE_NAME_LENGTH = 100; + + /** + * 默认上传的地址 + */ + private static String defaultBaseDir = RuoYiConfig.getProfile(); + + public static void setDefaultBaseDir(String defaultBaseDir) + { + FileUploadUtils.defaultBaseDir = defaultBaseDir; + } + + public static String getDefaultBaseDir() + { + return defaultBaseDir; + } + + /** + * 以默认配置进行文件上传 + * + * @param file 上传的文件 + * @return 文件名称 + * @throws Exception + */ + public static final String upload(MultipartFile file) throws IOException + { + try + { + return upload(getDefaultBaseDir(), file, MimeTypeUtils.DEFAULT_ALLOWED_EXTENSION); + } + catch (Exception e) + { + throw new IOException(e.getMessage(), e); + } + } + + /** + * 根据文件路径上传 + * + * @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 (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(baseDir, fileName); + } + + /** + * 编码文件名 + */ + public static final String extractFilename(MultipartFile file) + { + return StringUtils.format("{}/{}_{}.{}", DateUtils.datePath(), + FilenameUtils.getBaseName(file.getOriginalFilename()), Seq.getId(Seq.uploadSeqType), getExtension(file)); + } + + public 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; + } + + public static final String getPathFileName(String uploadDir, String fileName) throws IOException + { + int dirLastIndex = RuoYiConfig.getProfile().length() + 1; + String currentDir = StringUtils.substring(uploadDir, dirLastIndex); + return Constants.RESOURCE_PREFIX + "/" + currentDir + "/" + fileName; + } + + /** + * 文件大小校验 + * + * @param file 上传的文件 + * @return + * @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 = 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 + */ + public static final boolean isAllowedExtension(String extension, String[] allowedExtension) + { + for (String str : allowedExtension) + { + if (str.equalsIgnoreCase(extension)) + { + return true; + } + } + return false; + } + + /** + * 获取文件名的后缀 + * + * @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; + } +} diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/utils/file/FileUtils.java b/ruoyi-common/src/main/java/com/ruoyi/common/utils/file/FileUtils.java new file mode 100644 index 0000000..f844270 --- /dev/null +++ b/ruoyi-common/src/main/java/com/ruoyi/common/utils/file/FileUtils.java @@ -0,0 +1,293 @@ +package com.ruoyi.common.utils.file; + +import java.io.File; +import java.io.FileInputStream; +import java.io.FileNotFoundException; +import java.io.FileOutputStream; +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.io.IOUtils; +import org.apache.commons.lang3.ArrayUtils; +import com.ruoyi.common.config.RuoYiConfig; +import com.ruoyi.common.utils.DateUtils; +import com.ruoyi.common.utils.StringUtils; +import com.ruoyi.common.utils.uuid.IdUtils; +import org.apache.commons.io.FilenameUtils; + +/** + * 文件处理工具类 + * + * @author ruoyi + */ +public class FileUtils +{ + 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 + { + IOUtils.close(os); + IOUtils.close(fis); + } + } + + /** + * 写数据到文件中 + * + * @param data 数据 + * @return 目标文件 + * @throws IOException IO异常 + */ + public static String writeImportBytes(byte[] data) throws IOException + { + return writeBytes(data, RuoYiConfig.getImportPath()); + } + + /** + * 写数据到文件中 + * + * @param data 数据 + * @param uploadDir 目标文件 + * @return 目标文件 + * @throws IOException IO异常 + */ + public static String writeBytes(byte[] data, String uploadDir) throws IOException + { + FileOutputStream fos = null; + String pathName = ""; + try + { + String extension = getFileExtendName(data); + pathName = DateUtils.datePath() + "/" + IdUtils.fastUUID() + "." + extension; + File file = FileUploadUtils.getAbsoluteFile(uploadDir, pathName); + fos = new FileOutputStream(file); + fos.write(data); + } + finally + { + IOUtils.close(fos); + } + return FileUploadUtils.getPathFileName(uploadDir, pathName); + } + + /** + * 删除文件 + * + * @param filePath 文件 + * @return + */ + public static boolean deleteFile(String filePath) + { + boolean flag = false; + File file = new File(filePath); + // 路径为文件且不为空则进行删除 + if (file.isFile() && file.exists()) + { + file.delete(); + flag = true; + } + 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; + } + + // 检查允许下载的文件规则 + if (ArrayUtils.contains(MimeTypeUtils.DEFAULT_ALLOWED_EXTENSION, FileTypeUtils.getFileType(resource))) + { + return true; + } + + // 不在允许下载的文件规则 + return false; + } + + /** + * 下载文件名重新编码 + * + * @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 response 响应对象 + * @param realFileName 真实文件名 + */ + 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.addHeader("Access-Control-Expose-Headers", "Content-Disposition,download-filename"); + 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"); + } + + /** + * 获取图像后缀 + * + * @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; + } + + /** + * 获取文件名称 /profile/upload/2022/04/16/ruoyi.png -- ruoyi.png + * + * @param fileName 路径名称 + * @return 没有文件路径的名称 + */ + public static String getName(String fileName) + { + if (fileName == null) + { + return null; + } + int lastUnixPos = fileName.lastIndexOf('/'); + int lastWindowsPos = fileName.lastIndexOf('\\'); + int index = Math.max(lastUnixPos, lastWindowsPos); + return fileName.substring(index + 1); + } + + /** + * 获取不带后缀文件名称 /profile/upload/2022/04/16/ruoyi.png -- ruoyi + * + * @param fileName 路径名称 + * @return 没有文件路径和后缀的名称 + */ + public static String getNameNotSuffix(String fileName) + { + if (fileName == null) + { + return null; + } + String baseName = FilenameUtils.getBaseName(fileName); + return baseName; + } + +} diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/utils/file/ImageUtils.java b/ruoyi-common/src/main/java/com/ruoyi/common/utils/file/ImageUtils.java new file mode 100644 index 0000000..432dfda --- /dev/null +++ b/ruoyi-common/src/main/java/com/ruoyi/common/utils/file/ImageUtils.java @@ -0,0 +1,98 @@ +package com.ruoyi.common.utils.file; + +import java.io.ByteArrayInputStream; +import java.io.FileInputStream; +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; +import com.ruoyi.common.config.RuoYiConfig; +import com.ruoyi.common.constant.Constants; +import com.ruoyi.common.utils.StringUtils; + +/** + * 图片处理工具类 + * + * @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 + { + if (url.startsWith("http")) + { + // 网络地址 + URL urlObj = new URL(url); + URLConnection urlConnection = urlObj.openConnection(); + urlConnection.setConnectTimeout(30 * 1000); + urlConnection.setReadTimeout(60 * 1000); + urlConnection.setDoInput(true); + in = urlConnection.getInputStream(); + } + else + { + // 本机地址 + String localPath = RuoYiConfig.getProfile(); + String downloadPath = localPath + StringUtils.substringAfter(url, Constants.RESOURCE_PREFIX); + in = new FileInputStream(downloadPath); + } + return IOUtils.toByteArray(in); + } + catch (Exception e) + { + log.error("获取文件路径异常 {}", e); + return null; + } + finally + { + IOUtils.closeQuietly(in); + } + } +} diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/utils/file/MimeTypeUtils.java b/ruoyi-common/src/main/java/com/ruoyi/common/utils/file/MimeTypeUtils.java new file mode 100644 index 0000000..f968f1a --- /dev/null +++ b/ruoyi-common/src/main/java/com/ruoyi/common/utils/file/MimeTypeUtils.java @@ -0,0 +1,59 @@ +package com.ruoyi.common.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/ruoyi-common/src/main/java/com/ruoyi/common/utils/html/EscapeUtil.java b/ruoyi-common/src/main/java/com/ruoyi/common/utils/html/EscapeUtil.java new file mode 100644 index 0000000..f52e83e --- /dev/null +++ b/ruoyi-common/src/main/java/com/ruoyi/common/utils/html/EscapeUtil.java @@ -0,0 +1,167 @@ +package com.ruoyi.common.utils.html; + +import com.ruoyi.common.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/ruoyi-common/src/main/java/com/ruoyi/common/utils/html/HTMLFilter.java b/ruoyi-common/src/main/java/com/ruoyi/common/utils/html/HTMLFilter.java new file mode 100644 index 0000000..db069bc --- /dev/null +++ b/ruoyi-common/src/main/java/com/ruoyi/common/utils/html/HTMLFilter.java @@ -0,0 +1,570 @@ +package com.ruoyi.common.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/ruoyi-common/src/main/java/com/ruoyi/common/utils/http/HttpHelper.java b/ruoyi-common/src/main/java/com/ruoyi/common/utils/http/HttpHelper.java new file mode 100644 index 0000000..589d123 --- /dev/null +++ b/ruoyi-common/src/main/java/com/ruoyi/common/utils/http/HttpHelper.java @@ -0,0 +1,55 @@ +package com.ruoyi.common.utils.http; + +import java.io.BufferedReader; +import java.io.IOException; +import java.io.InputStream; +import java.io.InputStreamReader; +import java.nio.charset.StandardCharsets; +import javax.servlet.ServletRequest; +import org.apache.commons.lang3.exception.ExceptionUtils; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +/** + * 通用http工具封装 + * + * @author ruoyi + */ +public class HttpHelper +{ + private static final Logger LOGGER = LoggerFactory.getLogger(HttpHelper.class); + + public static String getBodyString(ServletRequest request) + { + StringBuilder sb = new StringBuilder(); + BufferedReader reader = null; + try (InputStream inputStream = request.getInputStream()) + { + reader = new BufferedReader(new InputStreamReader(inputStream, StandardCharsets.UTF_8)); + String line = ""; + while ((line = reader.readLine()) != null) + { + sb.append(line); + } + } + catch (IOException e) + { + LOGGER.warn("getBodyString出现问题！"); + } + finally + { + if (reader != null) + { + try + { + reader.close(); + } + catch (IOException e) + { + LOGGER.error(ExceptionUtils.getMessage(e)); + } + } + } + return sb.toString(); + } +} diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/utils/http/HttpUtils.java b/ruoyi-common/src/main/java/com/ruoyi/common/utils/http/HttpUtils.java new file mode 100644 index 0000000..f85c82c --- /dev/null +++ b/ruoyi-common/src/main/java/com/ruoyi/common/utils/http/HttpUtils.java @@ -0,0 +1,274 @@ +package com.ruoyi.common.utils.http; + +import java.io.BufferedReader; +import java.io.IOException; +import java.io.InputStream; +import java.io.InputStreamReader; +import java.io.PrintWriter; +import java.net.ConnectException; +import java.net.SocketTimeoutException; +import java.net.URL; +import java.net.URLConnection; +import java.nio.charset.StandardCharsets; +import java.security.cert.X509Certificate; +import javax.net.ssl.HostnameVerifier; +import javax.net.ssl.HttpsURLConnection; +import javax.net.ssl.SSLContext; +import javax.net.ssl.SSLSession; +import javax.net.ssl.TrustManager; +import javax.net.ssl.X509TrustManager; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import com.ruoyi.common.constant.Constants; +import com.ruoyi.common.utils.StringUtils; + +/** + * 通用http发送方法 + * + * @author ruoyi + */ +public class HttpUtils +{ + private static final Logger log = LoggerFactory.getLogger(HttpUtils.class); + + /** + * 向指定 URL 发送GET方法的请求 + * + * @param url 发送请求的 URL + * @return 所代表远程资源的响应结果 + */ + public static String sendGet(String url) + { + return sendGet(url, StringUtils.EMPTY); + } + + /** + * 向指定 URL 发送GET方法的请求 + * + * @param url 发送请求的 URL + * @param param 请求参数，请求参数应该是 name1=value1&name2=value2 的形式。 + * @return 所代表远程资源的响应结果 + */ + public static String sendGet(String url, String param) + { + return sendGet(url, param, Constants.UTF8); + } + + /** + * 向指定 URL 发送GET方法的请求 + * + * @param url 发送请求的 URL + * @param param 请求参数，请求参数应该是 name1=value1&name2=value2 的形式。 + * @param contentType 编码类型 + * @return 所代表远程资源的响应结果 + */ + public static String sendGet(String url, String param, String contentType) + { + StringBuilder result = new StringBuilder(); + BufferedReader in = null; + try + { + String urlNameString = StringUtils.isNotBlank(param) ? url + "?" + param : url; + log.info("sendGet - {}", urlNameString); + URL realUrl = new URL(urlNameString); + URLConnection connection = realUrl.openConnection(); + connection.setRequestProperty("accept", "*/*"); + connection.setRequestProperty("connection", "Keep-Alive"); + connection.setRequestProperty("user-agent", "Mozilla/4.0 (compatible; MSIE 6.0; Windows NT 5.1;SV1)"); + connection.connect(); + in = new BufferedReader(new InputStreamReader(connection.getInputStream(), contentType)); + String line; + while ((line = in.readLine()) != null) + { + result.append(line); + } + log.info("recv - {}", result); + } + catch (ConnectException e) + { + log.error("调用HttpUtils.sendGet ConnectException, url=" + url + ",param=" + param, e); + } + catch (SocketTimeoutException e) + { + log.error("调用HttpUtils.sendGet SocketTimeoutException, url=" + url + ",param=" + param, e); + } + catch (IOException e) + { + log.error("调用HttpUtils.sendGet IOException, url=" + url + ",param=" + param, e); + } + catch (Exception e) + { + log.error("调用HttpsUtil.sendGet Exception, url=" + url + ",param=" + param, e); + } + finally + { + try + { + if (in != null) + { + in.close(); + } + } + catch (Exception ex) + { + log.error("调用in.close Exception, url=" + url + ",param=" + param, ex); + } + } + return result.toString(); + } + + /** + * 向指定 URL 发送POST方法的请求 + * + * @param url 发送请求的 URL + * @param param 请求参数，请求参数应该是 name1=value1&name2=value2 的形式。 + * @return 所代表远程资源的响应结果 + */ + public static String sendPost(String url, String param) + { + PrintWriter out = null; + BufferedReader in = null; + StringBuilder result = new StringBuilder(); + try + { + log.info("sendPost - {}", url); + URL realUrl = new URL(url); + URLConnection conn = realUrl.openConnection(); + conn.setRequestProperty("accept", "*/*"); + conn.setRequestProperty("connection", "Keep-Alive"); + conn.setRequestProperty("user-agent", "Mozilla/4.0 (compatible; MSIE 6.0; Windows NT 5.1;SV1)"); + conn.setRequestProperty("Accept-Charset", "utf-8"); + conn.setRequestProperty("contentType", "utf-8"); + conn.setDoOutput(true); + conn.setDoInput(true); + out = new PrintWriter(conn.getOutputStream()); + out.print(param); + out.flush(); + in = new BufferedReader(new InputStreamReader(conn.getInputStream(), StandardCharsets.UTF_8)); + String line; + while ((line = in.readLine()) != null) + { + result.append(line); + } + log.info("recv - {}", result); + } + catch (ConnectException e) + { + log.error("调用HttpUtils.sendPost ConnectException, url=" + url + ",param=" + param, e); + } + catch (SocketTimeoutException e) + { + log.error("调用HttpUtils.sendPost SocketTimeoutException, url=" + url + ",param=" + param, e); + } + catch (IOException e) + { + log.error("调用HttpUtils.sendPost IOException, url=" + url + ",param=" + param, e); + } + catch (Exception e) + { + log.error("调用HttpsUtil.sendPost Exception, url=" + url + ",param=" + param, e); + } + finally + { + try + { + if (out != null) + { + out.close(); + } + if (in != null) + { + in.close(); + } + } + catch (IOException ex) + { + log.error("调用in.close Exception, url=" + url + ",param=" + param, ex); + } + } + return result.toString(); + } + + public static String sendSSLPost(String url, String param) + { + StringBuilder result = new StringBuilder(); + String urlNameString = url + "?" + param; + try + { + log.info("sendSSLPost - {}", urlNameString); + SSLContext sc = SSLContext.getInstance("SSL"); + sc.init(null, new TrustManager[] { new TrustAnyTrustManager() }, new java.security.SecureRandom()); + URL console = new URL(urlNameString); + HttpsURLConnection conn = (HttpsURLConnection) console.openConnection(); + conn.setRequestProperty("accept", "*/*"); + conn.setRequestProperty("connection", "Keep-Alive"); + conn.setRequestProperty("user-agent", "Mozilla/4.0 (compatible; MSIE 6.0; Windows NT 5.1;SV1)"); + conn.setRequestProperty("Accept-Charset", "utf-8"); + conn.setRequestProperty("contentType", "utf-8"); + conn.setDoOutput(true); + conn.setDoInput(true); + + conn.setSSLSocketFactory(sc.getSocketFactory()); + conn.setHostnameVerifier(new TrustAnyHostnameVerifier()); + conn.connect(); + InputStream is = conn.getInputStream(); + BufferedReader br = new BufferedReader(new InputStreamReader(is)); + String ret = ""; + while ((ret = br.readLine()) != null) + { + if (ret != null && !"".equals(ret.trim())) + { + result.append(new String(ret.getBytes(StandardCharsets.ISO_8859_1), StandardCharsets.UTF_8)); + } + } + log.info("recv - {}", result); + conn.disconnect(); + br.close(); + } + catch (ConnectException e) + { + log.error("调用HttpUtils.sendSSLPost ConnectException, url=" + url + ",param=" + param, e); + } + catch (SocketTimeoutException e) + { + log.error("调用HttpUtils.sendSSLPost SocketTimeoutException, url=" + url + ",param=" + param, e); + } + catch (IOException e) + { + log.error("调用HttpUtils.sendSSLPost IOException, url=" + url + ",param=" + param, e); + } + catch (Exception e) + { + log.error("调用HttpsUtil.sendSSLPost Exception, url=" + url + ",param=" + param, e); + } + return result.toString(); + } + + private static class TrustAnyTrustManager implements X509TrustManager + { + @Override + public void checkClientTrusted(X509Certificate[] chain, String authType) + { + } + + @Override + public void checkServerTrusted(X509Certificate[] chain, String authType) + { + } + + @Override + public X509Certificate[] getAcceptedIssuers() + { + return new X509Certificate[] {}; + } + } + + private static class TrustAnyHostnameVerifier implements HostnameVerifier + { + @Override + public boolean verify(String hostname, SSLSession session) + { + return true; + } + } +} \ No newline at end of file diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/utils/ip/AddressUtils.java b/ruoyi-common/src/main/java/com/ruoyi/common/utils/ip/AddressUtils.java new file mode 100644 index 0000000..bc2f4d0 --- /dev/null +++ b/ruoyi-common/src/main/java/com/ruoyi/common/utils/ip/AddressUtils.java @@ -0,0 +1,55 @@ +package com.ruoyi.common.utils.ip; + +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import com.alibaba.fastjson.JSONObject; +import com.ruoyi.common.config.RuoYiConfig; +import com.ruoyi.common.constant.Constants; +import com.ruoyi.common.utils.StringUtils; +import com.ruoyi.common.utils.http.HttpUtils; + +/** + * 获取地址类 + * + * @author ruoyi + */ +public class AddressUtils +{ + private static final Logger log = LoggerFactory.getLogger(AddressUtils.class); + + // IP地址查询 + public static final String IP_URL = "http://whois.pconline.com.cn/ipJson.jsp"; + + // 未知地址 + public static final String UNKNOWN = "XX XX"; + + public static String getRealAddressByIP(String ip) + { + // 内网不查询 + if (IpUtils.internalIp(ip)) + { + return "内网IP"; + } + if (RuoYiConfig.isAddressEnabled()) + { + try + { + String rspStr = HttpUtils.sendGet(IP_URL, "ip=" + ip + "&json=true", Constants.GBK); + if (StringUtils.isEmpty(rspStr)) + { + log.error("获取地理位置异常 {}", ip); + return UNKNOWN; + } + JSONObject obj = JSONObject.parseObject(rspStr); + String region = obj.getString("pro"); + String city = obj.getString("city"); + return String.format("%s %s", region, city); + } + catch (Exception e) + { + log.error("获取地理位置异常 {}", ip); + } + } + return UNKNOWN; + } +} diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/utils/ip/IpUtils.java b/ruoyi-common/src/main/java/com/ruoyi/common/utils/ip/IpUtils.java new file mode 100644 index 0000000..c18c56a --- /dev/null +++ b/ruoyi-common/src/main/java/com/ruoyi/common/utils/ip/IpUtils.java @@ -0,0 +1,264 @@ +package com.ruoyi.common.utils.ip; + +import java.net.InetAddress; +import java.net.UnknownHostException; +import javax.servlet.http.HttpServletRequest; +import com.ruoyi.common.utils.StringUtils; + +/** + * 获取IP方法 + * + * @author ruoyi + */ +public class IpUtils +{ + /** + * 获取客户端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 ip; + } + + /** + * 检测给定字符串是否为未知，多用于检测HTTP请求相关 + * + * @param checkString 被检测的字符串 + * @return 是否未知 + */ + public static boolean isUnknown(String checkString) + { + return StringUtils.isBlank(checkString) || "unknown".equalsIgnoreCase(checkString); + } +} \ No newline at end of file diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/utils/poi/ExcelHandlerAdapter.java b/ruoyi-common/src/main/java/com/ruoyi/common/utils/poi/ExcelHandlerAdapter.java new file mode 100644 index 0000000..5ea74c1 --- /dev/null +++ b/ruoyi-common/src/main/java/com/ruoyi/common/utils/poi/ExcelHandlerAdapter.java @@ -0,0 +1,19 @@ +package com.ruoyi.common.utils.poi; + +/** + * Excel数据格式处理适配器 + * + * @author ruoyi + */ +public interface ExcelHandlerAdapter +{ + /** + * 格式化 + * + * @param value 单元格数据值 + * @param args excel注解args参数组 + * + * @return 处理后的值 + */ + Object format(Object value, String[] args); +} diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/utils/poi/ExcelUtil.java b/ruoyi-common/src/main/java/com/ruoyi/common/utils/poi/ExcelUtil.java new file mode 100644 index 0000000..26a33ce --- /dev/null +++ b/ruoyi-common/src/main/java/com/ruoyi/common/utils/poi/ExcelUtil.java @@ -0,0 +1,1432 @@ +package com.ruoyi.common.utils.poi; + +import java.io.File; +import java.io.FileOutputStream; +import java.io.IOException; +import java.io.InputStream; +import java.io.OutputStream; +import java.lang.reflect.Field; +import java.lang.reflect.Method; +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.Comparator; +import java.util.Date; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.Set; +import java.util.UUID; +import java.util.stream.Collectors; +import javax.servlet.http.HttpServletResponse; +import org.apache.commons.lang3.RegExUtils; +import org.apache.poi.hssf.usermodel.HSSFClientAnchor; +import org.apache.poi.hssf.usermodel.HSSFPicture; +import org.apache.poi.hssf.usermodel.HSSFPictureData; +import org.apache.poi.hssf.usermodel.HSSFShape; +import org.apache.poi.hssf.usermodel.HSSFSheet; +import org.apache.poi.hssf.usermodel.HSSFWorkbook; +import org.apache.poi.ooxml.POIXMLDocumentPart; +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.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.PictureData; +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.apache.poi.xssf.usermodel.XSSFDrawing; +import org.apache.poi.xssf.usermodel.XSSFPicture; +import org.apache.poi.xssf.usermodel.XSSFShape; +import org.apache.poi.xssf.usermodel.XSSFSheet; +import org.apache.poi.xssf.usermodel.XSSFWorkbook; +import org.openxmlformats.schemas.drawingml.x2006.spreadsheetDrawing.CTMarker; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import com.ruoyi.common.annotation.Excel; +import com.ruoyi.common.annotation.Excel.ColumnType; +import com.ruoyi.common.annotation.Excel.Type; +import com.ruoyi.common.annotation.Excels; +import com.ruoyi.common.config.RuoYiConfig; +import com.ruoyi.common.core.domain.AjaxResult; +import com.ruoyi.common.core.text.Convert; +import com.ruoyi.common.exception.UtilException; +import com.ruoyi.common.utils.DateUtils; +import com.ruoyi.common.utils.DictUtils; +import com.ruoyi.common.utils.StringUtils; +import com.ruoyi.common.utils.file.FileTypeUtils; +import com.ruoyi.common.utils.file.FileUtils; +import com.ruoyi.common.utils.file.ImageUtils; +import com.ruoyi.common.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 Map statistics = new HashMap(); + + /** + * 数字格式 + */ + private static final DecimalFormat DOUBLE_FORMAT = new DecimalFormat("######0.00"); + + /** + * 实体对象 + */ + public Class clazz; + + public ExcelUtil(Class clazz) + { + this.clazz = clazz; + } + + 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(); + } + + /** + * 创建excel第一行标题 + */ + public void createTitle() + { + if (StringUtils.isNotEmpty(title)) + { + 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(), + this.fields.size() - 1)); + } + } + + /** + * 对excel表单默认第一个索引名转换成list + * + * @param is 输入流 + * @return 转换后集合 + */ + public List importExcel(InputStream is) throws Exception + { + return importExcel(is, 0); + } + + /** + * 对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不存在"); + } + boolean isXSSFWorkbook = !(wb instanceof HSSFWorkbook); + Map pictures; + if (isXSSFWorkbook) + { + pictures = getSheetPictures07((XSSFSheet) sheet, (XSSFWorkbook) wb); + } + else + { + pictures = getSheetPictures03((HSSFSheet) sheet, (HSSFWorkbook) wb); + } + // 获取最后一个非空行的行下标，比如总行数为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(); + } + else if (StringUtils.isNotEmpty(attr.readConverterExp())) + { + val = reverseByExp(Convert.toStr(val), attr.readConverterExp(), attr.separator()); + } + else if (StringUtils.isNotEmpty(attr.dictType())) + { + val = reverseDictByExp(Convert.toStr(val), attr.dictType(), attr.separator()); + } + else if (!attr.handler().equals(ExcelHandlerAdapter.class)) + { + val = dataFormatHandlerAdapter(val, attr); + } + else if (ColumnType.IMAGE == attr.cellType() && StringUtils.isNotEmpty(pictures)) + { + PictureData image = pictures.get(row.getRowNum() + "_" + entry.getKey()); + if (image == null) + { + val = ""; + } + else + { + byte[] data = image.getData(); + val = FileUtils.writeImportBytes(data); + } + } + ReflectUtils.invokeSetter(entity, propertyName, val); + } + } + list.add(entity); + } + } + return list; + } + + /** + * 对list数据源将其里面的数据导入到excel表单 + * + * @param list 导出数据集合 + * @param sheetName 工作表的名称 + * @return 结果 + */ + public AjaxResult exportExcel(List list, String sheetName) + { + return exportExcel(list, sheetName, StringUtils.EMPTY); + } + + /** + * 对list数据源将其里面的数据导入到excel表单 + * + * @param list 导出数据集合 + * @param sheetName 工作表的名称 + * @param title 标题 + * @return 结果 + */ + public AjaxResult exportExcel(List list, String sheetName, String title) + { + this.init(list, sheetName, title, Type.EXPORT); + return exportExcel(); + } + + /** + * 对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 AjaxResult importTemplateExcel(String sheetName) + { + return importTemplateExcel(sheetName, StringUtils.EMPTY); + } + + /** + * 对list数据源将其里面的数据导入到excel表单 + * + * @param sheetName 工作表的名称 + * @param title 标题 + * @return 结果 + */ + public AjaxResult importTemplateExcel(String sheetName, String title) + { + this.init(null, sheetName, title, Type.IMPORT); + return exportExcel(); + } + + /** + * 对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); + } + } + + /** + * 对list数据源将其里面的数据导入到excel表单 + * + * @return 结果 + */ + public AjaxResult exportExcel() + { + OutputStream out = null; + try + { + writeSheet(); + String filename = encodingFilename(sheetName); + out = new FileOutputStream(getAbsoluteFile(filename)); + wb.write(out); + return AjaxResult.success(filename); + } + catch (Exception e) + { + log.error("导出Excel异常{}", e.getMessage()); + throw new UtilException("导出Excel失败，请联系网站管理员！"); + } + finally + { + IOUtils.closeQuietly(wb); + IOUtils.closeQuietly(out); + } + } + + /** + * 创建写入数据到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) + { + Excel excel = (Excel) os[1]; + this.createCell(excel, row, column++); + } + if (Type.EXPORT.equals(type)) + { + fillExcelData(index, row); + addStatisticsRow(); + } + } + } + + /** + * 填充excel数据 + * + * @param index 序号 + * @param row 单元格行 + */ + public void fillExcelData(int index, Row row) + { + int startNo = index * sheetSize; + int endNo = Math.min(startNo + sheetSize, list.size()); + for (int i = startNo; i < endNo; i++) + { + row = sheet.createRow(i + 1 + rownum - startNo); + // 得到导出对象. + T vo = (T) list.get(i); + int column = 0; + for (Object[] os : fields) + { + Field field = (Field) os[0]; + Excel excel = (Excel) os[1]; + 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); + 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.cloneStyleFrom(styles.get("data")); + style.setAlignment(HorizontalAlignment.CENTER); + style.setVerticalAlignment(VerticalAlignment.CENTER); + style.setFillForegroundColor(IndexedColors.GREY_50_PERCENT.getIndex()); + style.setFillPattern(FillPatternType.SOLID_FOREGROUND); + Font headerFont = wb.createFont(); + headerFont.setFontName("Arial"); + headerFont.setFontHeightInPoints((short) 10); + headerFont.setBold(true); + headerFont.setColor(IndexedColors.WHITE.getIndex()); + style.setFont(headerFont); + styles.put("header", 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(annotationStyles(wb)); + + return styles; + } + + /** + * 根据Excel注解创建表格样式 + * + * @param wb 工作薄对象 + * @return 自定义样式列表 + */ + private Map annotationStyles(Workbook wb) + { + Map styles = new HashMap(); + for (Object[] os : fields) + { + Excel excel = (Excel) os[1]; + String key = "data_" + excel.align() + "_" + excel.color(); + if (!styles.containsKey(key)) + { + CellStyle style = wb.createCellStyle(); + 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()); + Font dataFont = wb.createFont(); + dataFont.setFontName("Arial"); + dataFont.setFontHeightInPoints((short) 10); + dataFont.setColor(excel.color().index); + style.setFont(dataFont); + styles.put(key, style); + } + } + return styles; + } + + /** + * 创建单元格 + */ + public Cell createCell(Excel attr, Row row, int column) + { + // 创建列 + Cell cell = row.createCell(column); + // 写入列信息 + cell.setCellValue(attr.name()); + setDataValidation(attr, row, column); + cell.setCellStyle(styles.get("header")); + return cell; + } + + /** + * 设置单元格信息 + * + * @param value 单元格值 + * @param attr 注解相关 + * @param cell 单元格信息 + */ + public void setCellVo(Object value, Excel attr, Cell cell) + { + if (ColumnType.STRING == attr.cellType()) + { + String cellValue = Convert.toStr(value); + // 对于任何以表达式触发字符 =-+@开头的单元格，直接使用tab字符作为前缀，防止CSV注入。 + if (StringUtils.startsWithAny(cellValue, FORMULA_STR)) + { + cellValue = RegExUtils.replaceFirst(cellValue, FORMULA_REGEX_STR, "\t$0"); + } + 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) + { + // 提示信息或只能选择不能输入的列内容. + 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); + cell.setCellStyle(styles.get("data_" + attr.align() + "_" + attr.color())); + + // 用于读取对象中的属性 + Object value = getTargetValue(vo, field, attr); + String dateFormat = attr.dateFormat(); + String readConverterExp = attr.readConverterExp(); + String separator = attr.separator(); + String dictType = attr.dictType(); + 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 (StringUtils.isNotEmpty(dictType) && StringUtils.isNotNull(value)) + { + cell.setCellValue(convertDictByExp(Convert.toStr(value), dictType, separator)); + } + else if (value instanceof BigDecimal && -1 != attr.scale()) + { + cell.setCellValue((((BigDecimal) value).setScale(attr.scale(), attr.roundingMode())).toString()); + } + else if (!attr.handler().equals(ExcelHandlerAdapter.class)) + { + cell.setCellValue(dataFormatHandlerAdapter(value, attr)); + } + 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); + } + + /** + * 解析导出值 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(separator, propertyValue)) + { + 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(separator, propertyValue)) + { + 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 dictValue 字典值 + * @param dictType 字典类型 + * @param separator 分隔符 + * @return 字典标签 + */ + public static String convertDictByExp(String dictValue, String dictType, String separator) + { + return DictUtils.getDictLabel(dictType, dictValue, separator); + } + + /** + * 反向解析值字典值 + * + * @param dictLabel 字典标签 + * @param dictType 字典类型 + * @param separator 分隔符 + * @return 字典值 + */ + public static String reverseDictByExp(String dictLabel, String dictType, String separator) + { + return DictUtils.getDictValue(dictType, dictLabel, separator); + } + + /** + * 数据处理器 + * + * @param value 数据值 + * @param excel 数据注解 + * @return + */ + public String dataFormatHandlerAdapter(Object value, Excel excel) + { + try + { + Object instance = excel.handler().newInstance(); + Method formatMethod = excel.handler().getMethod("format", new Class[] { Object.class, String[].class }); + value = formatMethod.invoke(instance, value, excel.args()); + } + 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(); + } + } + + /** + * 编码文件名 + */ + public String encodingFilename(String filename) + { + filename = UUID.randomUUID().toString() + "_" + filename + ".xlsx"; + return filename; + } + + /** + * 获取下载路径 + * + * @param filename 文件名称 + */ + public String getAbsoluteFile(String filename) + { + String downloadPath = RuoYiConfig.getDownloadPath() + filename; + File desc = new File(downloadPath); + if (!desc.getParentFile().exists()) + { + desc.getParentFile().mkdirs(); + } + return downloadPath; + } + + /** + * 获取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 (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 (field.isAnnotationPresent(Excels.class)) + { + Excels attrs = field.getAnnotation(Excels.class); + Excel[] excels = attrs.value(); + for (Excel attr : excels) + { + if (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; + } + + /** + * 获取Excel2003图片 + * + * @param sheet 当前sheet对象 + * @param workbook 工作簿对象 + * @return Map key:图片单元格索引（1_1）String，value:图片流PictureData + */ + public static Map getSheetPictures03(HSSFSheet sheet, HSSFWorkbook workbook) + { + Map sheetIndexPicMap = new HashMap(); + List pictures = workbook.getAllPictures(); + if (!pictures.isEmpty()) + { + for (HSSFShape shape : sheet.getDrawingPatriarch().getChildren()) + { + HSSFClientAnchor anchor = (HSSFClientAnchor) shape.getAnchor(); + if (shape instanceof HSSFPicture) + { + HSSFPicture pic = (HSSFPicture) shape; + int pictureIndex = pic.getPictureIndex() - 1; + HSSFPictureData picData = pictures.get(pictureIndex); + String picIndex = String.valueOf(anchor.getRow1()) + "_" + String.valueOf(anchor.getCol1()); + sheetIndexPicMap.put(picIndex, picData); + } + } + return sheetIndexPicMap; + } + else + { + return sheetIndexPicMap; + } + } + + /** + * 获取Excel2007图片 + * + * @param sheet 当前sheet对象 + * @param workbook 工作簿对象 + * @return Map key:图片单元格索引（1_1）String，value:图片流PictureData + */ + public static Map getSheetPictures07(XSSFSheet sheet, XSSFWorkbook workbook) + { + Map sheetIndexPicMap = new HashMap(); + for (POIXMLDocumentPart dr : sheet.getRelations()) + { + if (dr instanceof XSSFDrawing) + { + XSSFDrawing drawing = (XSSFDrawing) dr; + List shapes = drawing.getShapes(); + for (XSSFShape shape : shapes) + { + if (shape instanceof XSSFPicture) + { + XSSFPicture pic = (XSSFPicture) shape; + XSSFClientAnchor anchor = pic.getPreferredSize(); + CTMarker ctMarker = anchor.getFrom(); + String picIndex = ctMarker.getRow() + "_" + ctMarker.getCol(); + sheetIndexPicMap.put(picIndex, pic.getPictureData()); + } + } + } + } + return sheetIndexPicMap; + } + + /** + * 格式化不同类型的日期对象 + * + * @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; + } +} diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/utils/reflect/ReflectUtils.java b/ruoyi-common/src/main/java/com/ruoyi/common/utils/reflect/ReflectUtils.java new file mode 100644 index 0000000..b19953e --- /dev/null +++ b/ruoyi-common/src/main/java/com/ruoyi/common/utils/reflect/ReflectUtils.java @@ -0,0 +1,410 @@ +package com.ruoyi.common.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.ruoyi.common.core.text.Convert; +import com.ruoyi.common.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/ruoyi-common/src/main/java/com/ruoyi/common/utils/sign/Base64.java b/ruoyi-common/src/main/java/com/ruoyi/common/utils/sign/Base64.java new file mode 100644 index 0000000..ca1cd92 --- /dev/null +++ b/ruoyi-common/src/main/java/com/ruoyi/common/utils/sign/Base64.java @@ -0,0 +1,291 @@ +package com.ruoyi.common.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/ruoyi-common/src/main/java/com/ruoyi/common/utils/sign/Md5Utils.java b/ruoyi-common/src/main/java/com/ruoyi/common/utils/sign/Md5Utils.java new file mode 100644 index 0000000..c1c58db --- /dev/null +++ b/ruoyi-common/src/main/java/com/ruoyi/common/utils/sign/Md5Utils.java @@ -0,0 +1,67 @@ +package com.ruoyi.common.utils.sign; + +import java.nio.charset.StandardCharsets; +import java.security.MessageDigest; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +/** + * Md5加密方法 + * + * @author ruoyi + */ +public class Md5Utils +{ + private static final Logger log = LoggerFactory.getLogger(Md5Utils.class); + + private static byte[] md5(String s) + { + MessageDigest algorithm; + try + { + algorithm = MessageDigest.getInstance("MD5"); + algorithm.reset(); + algorithm.update(s.getBytes("UTF-8")); + byte[] messageDigest = algorithm.digest(); + return messageDigest; + } + catch (Exception e) + { + log.error("MD5 Error...", e); + } + return null; + } + + private static final String toHex(byte hash[]) + { + if (hash == null) + { + return null; + } + StringBuffer buf = new StringBuffer(hash.length * 2); + int i; + + for (i = 0; i < hash.length; i++) + { + if ((hash[i] & 0xff) < 0x10) + { + buf.append("0"); + } + buf.append(Long.toString(hash[i] & 0xff, 16)); + } + return buf.toString(); + } + + public static String hash(String s) + { + try + { + return new String(toHex(md5(s)).getBytes(StandardCharsets.UTF_8), StandardCharsets.UTF_8); + } + catch (Exception e) + { + log.error("not supported charset...{}", e); + return s; + } + } +} diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/utils/sign/RsaUtils.java b/ruoyi-common/src/main/java/com/ruoyi/common/utils/sign/RsaUtils.java new file mode 100644 index 0000000..f6e3332 --- /dev/null +++ b/ruoyi-common/src/main/java/com/ruoyi/common/utils/sign/RsaUtils.java @@ -0,0 +1,163 @@ +package com.ruoyi.common.utils.sign; + +import com.alibaba.fastjson.JSON; +import org.apache.commons.codec.binary.Base64; +import javax.crypto.Cipher; +import java.security.*; +import java.security.interfaces.RSAPrivateKey; +import java.security.interfaces.RSAPublicKey; +import java.security.spec.PKCS8EncodedKeySpec; +import java.security.spec.X509EncodedKeySpec; + +/** + * RSA加密解密 + * + * @author ruoyi + **/ +public class RsaUtils +{ + // Rsa 私钥 + public static String privateKey = "MIICdQIBADANBgkqhkiG9w0BAQEFAASCAl8wgg" + + "JbAgEAAoGBAI+Y8TJB3brb1fa43o7mI70KAlR8auS72k5HrrCafeacYCrvM2tLyAJTf4" + + "VjIya1cYzbUNE7bydT7Tl5vsuh5ynGqVUXeU93EZ28Dib4XcXxcSGBgF7b4okTMwS7tRC" + + "3TbX67fyd4qiTyNj54QitMAYOhq/8y/gv7X3oQi2GY9eTAgMBAAECgYATQ5lX/K4aW1Og" + + "/bwdv5Ib0jPt0aMlfG4VAljVKGSrg18DY4OqaUgzx6/b3SjiEIVjOCjnaOnIhOHWTBbkipv" + + "QMyOPGUzeqEKqjbFa8MN7lYDVBCwH0CCsXFuiyAHA5pI8OuNH+Iy9b3VXRhlaJTQkE1c" + + "qJ4pmqOL11LCj20XRgQJBANdruVNus2YFDir48JpmiS71+W0WxfJkxm8EEohLd7T8aLAF" + + "Rc51OXm3G5bDqNIFP5ygqYKW8mVncNUP3t/FeWkCQQCqparD7QcRtZe1ily9hEWVKY32G" + + "ZVMAqNH8IsiveUrsH4Phhj/vdtL1mCTx+DyRygPvKKVj7A07fqu2CTXQQ2bAkAiMC2EaUA" + + "9g7Xg6gs9ZeKFunHwdznJI2c+vTW3vcpsxdZTgTK39nC9uWq+faTwV/blg7YDTLOBlm4" + + "Y0mD7wJppAkAu+HC7gyeZ+Ujr4EzMoXbhqtF3du1AQc2dxJkXk/tbfjYEod2Jr0GIa1" + + "aj9rV1Gp7tTffWgPl4aDTDIZ1qXm6XAkBgWBcbvTrE2bpUYsTXxtZ7eWxTCMdmJxZ3n" + + "4xs0p0RqpU6n8BNJyY3wtJEesRoKLshKFt/NDMsxqVoqICpXxXs"; + + /** + * 私钥解密 + * + * @param text 待解密的文本 + * @return 解密后的文本 + */ + public static String decryptByPrivateKey(String text) throws Exception + { + return decryptByPrivateKey(privateKey, text); + } + + /** + * 公钥解密 + * + * @param publicKeyString 公钥 + * @param text 待解密的信息 + * @return 解密后的文本 + */ + public static String decryptByPublicKey(String publicKeyString, String text) throws Exception + { + X509EncodedKeySpec x509EncodedKeySpec = new X509EncodedKeySpec(Base64.decodeBase64(publicKeyString)); + KeyFactory keyFactory = KeyFactory.getInstance("RSA"); + PublicKey publicKey = keyFactory.generatePublic(x509EncodedKeySpec); + Cipher cipher = Cipher.getInstance("RSA"); + cipher.init(Cipher.DECRYPT_MODE, publicKey); + byte[] result = cipher.doFinal(Base64.decodeBase64(text)); + return new String(result); + } + + /** + * 私钥加密 + * + * @param privateKeyString 私钥 + * @param text 待加密的信息 + * @return 加密后的文本 + */ + public static String encryptByPrivateKey(String privateKeyString, String text) throws Exception + { + PKCS8EncodedKeySpec pkcs8EncodedKeySpec = new PKCS8EncodedKeySpec(Base64.decodeBase64(privateKeyString)); + KeyFactory keyFactory = KeyFactory.getInstance("RSA"); + PrivateKey privateKey = keyFactory.generatePrivate(pkcs8EncodedKeySpec); + Cipher cipher = Cipher.getInstance("RSA"); + cipher.init(Cipher.ENCRYPT_MODE, privateKey); + byte[] result = cipher.doFinal(text.getBytes()); + return Base64.encodeBase64String(result); + } + + /** + * 私钥解密 + * + * @param privateKeyString 私钥 + * @param text 待解密的文本 + * @return 解密后的文本 + */ + public static String decryptByPrivateKey(String privateKeyString, String text) throws Exception + { + PKCS8EncodedKeySpec pkcs8EncodedKeySpec5 = new PKCS8EncodedKeySpec(Base64.decodeBase64(privateKeyString)); + KeyFactory keyFactory = KeyFactory.getInstance("RSA"); + PrivateKey privateKey = keyFactory.generatePrivate(pkcs8EncodedKeySpec5); + Cipher cipher = Cipher.getInstance("RSA"); + cipher.init(Cipher.DECRYPT_MODE, privateKey); + byte[] result = cipher.doFinal(Base64.decodeBase64(text)); + return new String(result); + } + + /** + * 公钥加密 + * + * @param publicKeyString 公钥 + * @param text 待加密的文本 + * @return 加密后的文本 + */ + public static String encryptByPublicKey(String publicKeyString, String text) throws Exception + { + X509EncodedKeySpec x509EncodedKeySpec2 = new X509EncodedKeySpec(Base64.decodeBase64(publicKeyString)); + KeyFactory keyFactory = KeyFactory.getInstance("RSA"); + PublicKey publicKey = keyFactory.generatePublic(x509EncodedKeySpec2); + Cipher cipher = Cipher.getInstance("RSA"); + cipher.init(Cipher.ENCRYPT_MODE, publicKey); + byte[] result = cipher.doFinal(text.getBytes()); + return Base64.encodeBase64String(result); + } + + /** + * 构建RSA密钥对 + * + * @return 生成后的公私钥信息 + */ + public static RsaKeyPair generateKeyPair() throws NoSuchAlgorithmException + { + KeyPairGenerator keyPairGenerator = KeyPairGenerator.getInstance("RSA"); + keyPairGenerator.initialize(1024); + KeyPair keyPair = keyPairGenerator.generateKeyPair(); + RSAPublicKey rsaPublicKey = (RSAPublicKey) keyPair.getPublic(); + RSAPrivateKey rsaPrivateKey = (RSAPrivateKey) keyPair.getPrivate(); + String publicKeyString = Base64.encodeBase64String(rsaPublicKey.getEncoded()); + String privateKeyString = Base64.encodeBase64String(rsaPrivateKey.getEncoded()); + return new RsaKeyPair(publicKeyString, privateKeyString); + } + + public static void main(String[] args) throws NoSuchAlgorithmException { + System.out.println(JSON.toJSONString(generateKeyPair())); + } + + + /** + * RSA密钥对对象 + */ + public static class RsaKeyPair + { + private final String publicKey; + private final String privateKey; + + public RsaKeyPair(String publicKey, String privateKey) + { + this.publicKey = publicKey; + this.privateKey = privateKey; + } + + public String getPublicKey() + { + return publicKey; + } + + public String getPrivateKey() + { + return privateKey; + } + } +} diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/utils/sm3/SM3.java b/ruoyi-common/src/main/java/com/ruoyi/common/utils/sm3/SM3.java new file mode 100644 index 0000000..23f9dcf --- /dev/null +++ b/ruoyi-common/src/main/java/com/ruoyi/common/utils/sm3/SM3.java @@ -0,0 +1,359 @@ +package com.ruoyi.common.utils.sm3; + + +public class SM3 +{ + /*public static final byte[] iv = { 0x2C, (byte) 0x91, (byte) 0xB4, 0x01, + (byte) 0xFC, 0x64, (byte) 0xB2, (byte) 0xCE, 0x7C, 0x4E, + (byte) 0xAE, (byte) 0xFB, (byte) 0xB1, 0x3B, (byte) 0xB6, + (byte) 0xD3, 0x17, 0x60, (byte) 0xB6, 0x35, (byte) 0xF3, 0x6F, + 0x13, (byte) 0xEB, (byte) 0xC8, 0x77, (byte) 0xE9, (byte) 0xA0, + (byte) 0xC2, 0x76, (byte) 0xA8, 0x17 };*/ + + public static final byte[] iv = { 0x73, (byte) 0x80, 0x16, 0x6f, 0x49, + 0x14, (byte) 0xb2, (byte) 0xb9, 0x17, 0x24, 0x42, (byte) 0xd7, + (byte) 0xda, (byte) 0x8a, 0x06, 0x00, (byte) 0xa9, 0x6f, 0x30, + (byte) 0xbc, (byte) 0x16, 0x31, 0x38, (byte) 0xaa, (byte) 0xe3, + (byte) 0x8d, (byte) 0xee, 0x4d, (byte) 0xb0, (byte) 0xfb, 0x0e, + 0x4e }; + + public static int[] Tj = new int[64]; + + static + { + for (int i = 0; i < 16; i++) + { + Tj[i] = 0x79cc4519; + } + + for (int i = 16; i < 64; i++) + { + Tj[i] = 0x7a879d8a; + } + } + + public static byte[] CF(byte[] V, byte[] B) + { + int[] v, b; + v = convert(V); + b = convert(B); + return convert(CF(v, b)); + } + + private static int[] convert(byte[] arr) + { + int[] out = new int[arr.length / 4]; + byte[] tmp = new byte[4]; + for (int i = 0; i < arr.length; i += 4) + { + System.arraycopy(arr, i, tmp, 0, 4); + out[i / 4] = bigEndianByteToInt(tmp); + } + return out; + } + + private static byte[] convert(int[] arr) + { + byte[] out = new byte[arr.length * 4]; + byte[] tmp = null; + for (int i = 0; i < arr.length; i++) + { + tmp = bigEndianIntToByte(arr[i]); + System.arraycopy(tmp, 0, out, i * 4, 4); + } + return out; + } + + public static int[] CF(int[] V, int[] B) + { + int a, b, c, d, e, f, g, h; + int ss1, ss2, tt1, tt2; + a = V[0]; + b = V[1]; + c = V[2]; + d = V[3]; + e = V[4]; + f = V[5]; + g = V[6]; + h = V[7]; + + /*System.out.println("IV: "); + System.out.print(Integer.toHexString(a)+" "); + System.out.print(Integer.toHexString(b)+" "); + System.out.print(Integer.toHexString(c)+" "); + System.out.print(Integer.toHexString(d)+" "); + System.out.print(Integer.toHexString(e)+" "); + System.out.print(Integer.toHexString(f)+" "); + System.out.print(Integer.toHexString(g)+" "); + System.out.print(Integer.toHexString(h)+" "); + System.out.println(""); + System.out.println(""); + + System.out.println("填充后的消息: "); + for(int i=0; i= 0 && j <= 15) + { + return FF1j(X, Y, Z); + } + else + { + return FF2j(X, Y, Z); + } + } + + private static int GGj(int X, int Y, int Z, int j) + { + if (j >= 0 && j <= 15) + { + return GG1j(X, Y, Z); + } + else + { + return GG2j(X, Y, Z); + } + } + + // 逻辑位运算函数 + private static int FF1j(int X, int Y, int Z) + { + int tmp = X ^ Y ^ Z; + return tmp; + } + + private static int FF2j(int X, int Y, int Z) + { + int tmp = ((X & Y) | (X & Z) | (Y & Z)); + return tmp; + } + + private static int GG1j(int X, int Y, int Z) + { + int tmp = X ^ Y ^ Z; + return tmp; + } + + private static int GG2j(int X, int Y, int Z) + { + int tmp = (X & Y) | (~X & Z); + return tmp; + } + + private static int P0(int X) + { + int y = rotateLeft(X, 9); + y = bitCycleLeft(X, 9); + int z = rotateLeft(X, 17); + z = bitCycleLeft(X, 17); + int t = X ^ y ^ z; + return t; + } + + private static int P1(int X) + { + int t = X ^ bitCycleLeft(X, 15) ^ bitCycleLeft(X, 23); + return t; + } + + /** + * 对最后一个分组字节数据padding + * + * @param in + * @param bLen + * 分组个数 + * @return + */ + public static byte[] padding(byte[] in, int bLen) + { + int k = 448 - (8 * in.length + 1) % 512; + if (k < 0) + { + k = 960 - (8 * in.length + 1) % 512; + } + k += 1; + byte[] padd = new byte[k / 8]; + padd[0] = (byte) 0x80; + long n = in.length * 8 + bLen * 512; + byte[] out = new byte[in.length + k / 8 + 64 / 8]; + int pos = 0; + System.arraycopy(in, 0, out, 0, in.length); + pos += in.length; + System.arraycopy(padd, 0, out, pos, padd.length); + pos += padd.length; + byte[] tmp = back(Util.longToBytes(n)); + System.arraycopy(tmp, 0, out, pos, tmp.length); + return out; + } + + /** + * 字节数组逆序 + * + * @param in + * @return + */ + private static byte[] back(byte[] in) + { + byte[] out = new byte[in.length]; + for (int i = 0; i < out.length; i++) + { + out[i] = in[out.length - i - 1]; + } + + return out; + } + + public static int rotateLeft(int x, int n) + { + return (x << n) | (x >> (32 - n)); + } + + private static int bitCycleLeft(int n, int bitLen) + { + bitLen %= 32; + byte[] tmp = bigEndianIntToByte(n); + int byteLen = bitLen / 8; + int len = bitLen % 8; + if (byteLen > 0) + { + tmp = byteCycleLeft(tmp, byteLen); + } + + if (len > 0) + { + tmp = bitSmall8CycleLeft(tmp, len); + } + + return bigEndianByteToInt(tmp); + } + + private static byte[] bitSmall8CycleLeft(byte[] in, int len) + { + byte[] tmp = new byte[in.length]; + int t1, t2, t3; + for (int i = 0; i < tmp.length; i++) + { + t1 = (byte) ((in[i] & 0x000000ff) << len); + t2 = (byte) ((in[(i + 1) % tmp.length] & 0x000000ff) >> (8 - len)); + t3 = (byte) (t1 | t2); + tmp[i] = (byte) t3; + } + + return tmp; + } + + private static byte[] byteCycleLeft(byte[] in, int byteLen) + { + byte[] tmp = new byte[in.length]; + System.arraycopy(in, byteLen, tmp, 0, in.length - byteLen); + System.arraycopy(in, 0, tmp, in.length - byteLen, byteLen); + return tmp; + } + + /*private static void print(int[] arr) + { + for (int i = 0; i < arr.length; i++) + { + System.out.print(Integer.toHexString(arr[i]) + " "); + if ((i + 1) % 16 == 0) + { + System.out.println(); + } + } + System.out.println(); + }*/ +} diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/utils/sm3/SM3Digest.java b/ruoyi-common/src/main/java/com/ruoyi/common/utils/sm3/SM3Digest.java new file mode 100644 index 0000000..85453d2 --- /dev/null +++ b/ruoyi-common/src/main/java/com/ruoyi/common/utils/sm3/SM3Digest.java @@ -0,0 +1,134 @@ +package com.ruoyi.common.utils.sm3; + +public class SM3Digest +{ + /** SM3值的长度 */ + private static final int BYTE_LENGTH = 32; + + /** SM3分组长度 */ + private static final int BLOCK_LENGTH = 64; + + /** 缓冲区长度 */ + private static final int BUFFER_LENGTH = BLOCK_LENGTH * 1; + + /** 缓冲区 */ + private byte[] xBuf = new byte[BUFFER_LENGTH]; + + /** 缓冲区偏移量 */ + private int xBufOff; + + /** 初始向量 */ + private byte[] V = SM3.iv.clone(); + + private int cntBlock = 0; + + public SM3Digest() { + } + + public SM3Digest(SM3Digest t) + { + System.arraycopy(t.xBuf, 0, this.xBuf, 0, t.xBuf.length); + this.xBufOff = t.xBufOff; + System.arraycopy(t.V, 0, this.V, 0, t.V.length); + } + + /** + * SM3结果输出 + * + * @param out 保存SM3结构的缓冲区 + * @param outOff 缓冲区偏移量 + * @return + */ + public int doFinal(byte[] out, int outOff) + { + byte[] tmp = doFinal(); + System.arraycopy(tmp, 0, out, 0, tmp.length); + return BYTE_LENGTH; + } + + public void reset() + { + xBufOff = 0; + cntBlock = 0; + V = SM3.iv.clone(); + } + + /** + * 明文输入 + * + * @param in + * 明文输入缓冲区 + * @param inOff + * 缓冲区偏移量 + * @param len + * 明文长度 + */ + public void update(byte[] in, int inOff, int len) + { + int partLen = BUFFER_LENGTH - xBufOff; + int inputLen = len; + int dPos = inOff; + if (partLen < inputLen) + { + System.arraycopy(in, dPos, xBuf, xBufOff, partLen); + inputLen -= partLen; + dPos += partLen; + doUpdate(); + while (inputLen > BUFFER_LENGTH) + { + System.arraycopy(in, dPos, xBuf, 0, BUFFER_LENGTH); + inputLen -= BUFFER_LENGTH; + dPos += BUFFER_LENGTH; + doUpdate(); + } + } + + System.arraycopy(in, dPos, xBuf, xBufOff, inputLen); + xBufOff += inputLen; + } + + private void doUpdate() + { + byte[] B = new byte[BLOCK_LENGTH]; + for (int i = 0; i < BUFFER_LENGTH; i += BLOCK_LENGTH) + { + System.arraycopy(xBuf, i, B, 0, B.length); + doHash(B); + } + xBufOff = 0; + } + + private void doHash(byte[] B) + { + byte[] tmp = SM3.CF(V, B); + System.arraycopy(tmp, 0, V, 0, V.length); + cntBlock++; + } + + private byte[] doFinal() + { + byte[] B = new byte[BLOCK_LENGTH]; + byte[] buffer = new byte[xBufOff]; + System.arraycopy(xBuf, 0, buffer, 0, buffer.length); + byte[] tmp = SM3.padding(buffer, cntBlock); + for (int i = 0; i < tmp.length; i += BLOCK_LENGTH) + { + System.arraycopy(tmp, i, B, 0, B.length); + doHash(B); + } + return V; + } + + public void update(byte in) + { + byte[] buffer = new byte[] { in }; + update(buffer, 0, 1); + } + + public int getDigestSize() + { + return BYTE_LENGTH; + } + + +} diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/utils/sm3/SM3Utils.java b/ruoyi-common/src/main/java/com/ruoyi/common/utils/sm3/SM3Utils.java new file mode 100644 index 0000000..76a3c3c --- /dev/null +++ b/ruoyi-common/src/main/java/com/ruoyi/common/utils/sm3/SM3Utils.java @@ -0,0 +1,23 @@ +package com.ruoyi.common.utils.sm3; + +import org.bouncycastle.util.encoders.Hex; + +import java.io.IOException; + +public class SM3Utils { + + public static void main(String[] args) throws IOException { + String plainText = "test" + "qawsedrftg" + "1656492199425"; + System.out.println(encode(plainText)); + } + + public static String encode(String plainText) { + byte[] md = new byte[32]; + byte[] msg1 = plainText.getBytes(); + SM3Digest sm3 = new SM3Digest(); + sm3.update(msg1, 0, msg1.length); + sm3.doFinal(md, 0); + String s = new String(Hex.encode(md)); + return s; + } +} diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/utils/sm3/SM4.java b/ruoyi-common/src/main/java/com/ruoyi/common/utils/sm3/SM4.java new file mode 100644 index 0000000..b54efba --- /dev/null +++ b/ruoyi-common/src/main/java/com/ruoyi/common/utils/sm3/SM4.java @@ -0,0 +1,344 @@ +package com.ruoyi.common.utils.sm3; + +import java.io.ByteArrayInputStream; +import java.io.ByteArrayOutputStream; + +public class SM4 +{ + public static final int SM4_ENCRYPT = 1; + + public static final int SM4_DECRYPT = 0; + + private long GET_ULONG_BE(byte[] b, int i) + { + long n = (long)(b[i] & 0xff) << 24 | (long)((b[i + 1] & 0xff) << 16) | (long)((b[i + 2] & 0xff) << 8) | (long)(b[i + 3] & 0xff) & 0xffffffffL; + return n; + } + + private void PUT_ULONG_BE(long n, byte[] b, int i) + { + b[i] = (byte)(int)(0xFF & n >> 24); + b[i + 1] = (byte)(int)(0xFF & n >> 16); + b[i + 2] = (byte)(int)(0xFF & n >> 8); + b[i + 3] = (byte)(int)(0xFF & n); + } + + private long SHL(long x, int n) + { + return (x & 0xFFFFFFFF) << n; + } + + private long ROTL(long x, int n) + { + return SHL(x, n) | x >> (32 - n); + } + + private void SWAP(long[] sk, int i) + { + long t = sk[i]; + sk[i] = sk[(31 - i)]; + sk[(31 - i)] = t; + } + + public static final byte[] SboxTable = { (byte) 0xd6, (byte) 0x90, (byte) 0xe9, (byte) 0xfe, + (byte) 0xcc, (byte) 0xe1, 0x3d, (byte) 0xb7, 0x16, (byte) 0xb6, + 0x14, (byte) 0xc2, 0x28, (byte) 0xfb, 0x2c, 0x05, 0x2b, 0x67, + (byte) 0x9a, 0x76, 0x2a, (byte) 0xbe, 0x04, (byte) 0xc3, + (byte) 0xaa, 0x44, 0x13, 0x26, 0x49, (byte) 0x86, 0x06, + (byte) 0x99, (byte) 0x9c, 0x42, 0x50, (byte) 0xf4, (byte) 0x91, + (byte) 0xef, (byte) 0x98, 0x7a, 0x33, 0x54, 0x0b, 0x43, + (byte) 0xed, (byte) 0xcf, (byte) 0xac, 0x62, (byte) 0xe4, + (byte) 0xb3, 0x1c, (byte) 0xa9, (byte) 0xc9, 0x08, (byte) 0xe8, + (byte) 0x95, (byte) 0x80, (byte) 0xdf, (byte) 0x94, (byte) 0xfa, + 0x75, (byte) 0x8f, 0x3f, (byte) 0xa6, 0x47, 0x07, (byte) 0xa7, + (byte) 0xfc, (byte) 0xf3, 0x73, 0x17, (byte) 0xba, (byte) 0x83, + 0x59, 0x3c, 0x19, (byte) 0xe6, (byte) 0x85, 0x4f, (byte) 0xa8, + 0x68, 0x6b, (byte) 0x81, (byte) 0xb2, 0x71, 0x64, (byte) 0xda, + (byte) 0x8b, (byte) 0xf8, (byte) 0xeb, 0x0f, 0x4b, 0x70, 0x56, + (byte) 0x9d, 0x35, 0x1e, 0x24, 0x0e, 0x5e, 0x63, 0x58, (byte) 0xd1, + (byte) 0xa2, 0x25, 0x22, 0x7c, 0x3b, 0x01, 0x21, 0x78, (byte) 0x87, + (byte) 0xd4, 0x00, 0x46, 0x57, (byte) 0x9f, (byte) 0xd3, 0x27, + 0x52, 0x4c, 0x36, 0x02, (byte) 0xe7, (byte) 0xa0, (byte) 0xc4, + (byte) 0xc8, (byte) 0x9e, (byte) 0xea, (byte) 0xbf, (byte) 0x8a, + (byte) 0xd2, 0x40, (byte) 0xc7, 0x38, (byte) 0xb5, (byte) 0xa3, + (byte) 0xf7, (byte) 0xf2, (byte) 0xce, (byte) 0xf9, 0x61, 0x15, + (byte) 0xa1, (byte) 0xe0, (byte) 0xae, 0x5d, (byte) 0xa4, + (byte) 0x9b, 0x34, 0x1a, 0x55, (byte) 0xad, (byte) 0x93, 0x32, + 0x30, (byte) 0xf5, (byte) 0x8c, (byte) 0xb1, (byte) 0xe3, 0x1d, + (byte) 0xf6, (byte) 0xe2, 0x2e, (byte) 0x82, 0x66, (byte) 0xca, + 0x60, (byte) 0xc0, 0x29, 0x23, (byte) 0xab, 0x0d, 0x53, 0x4e, 0x6f, + (byte) 0xd5, (byte) 0xdb, 0x37, 0x45, (byte) 0xde, (byte) 0xfd, + (byte) 0x8e, 0x2f, 0x03, (byte) 0xff, 0x6a, 0x72, 0x6d, 0x6c, 0x5b, + 0x51, (byte) 0x8d, 0x1b, (byte) 0xaf, (byte) 0x92, (byte) 0xbb, + (byte) 0xdd, (byte) 0xbc, 0x7f, 0x11, (byte) 0xd9, 0x5c, 0x41, + 0x1f, 0x10, 0x5a, (byte) 0xd8, 0x0a, (byte) 0xc1, 0x31, + (byte) 0x88, (byte) 0xa5, (byte) 0xcd, 0x7b, (byte) 0xbd, 0x2d, + 0x74, (byte) 0xd0, 0x12, (byte) 0xb8, (byte) 0xe5, (byte) 0xb4, + (byte) 0xb0, (byte) 0x89, 0x69, (byte) 0x97, 0x4a, 0x0c, + (byte) 0x96, 0x77, 0x7e, 0x65, (byte) 0xb9, (byte) 0xf1, 0x09, + (byte) 0xc5, 0x6e, (byte) 0xc6, (byte) 0x84, 0x18, (byte) 0xf0, + 0x7d, (byte) 0xec, 0x3a, (byte) 0xdc, 0x4d, 0x20, 0x79, + (byte) 0xee, 0x5f, 0x3e, (byte) 0xd7, (byte) 0xcb, 0x39, 0x48 }; + + public static final int[] FK = { 0xa3b1bac6, 0x56aa3350, 0x677d9197, 0xb27022dc }; + + public static final int[] CK = { 0x00070e15,0x1c232a31,0x383f464d,0x545b6269, + 0x70777e85,0x8c939aa1,0xa8afb6bd,0xc4cbd2d9, + 0xe0e7eef5,0xfc030a11,0x181f262d,0x343b4249, + 0x50575e65,0x6c737a81,0x888f969d,0xa4abb2b9, + 0xc0c7ced5,0xdce3eaf1,0xf8ff060d,0x141b2229, + 0x30373e45,0x4c535a61,0x686f767d,0x848b9299, + 0xa0a7aeb5,0xbcc3cad1,0xd8dfe6ed,0xf4fb0209, + 0x10171e25,0x2c333a41,0x484f565d,0x646b7279 }; + + private byte sm4Sbox(byte inch) + { + int i = inch & 0xFF; + byte retVal = SboxTable[i]; + return retVal; + } + + private long sm4Lt(long ka) + { + long bb = 0L; + long c = 0L; + byte[] a = new byte[4]; + byte[] b = new byte[4]; + PUT_ULONG_BE(ka, a, 0); + b[0] = sm4Sbox(a[0]); + b[1] = sm4Sbox(a[1]); + b[2] = sm4Sbox(a[2]); + b[3] = sm4Sbox(a[3]); + bb = GET_ULONG_BE(b, 0); + c = bb ^ ROTL(bb, 2) ^ ROTL(bb, 10) ^ ROTL(bb, 18) ^ ROTL(bb, 24); + return c; + } + + private long sm4F(long x0, long x1, long x2, long x3, long rk) + { + return x0 ^ sm4Lt(x1 ^ x2 ^ x3 ^ rk); + } + + private long sm4CalciRK(long ka) + { + long bb = 0L; + long rk = 0L; + byte[] a = new byte[4]; + byte[] b = new byte[4]; + PUT_ULONG_BE(ka, a, 0); + b[0] = sm4Sbox(a[0]); + b[1] = sm4Sbox(a[1]); + b[2] = sm4Sbox(a[2]); + b[3] = sm4Sbox(a[3]); + bb = GET_ULONG_BE(b, 0); + rk = bb ^ ROTL(bb, 13) ^ ROTL(bb, 23); + return rk; + } + + private void sm4_setkey(long[] SK, byte[] key) + { + long[] MK = new long[4]; + long[] k = new long[36]; + int i = 0; + MK[0] = GET_ULONG_BE(key, 0); + MK[1] = GET_ULONG_BE(key, 4); + MK[2] = GET_ULONG_BE(key, 8); + MK[3] = GET_ULONG_BE(key, 12); + k[0] = MK[0] ^ (long) FK[0]; + k[1] = MK[1] ^ (long) FK[1]; + k[2] = MK[2] ^ (long) FK[2]; + k[3] = MK[3] ^ (long) FK[3]; + for (; i < 32; i++) + { + k[(i + 4)] = (k[i] ^ sm4CalciRK(k[(i + 1)] ^ k[(i + 2)] ^ k[(i + 3)] ^ (long) CK[i])); + SK[i] = k[(i + 4)]; + } + } + + private void sm4_one_round(long[] sk, byte[] input, byte[] output) + { + int i = 0; + long[] ulbuf = new long[36]; + ulbuf[0] = GET_ULONG_BE(input, 0); + ulbuf[1] = GET_ULONG_BE(input, 4); + ulbuf[2] = GET_ULONG_BE(input, 8); + ulbuf[3] = GET_ULONG_BE(input, 12); + while (i < 32) + { + ulbuf[(i + 4)] = sm4F(ulbuf[i], ulbuf[(i + 1)], ulbuf[(i + 2)], ulbuf[(i + 3)], sk[i]); + i++; + } + PUT_ULONG_BE(ulbuf[35], output, 0); + PUT_ULONG_BE(ulbuf[34], output, 4); + PUT_ULONG_BE(ulbuf[33], output, 8); + PUT_ULONG_BE(ulbuf[32], output, 12); + } + + private byte[] padding(byte[] input, int mode) + { + if (input == null) + { + return null; + } + + byte[] ret = (byte[]) null; + if (mode == SM4_ENCRYPT) + { + int p = 16 - input.length % 16; + ret = new byte[input.length + p]; + System.arraycopy(input, 0, ret, 0, input.length); + for (int i = 0; i < p; i++) + { + ret[input.length + i] = (byte) p; + } + } + else + { + int p = input[input.length - 1]; + ret = new byte[input.length - p]; + System.arraycopy(input, 0, ret, 0, input.length - p); + } + return ret; + } + + public void sm4_setkey_enc(SM4_Context ctx, byte[] key) throws Exception + { + if (ctx == null) + { + throw new Exception("ctx is null!"); + } + + if (key == null || key.length != 16) + { + throw new Exception("key error!"); + } + + ctx.mode = SM4_ENCRYPT; + sm4_setkey(ctx.sk, key); + } + + public void sm4_setkey_dec(SM4_Context ctx, byte[] key) throws Exception + { + if (ctx == null) + { + throw new Exception("ctx is null!"); + } + + if (key == null || key.length != 16) + { + throw new Exception("key error!"); + } + + int i = 0; + ctx.mode = SM4_DECRYPT; + sm4_setkey(ctx.sk, key); + for (i = 0; i < 16; i++) + { + SWAP(ctx.sk, i); + } + } + + public byte[] sm4_crypt_ecb(SM4_Context ctx, byte[] input) throws Exception + { + if (input == null) + { + throw new Exception("input is null!"); + } + + if ((ctx.isPadding) && (ctx.mode == SM4_ENCRYPT)) + { + input = padding(input, SM4_ENCRYPT); + } + + int length = input.length; + ByteArrayInputStream bins = new ByteArrayInputStream(input); + ByteArrayOutputStream bous = new ByteArrayOutputStream(); + for(; length > 0; length -= 16) + { + byte[] in = new byte[16]; + byte[] out = new byte[16]; + bins.read(in); + sm4_one_round(ctx.sk, in, out); + bous.write(out); + } + + byte[] output = bous.toByteArray(); + if (ctx.isPadding && ctx.mode == SM4_DECRYPT) + { + output = padding(output, SM4_DECRYPT); + } + bins.close(); + bous.close(); + return output; + } + + public byte[] sm4_crypt_cbc(SM4_Context ctx, byte[] iv, byte[] input) throws Exception + { + if (iv == null || iv.length != 16) + { + throw new Exception("iv error!"); + } + + if (input == null) + { + throw new Exception("input is null!"); + } + + if (ctx.isPadding && ctx.mode == SM4_ENCRYPT) + { + input = padding(input, SM4_ENCRYPT); + } + + int i = 0; + int length = input.length; + ByteArrayInputStream bins = new ByteArrayInputStream(input); + ByteArrayOutputStream bous = new ByteArrayOutputStream(); + if (ctx.mode == SM4_ENCRYPT) + { + for(; length > 0; length -= 16) + { + byte[] in = new byte[16]; + byte[] out = new byte[16]; + byte[] out1 = new byte[16]; + + bins.read(in); + for (i = 0; i < 16; i++) + { + out[i] = ((byte) (in[i] ^ iv[i])); + } + sm4_one_round(ctx.sk, out, out1); + System.arraycopy(out1, 0, iv, 0, 16); + bous.write(out1); + } + } + else + { + byte[] temp = new byte[16]; + for(; length > 0; length -= 16) + { + byte[] in = new byte[16]; + byte[] out = new byte[16]; + byte[] out1 = new byte[16]; + + bins.read(in); + System.arraycopy(in, 0, temp, 0, 16); + sm4_one_round(ctx.sk, in, out); + for (i = 0; i < 16; i++) + { + out1[i] = ((byte) (out[i] ^ iv[i])); + } + System.arraycopy(temp, 0, iv, 0, 16); + bous.write(out1); + } + } + + byte[] output = bous.toByteArray(); + if (ctx.isPadding && ctx.mode == SM4_DECRYPT) + { + output = padding(output, SM4_DECRYPT); + } + bins.close(); + bous.close(); + return output; + } +} diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/utils/sm3/SM4Utils.java b/ruoyi-common/src/main/java/com/ruoyi/common/utils/sm3/SM4Utils.java new file mode 100644 index 0000000..3c78ae0 --- /dev/null +++ b/ruoyi-common/src/main/java/com/ruoyi/common/utils/sm3/SM4Utils.java @@ -0,0 +1,186 @@ +//package com.ruoyi.common.utils.sm3; +// +//import sun.misc.*; +// +//import java.util.regex.Matcher; +//import java.util.regex.Pattern; +// +//public class SM4Utils +//{ +// public String getSecretKey() { +// return secretKey; +// } +// +// public void setSecretKey(String secretKey) { +// this.secretKey = secretKey; +// } +// +// public boolean isHexString() { +// return hexString; +// } +// +// public void setHexString(boolean hexString) { +// this.hexString = hexString; +// } +// +// private String secretKey = ""; +// +// public String getIv() { +// return iv; +// } +// +// public void setIv(String iv) { +// this.iv = iv; +// } +// +// private String iv = ""; +// +// private boolean hexString = false; +// +// public SM4Utils() +// { +// } +// +// public String encryptData_ECB(String plainText) +// { +// try +// { +// SM4_Context ctx = new SM4_Context(); +// ctx.isPadding = true; +// ctx.mode = SM4.SM4_ENCRYPT; +// +// byte[] keyBytes; +// if (hexString) +// { +// keyBytes = Util.hexStringToBytes(secretKey); +// } +// else +// { +// keyBytes = secretKey.getBytes(); +// } +// +// SM4 sm4 = new SM4(); +// sm4.sm4_setkey_enc(ctx, keyBytes); +// byte[] encrypted = sm4.sm4_crypt_ecb(ctx, plainText.getBytes("GBK")); +// String cipherText = new BASE64Encoder().encode(encrypted); +// if (cipherText != null && cipherText.trim().length() > 0) +// { +// Pattern p = Pattern.compile("\\s*|\t|\r|\n"); +// Matcher m = p.matcher(cipherText); +// cipherText = m.replaceAll(""); +// } +// return cipherText; +// } +// catch (Exception e) +// { +// e.printStackTrace(); +// return null; +// } +// } +// +// public String decryptData_ECB(String cipherText) +// { +// try +// { +// SM4_Context ctx = new SM4_Context(); +// ctx.isPadding = true; +// ctx.mode = SM4.SM4_DECRYPT; +// +// byte[] keyBytes; +// if (hexString) +// { +// keyBytes = Util.hexStringToBytes(secretKey); +// } +// else +// { +// keyBytes = secretKey.getBytes(); +// } +// +// SM4 sm4 = new SM4(); +// sm4.sm4_setkey_dec(ctx, keyBytes); +// byte[] decrypted = sm4.sm4_crypt_ecb(ctx, new BASE64Decoder().decodeBuffer(cipherText)); +// return new String(decrypted, "GBK"); +// } +// catch (Exception e) +// { +// e.printStackTrace(); +// return null; +// } +// } +// +// public String encryptData_CBC(String plainText) +// { +// try +// { +// SM4_Context ctx = new SM4_Context(); +// ctx.isPadding = true; +// ctx.mode = SM4.SM4_ENCRYPT; +// +// byte[] keyBytes; +// byte[] ivBytes; +// if (hexString) +// { +// keyBytes = Util.hexStringToBytes(secretKey); +// ivBytes = Util.hexStringToBytes(iv); +// } +// else +// { +// keyBytes = secretKey.getBytes(); +// ivBytes = iv.getBytes(); +// } +// +// SM4 sm4 = new SM4(); +// sm4.sm4_setkey_enc(ctx, keyBytes); +// byte[] encrypted = sm4.sm4_crypt_cbc(ctx, ivBytes, plainText.getBytes("GBK")); +// String cipherText = new BASE64Encoder().encode(encrypted); +// if (cipherText != null && cipherText.trim().length() > 0) +// { +// Pattern p = Pattern.compile("\\s*|\t|\r|\n"); +// Matcher m = p.matcher(cipherText); +// cipherText = m.replaceAll(""); +// } +// return cipherText; +// } +// catch (Exception e) +// { +// e.printStackTrace(); +// return null; +// } +// } +// +// public String decryptData_CBC(String cipherText) +// { +// try +// { +// SM4_Context ctx = new SM4_Context(); +// ctx.isPadding = true; +// ctx.mode = SM4.SM4_DECRYPT; +// +// byte[] keyBytes; +// byte[] ivBytes; +// if (hexString) +// { +// keyBytes = Util.hexStringToBytes(secretKey); +// ivBytes = Util.hexStringToBytes(iv); +// } +// else +// { +// keyBytes = secretKey.getBytes(); +// ivBytes = iv.getBytes(); +// } +// +// SM4 sm4 = new SM4(); +// sm4.sm4_setkey_dec(ctx, keyBytes); +// byte[] decrypted = sm4.sm4_crypt_cbc(ctx, ivBytes, new BASE64Decoder().decodeBuffer(cipherText)); +// return new String(decrypted, "GBK"); +// } +// catch (Exception e) +// { +// e.printStackTrace(); +// return null; +// } +// } +// +// +// +//} diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/utils/sm3/SM4_Context.java b/ruoyi-common/src/main/java/com/ruoyi/common/utils/sm3/SM4_Context.java new file mode 100644 index 0000000..95cb87e --- /dev/null +++ b/ruoyi-common/src/main/java/com/ruoyi/common/utils/sm3/SM4_Context.java @@ -0,0 +1,17 @@ +package com.ruoyi.common.utils.sm3; + +public class SM4_Context +{ + public int mode; + + public long[] sk; + + public boolean isPadding; + + public SM4_Context() + { + this.mode = 1; + this.isPadding = true; + this.sk = new long[32]; + } +} diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/utils/sm3/Util.java b/ruoyi-common/src/main/java/com/ruoyi/common/utils/sm3/Util.java new file mode 100644 index 0000000..bd20f8c --- /dev/null +++ b/ruoyi-common/src/main/java/com/ruoyi/common/utils/sm3/Util.java @@ -0,0 +1,662 @@ +package com.ruoyi.common.utils.sm3; + +import java.math.BigInteger; + +public class Util +{ + /** + * 整形转换成网络传输的字节流（字节数组）型数据 + * + * @param num 一个整型数据 + * @return 4个字节的自己数组 + */ + public static byte[] intToBytes(int num) + { + byte[] bytes = new byte[4]; + bytes[0] = (byte) (0xff & (num >> 0)); + bytes[1] = (byte) (0xff & (num >> 8)); + bytes[2] = (byte) (0xff & (num >> 16)); + bytes[3] = (byte) (0xff & (num >> 24)); + return bytes; + } + + /** + * 四个字节的字节数据转换成一个整形数据 + * + * @param bytes 4个字节的字节数组 + * @return 一个整型数据 + */ + public static int byteToInt(byte[] bytes) + { + int num = 0; + int temp; + temp = (0x000000ff & (bytes[0])) << 0; + num = num | temp; + temp = (0x000000ff & (bytes[1])) << 8; + num = num | temp; + temp = (0x000000ff & (bytes[2])) << 16; + num = num | temp; + temp = (0x000000ff & (bytes[3])) << 24; + num = num | temp; + return num; + } + + /** + * 长整形转换成网络传输的字节流（字节数组）型数据 + * + * @param num 一个长整型数据 + * @return 4个字节的自己数组 + */ + public static byte[] longToBytes(long num) + { + byte[] bytes = new byte[8]; + for (int i = 0; i < 8; i++) + { + bytes[i] = (byte) (0xff & (num >> (i * 8))); + } + + return bytes; + } + + /** + * 大数字转换字节流（字节数组）型数据 + * + * @param n + * @return + */ + public static byte[] byteConvert32Bytes(BigInteger n) + { + byte tmpd[] = (byte[])null; + if(n == null) + { + return null; + } + + if(n.toByteArray().length == 33) + { + tmpd = new byte[32]; + System.arraycopy(n.toByteArray(), 1, tmpd, 0, 32); + } + else if(n.toByteArray().length == 32) + { + tmpd = n.toByteArray(); + } + else + { + tmpd = new byte[32]; + for(int i = 0; i < 32 - n.toByteArray().length; i++) + { + tmpd[i] = 0; + } + System.arraycopy(n.toByteArray(), 0, tmpd, 32 - n.toByteArray().length, n.toByteArray().length); + } + return tmpd; + } + + /** + * 换字节流（字节数组）型数据转大数字 + * + * @param b + * @return + */ + public static BigInteger byteConvertInteger(byte[] b) + { + if (b[0] < 0) + { + byte[] temp = new byte[b.length + 1]; + temp[0] = 0; + System.arraycopy(b, 0, temp, 1, b.length); + return new BigInteger(temp); + } + return new BigInteger(b); + } + + /** + * 根据字节数组获得值(十六进制数字) + * + * @param bytes + * @return + */ + public static String getHexString(byte[] bytes) + { + return getHexString(bytes, true); + } + + /** + * 根据字节数组获得值(十六进制数字) + * + * @param bytes + * @param upperCase + * @return + */ + public static String getHexString(byte[] bytes, boolean upperCase) + { + String ret = ""; + for (int i = 0; i < bytes.length; i++) + { + ret += Integer.toString((bytes[i] & 0xff) + 0x100, 16).substring(1); + } + return upperCase ? ret.toUpperCase() : ret; + } + + /** + * 打印十六进制字符串 + * + * @param bytes + */ + public static void printHexString(byte[] bytes) + { + for (int i = 0; i < bytes.length; i++) + { + String hex = Integer.toHexString(bytes[i] & 0xFF); + if (hex.length() == 1) + { + hex = '0' + hex; + } + System.out.print("0x" + hex.toUpperCase() + ","); + } + System.out.println(""); + } + + /** + * Convert hex string to byte[] + * + * @param hexString + * the hex string + * @return byte[] + */ + public static byte[] hexStringToBytes(String hexString) + { + if (hexString == null || hexString.equals("")) + { + return null; + } + + hexString = hexString.toUpperCase(); + int length = hexString.length() / 2; + char[] hexChars = hexString.toCharArray(); + byte[] d = new byte[length]; + for (int i = 0; i < length; i++) + { + int pos = i * 2; + d[i] = (byte) (charToByte(hexChars[pos]) << 4 | charToByte(hexChars[pos + 1])); + } + return d; + } + + /** + * Convert char to byte + * + * @param c + * char + * @return byte + */ + public static byte charToByte(char c) + { + return (byte) "0123456789ABCDEF".indexOf(c); + } + + /** + * 用于建立十六进制字符的输出的小写字符数组 + */ + private static final char[] DIGITS_LOWER = {'0', '1', '2', '3', '4', '5', + '6', '7', '8', '9', 'a', 'b', 'c', 'd', 'e', 'f'}; + + /** + * 用于建立十六进制字符的输出的大写字符数组 + */ + private static final char[] DIGITS_UPPER = {'0', '1', '2', '3', '4', '5', + '6', '7', '8', '9', 'A', 'B', 'C', 'D', 'E', 'F'}; + + /** + * 将字节数组转换为十六进制字符数组 + * + * @param data byte[] + * @return 十六进制char[] + */ + public static char[] encodeHex(byte[] data) { + return encodeHex(data, true); + } + + /** + * 将字节数组转换为十六进制字符数组 + * + * @param data byte[] + * @param toLowerCase true 传换成小写格式 ， false 传换成大写格式 + * @return 十六进制char[] + */ + public static char[] encodeHex(byte[] data, boolean toLowerCase) { + return encodeHex(data, toLowerCase ? DIGITS_LOWER : DIGITS_UPPER); + } + + /** + * 将字节数组转换为十六进制字符数组 + * + * @param data byte[] + * @param toDigits 用于控制输出的char[] + * @return 十六进制char[] + */ + protected static char[] encodeHex(byte[] data, char[] toDigits) { + int l = data.length; + char[] out = new char[l << 1]; + // two characters form the hex value. + for (int i = 0, j = 0; i < l; i++) { + out[j++] = toDigits[(0xF0 & data[i]) >>> 4]; + out[j++] = toDigits[0x0F & data[i]]; + } + return out; + } + + /** + * 将字节数组转换为十六进制字符串 + * + * @param data byte[] + * @return 十六进制String + */ + public static String encodeHexString(byte[] data) { + return encodeHexString(data, true); + } + + /** + * 将字节数组转换为十六进制字符串 + * + * @param data byte[] + * @param toLowerCase true 传换成小写格式 ， false 传换成大写格式 + * @return 十六进制String + */ + public static String encodeHexString(byte[] data, boolean toLowerCase) { + return encodeHexString(data, toLowerCase ? DIGITS_LOWER : DIGITS_UPPER); + } + + /** + * 将字节数组转换为十六进制字符串 + * + * @param data byte[] + * @param toDigits 用于控制输出的char[] + * @return 十六进制String + */ + protected static String encodeHexString(byte[] data, char[] toDigits) { + return new String(encodeHex(data, toDigits)); + } + + /** + * 将十六进制字符数组转换为字节数组 + * + * @param data 十六进制char[] + * @return byte[] + * @throws RuntimeException 如果源十六进制字符数组是一个奇怪的长度，将抛出运行时异常 + */ + public static byte[] decodeHex(char[] data) { + int len = data.length; + + if ((len & 0x01) != 0) { + throw new RuntimeException("Odd number of characters."); + } + + byte[] out = new byte[len >> 1]; + + // two characters form the hex value. + for (int i = 0, j = 0; j < len; i++) { + int f = toDigit(data[j], j) << 4; + j++; + f = f | toDigit(data[j], j); + j++; + out[i] = (byte) (f & 0xFF); + } + + return out; + } + + /** + * 将十六进制字符转换成一个整数 + * + * @param ch 十六进制char + * @param index 十六进制字符在字符数组中的位置 + * @return 一个整数 + * @throws RuntimeException 当ch不是一个合法的十六进制字符时，抛出运行时异常 + */ + protected static int toDigit(char ch, int index) { + int digit = Character.digit(ch, 16); + if (digit == -1) { + throw new RuntimeException("Illegal hexadecimal character " + ch + + " at index " + index); + } + return digit; + } + + /** + * 数字字符串转ASCII码字符串 + * + * @param String + * 字符串 + * @return ASCII字符串 + */ + public static String StringToAsciiString(String content) { + String result = ""; + int max = content.length(); + for (int i = 0; i < max; i++) { + char c = content.charAt(i); + String b = Integer.toHexString(c); + result = result + b; + } + return result; + } + + /** + * 十六进制转字符串 + * + * @param hexString + * 十六进制字符串 + * @param encodeType + * 编码类型4：Unicode，2：普通编码 + * @return 字符串 + */ + public static String hexStringToString(String hexString, int encodeType) { + String result = ""; + int max = hexString.length() / encodeType; + for (int i = 0; i < max; i++) { + char c = (char) hexStringToAlgorism(hexString + .substring(i * encodeType, (i + 1) * encodeType)); + result += c; + } + return result; + } + + /** + * 十六进制字符串装十进制 + * + * @param hex + * 十六进制字符串 + * @return 十进制数值 + */ + public static int hexStringToAlgorism(String hex) { + hex = hex.toUpperCase(); + int max = hex.length(); + int result = 0; + for (int i = max; i > 0; i--) { + char c = hex.charAt(i - 1); + int algorism = 0; + if (c >= '0' && c <= '9') { + algorism = c - '0'; + } else { + algorism = c - 55; + } + result += Math.pow(16, max - i) * algorism; + } + return result; + } + + /** + * 十六转二进制 + * + * @param hex + * 十六进制字符串 + * @return 二进制字符串 + */ + public static String hexStringToBinary(String hex) { + hex = hex.toUpperCase(); + String result = ""; + int max = hex.length(); + for (int i = 0; i < max; i++) { + char c = hex.charAt(i); + switch (c) { + case '0': + result += "0000"; + break; + case '1': + result += "0001"; + break; + case '2': + result += "0010"; + break; + case '3': + result += "0011"; + break; + case '4': + result += "0100"; + break; + case '5': + result += "0101"; + break; + case '6': + result += "0110"; + break; + case '7': + result += "0111"; + break; + case '8': + result += "1000"; + break; + case '9': + result += "1001"; + break; + case 'A': + result += "1010"; + break; + case 'B': + result += "1011"; + break; + case 'C': + result += "1100"; + break; + case 'D': + result += "1101"; + break; + case 'E': + result += "1110"; + break; + case 'F': + result += "1111"; + break; + } + } + return result; + } + + /** + * ASCII码字符串转数字字符串 + * + * @param String + * ASCII字符串 + * @return 字符串 + */ + public static String AsciiStringToString(String content) { + String result = ""; + int length = content.length() / 2; + for (int i = 0; i < length; i++) { + String c = content.substring(i * 2, i * 2 + 2); + int a = hexStringToAlgorism(c); + char b = (char) a; + String d = String.valueOf(b); + result += d; + } + return result; + } + + /** + * 将十进制转换为指定长度的十六进制字符串 + * + * @param algorism + * int 十进制数字 + * @param maxLength + * int 转换后的十六进制字符串长度 + * @return String 转换后的十六进制字符串 + */ + public static String algorismToHexString(int algorism, int maxLength) { + String result = ""; + result = Integer.toHexString(algorism); + + if (result.length() % 2 == 1) { + result = "0" + result; + } + return patchHexString(result.toUpperCase(), maxLength); + } + + /** + * 字节数组转为普通字符串（ASCII对应的字符） + * + * @param bytearray + * byte[] + * @return String + */ + public static String byteToString(byte[] bytearray) { + String result = ""; + char temp; + + int length = bytearray.length; + for (int i = 0; i < length; i++) { + temp = (char) bytearray[i]; + result += temp; + } + return result; + } + + /** + * 二进制字符串转十进制 + * + * @param binary + * 二进制字符串 + * @return 十进制数值 + */ + public static int binaryToAlgorism(String binary) { + int max = binary.length(); + int result = 0; + for (int i = max; i > 0; i--) { + char c = binary.charAt(i - 1); + int algorism = c - '0'; + result += Math.pow(2, max - i) * algorism; + } + return result; + } + + /** + * 十进制转换为十六进制字符串 + * + * @param algorism + * int 十进制的数字 + * @return String 对应的十六进制字符串 + */ + public static String algorismToHEXString(int algorism) { + String result = ""; + result = Integer.toHexString(algorism); + + if (result.length() % 2 == 1) { + result = "0" + result; + + } + result = result.toUpperCase(); + + return result; + } + + /** + * HEX字符串前补0，主要用于长度位数不足。 + * + * @param str + * String 需要补充长度的十六进制字符串 + * @param maxLength + * int 补充后十六进制字符串的长度 + * @return 补充结果 + */ + static public String patchHexString(String str, int maxLength) { + String temp = ""; + for (int i = 0; i < maxLength - str.length(); i++) { + temp = "0" + temp; + } + str = (temp + str).substring(0, maxLength); + return str; + } + + /** + * 将一个字符串转换为int + * + * @param s + * String 要转换的字符串 + * @param defaultInt + * int 如果出现异常,默认返回的数字 + * @param radix + * int 要转换的字符串是什么进制的,如16 8 10. + * @return int 转换后的数字 + */ + public static int parseToInt(String s, int defaultInt, int radix) { + int i = 0; + try { + i = Integer.parseInt(s, radix); + } catch (NumberFormatException ex) { + i = defaultInt; + } + return i; + } + + /** + * 将一个十进制形式的数字字符串转换为int + * + * @param s + * String 要转换的字符串 + * @param defaultInt + * int 如果出现异常,默认返回的数字 + * @return int 转换后的数字 + */ + public static int parseToInt(String s, int defaultInt) { + int i = 0; + try { + i = Integer.parseInt(s); + } catch (NumberFormatException ex) { + i = defaultInt; + } + return i; + } + + /** + * 十六进制串转化为byte数组 + * + * @return the array of byte + */ + public static byte[] hexToByte(String hex) + throws IllegalArgumentException { + if (hex.length() % 2 != 0) { + throw new IllegalArgumentException(); + } + char[] arr = hex.toCharArray(); + byte[] b = new byte[hex.length() / 2]; + for (int i = 0, j = 0, l = hex.length(); i < l; i++, j++) { + String swap = "" + arr[i++] + arr[i]; + int byteint = Integer.parseInt(swap, 16) & 0xFF; + b[j] = new Integer(byteint).byteValue(); + } + return b; + } + + /** + * 字节数组转换为十六进制字符串 + * + * @param b + * byte[] 需要转换的字节数组 + * @return String 十六进制字符串 + */ + public static String byteToHex(byte b[]) { + if (b == null) { + throw new IllegalArgumentException( + "Argument b ( byte array ) is null! "); + } + String hs = ""; + String stmp = ""; + for (int n = 0; n < b.length; n++) { + stmp = Integer.toHexString(b[n] & 0xff); + if (stmp.length() == 1) { + hs = hs + "0" + stmp; + } else { + hs = hs + stmp; + } + } + return hs.toUpperCase(); + } + + public static byte[] subByte(byte[] input, int startIndex, int length) { + byte[] bt = new byte[length]; + for (int i = 0; i < length; i++) { + bt[i] = input[i + startIndex]; + } + return bt; + } +} diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/utils/spring/SpringUtils.java b/ruoyi-common/src/main/java/com/ruoyi/common/utils/spring/SpringUtils.java new file mode 100644 index 0000000..9993b98 --- /dev/null +++ b/ruoyi-common/src/main/java/com/ruoyi/common/utils/spring/SpringUtils.java @@ -0,0 +1,146 @@ +package com.ruoyi.common.utils.spring; + +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.context.ApplicationContext; +import org.springframework.context.ApplicationContextAware; +import org.springframework.stereotype.Component; +import com.ruoyi.common.utils.StringUtils; + +/** + * spring工具类 方便在非spring管理环境中获取bean + * + * @author ruoyi + */ +@Component +public final class SpringUtils implements BeanFactoryPostProcessor, ApplicationContextAware +{ + /** Spring应用上下文环境 */ + private static ConfigurableListableBeanFactory beanFactory; + + private static ApplicationContext applicationContext; + + @Override + public void postProcessBeanFactory(ConfigurableListableBeanFactory beanFactory) throws BeansException + { + SpringUtils.beanFactory = beanFactory; + } + + @Override + public void setApplicationContext(ApplicationContext applicationContext) throws BeansException + { + SpringUtils.applicationContext = applicationContext; + } + + /** + * 获取对象 + * + * @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(); + } + + /** + * 获取当前的环境配置，无配置返回null + * + * @return 当前的环境配置 + */ + public static String[] getActiveProfiles() + { + return applicationContext.getEnvironment().getActiveProfiles(); + } + + /** + * 获取当前的环境配置，当有多个环境配置时，只获取第一个 + * + * @return 当前的环境配置 + */ + public static String getActiveProfile() + { + final String[] activeProfiles = getActiveProfiles(); + return StringUtils.isNotEmpty(activeProfiles) ? activeProfiles[0] : null; + } +} diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/utils/sql/SqlUtil.java b/ruoyi-common/src/main/java/com/ruoyi/common/utils/sql/SqlUtil.java new file mode 100644 index 0000000..246a9cf --- /dev/null +++ b/ruoyi-common/src/main/java/com/ruoyi/common/utils/sql/SqlUtil.java @@ -0,0 +1,61 @@ +package com.ruoyi.common.utils.sql; + +import com.ruoyi.common.exception.UtilException; +import com.ruoyi.common.utils.StringUtils; + +/** + * sql操作工具类 + * + * @author ruoyi + */ +public class SqlUtil +{ + /** + * 定义常用的 sql关键字 + */ + public static String SQL_REGEX = "select |insert |delete |update |drop |count |exec |chr |mid |master |truncate |char |and |declare "; + + /** + * 仅支持字母、数字、下划线、空格、逗号、小数点（支持多个字段排序） + */ + public static String SQL_PATTERN = "[a-zA-Z0-9_\\ \\,\\.]+"; + + /** + * 检查字符，防止注入绕过 + */ + public static String escapeOrderBySql(String value) + { + if (StringUtils.isNotEmpty(value) && !isValidOrderBySql(value)) + { + 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/ruoyi-common/src/main/java/com/ruoyi/common/utils/uuid/IdUtils.java b/ruoyi-common/src/main/java/com/ruoyi/common/utils/uuid/IdUtils.java new file mode 100644 index 0000000..2c84427 --- /dev/null +++ b/ruoyi-common/src/main/java/com/ruoyi/common/utils/uuid/IdUtils.java @@ -0,0 +1,49 @@ +package com.ruoyi.common.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/ruoyi-common/src/main/java/com/ruoyi/common/utils/uuid/Seq.java b/ruoyi-common/src/main/java/com/ruoyi/common/utils/uuid/Seq.java new file mode 100644 index 0000000..528f3c1 --- /dev/null +++ b/ruoyi-common/src/main/java/com/ruoyi/common/utils/uuid/Seq.java @@ -0,0 +1,86 @@ +package com.ruoyi.common.utils.uuid; + +import java.util.concurrent.atomic.AtomicInteger; +import com.ruoyi.common.utils.DateUtils; +import com.ruoyi.common.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 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/ruoyi-common/src/main/java/com/ruoyi/common/utils/uuid/UUID.java b/ruoyi-common/src/main/java/com/ruoyi/common/utils/uuid/UUID.java new file mode 100644 index 0000000..dfda46c --- /dev/null +++ b/ruoyi-common/src/main/java/com/ruoyi/common/utils/uuid/UUID.java @@ -0,0 +1,484 @@ +package com.ruoyi.common.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.ruoyi.common.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 的静态工厂。 使用加密的本地线程伪随机数生成器生成该 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 (!isSimple) + { + builder.append('-'); + } + // time_mid + builder.append(digits(mostSigBits >> 16, 4)); + if (!isSimple) + { + builder.append('-'); + } + // time_high_and_version + builder.append(digits(mostSigBits, 4)); + if (!isSimple) + { + builder.append('-'); + } + // variant_and_sequence + builder.append(digits(leastSigBits >> 48, 4)); + if (!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/ruoyi-common/src/main/java/com/ruoyi/common/validator/ValidatorUtils.java b/ruoyi-common/src/main/java/com/ruoyi/common/validator/ValidatorUtils.java new file mode 100644 index 0000000..648a8d6 --- /dev/null +++ b/ruoyi-common/src/main/java/com/ruoyi/common/validator/ValidatorUtils.java @@ -0,0 +1,84 @@ +/** + * Copyright (c) 2016-2019 人人开源 All rights reserved. + *

+ * https://www.renren.io + *

+ * 版权所有，侵权必究！ + */ + +package com.ruoyi.common.validator; + + +import com.ruoyi.common.exception.RYException; + +import javax.validation.ConstraintViolation; +import javax.validation.Validation; +import javax.validation.Validator; +import java.util.Set; + +/** + * hibernate-validator校验工具类 + *

+ * 参考文档：http://docs.jboss.org/hibernate/validator/5.4/reference/en-US/html_single/ + * + * @author Mark sunlightcs@gmail.com + */ +public class ValidatorUtils { + private static Validator validator; + + static { + validator = Validation.buildDefaultValidatorFactory().getValidator(); + } + + /** + * 校验对象 + * + * @param object 待校验对象 + * @param groups 待校验的组 + * @throws RYException 校验不通过，则报RYException异常 + */ + public static void validateEntity(Object object, Class... groups) + throws RYException { + Set> constraintViolations = validator.validate(object, groups); + if (!constraintViolations.isEmpty()) { + ConstraintViolation constraint = (ConstraintViolation) constraintViolations.iterator().next(); + throw new RYException(constraint.getMessage()); + } + } + + /** + * 校验对象，版本2 + * + * @param object 待校验对象 + * @param groups 待校验的组 + * @throws RYException 校验不通过，则报RYException异常 + */ + public static void validateV2(Object object, Class... groups) + throws RYException { + validateV2(0, object, groups); + } + + /** + * 校验对象，版本2 + * + * @param i 第几条校验 + * @param object 待校验对象 + * @param groups 待校验的组 + * @throws RYException 校验不通过，则报RYException异常 + */ + public static void validateV2(int i, Object object, Class... groups) + throws RYException { + Set> validateSet = validator.validate(object, groups); + if (!validateSet.isEmpty()) { + String messages = validateSet.stream() + .map(ConstraintViolation::getMessage) + .reduce((m1, m2) -> m1 + "；" + m2) + .orElse("参数输入有误！"); + + if (i > 0) { + messages = "第" + i + "条数据：" + messages; + } + throw new RYException(messages, 11); + } + } +} diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/xss/SQLFilter.java b/ruoyi-common/src/main/java/com/ruoyi/common/xss/SQLFilter.java new file mode 100644 index 0000000..ea386db --- /dev/null +++ b/ruoyi-common/src/main/java/com/ruoyi/common/xss/SQLFilter.java @@ -0,0 +1,51 @@ +/** + * Copyright (c) 2016-2019 人人开源 All rights reserved. + * + * https://www.renren.io + * + * 版权所有，侵权必究！ + */ + +package com.ruoyi.common.xss; + + +import com.ruoyi.common.exception.RYException; +import org.apache.commons.lang3.StringUtils; + +/** + * SQL过滤 + * + * @author Mark sunlightcs@gmail.com + */ +public class SQLFilter { + + /** + * SQL注入过滤 + * @param str 待验证的字符串 + */ + public static String sqlInject(String str){ + if(StringUtils.isBlank(str)){ + return null; + } + //去掉'|"|;|\字符 + str = StringUtils.replace(str, "'", ""); + str = StringUtils.replace(str, "\"", ""); + str = StringUtils.replace(str, ";", ""); + str = StringUtils.replace(str, "\\", ""); + + //转换成小写 + str = str.toLowerCase(); + + //非法字符 + String[] keywords = {"master", "truncate", "insert", "select", "delete", "update", "declare", "alter", "drop"}; + + //判断是否包含非法字符 + for(String keyword : keywords){ + if(str.indexOf(keyword) != -1){ + throw new RYException("包含非法字符"); + } + } + + return str; + } +} diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/xss/Xss.java b/ruoyi-common/src/main/java/com/ruoyi/common/xss/Xss.java new file mode 100644 index 0000000..7bfdf04 --- /dev/null +++ b/ruoyi-common/src/main/java/com/ruoyi/common/xss/Xss.java @@ -0,0 +1,27 @@ +package com.ruoyi.common.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/ruoyi-common/src/main/java/com/ruoyi/common/xss/XssValidator.java b/ruoyi-common/src/main/java/com/ruoyi/common/xss/XssValidator.java new file mode 100644 index 0000000..ed9ec1f --- /dev/null +++ b/ruoyi-common/src/main/java/com/ruoyi/common/xss/XssValidator.java @@ -0,0 +1,34 @@ +package com.ruoyi.common.xss; + +import com.ruoyi.common.utils.StringUtils; +import javax.validation.ConstraintValidator; +import javax.validation.ConstraintValidatorContext; +import java.util.regex.Matcher; +import java.util.regex.Pattern; + +/** + * 自定义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) + { + Pattern pattern = Pattern.compile(HTML_PATTERN); + Matcher matcher = pattern.matcher(value); + return matcher.matches(); + } +} \ No newline at end of file diff --git a/ruoyi-framework/pom.xml b/ruoyi-framework/pom.xml new file mode 100644 index 0000000..9339f11 --- /dev/null +++ b/ruoyi-framework/pom.xml @@ -0,0 +1,69 @@ + + + + ruoyi + com.ruoyi + 3.8.1 + + 4.0.0 + + ruoyi-framework + + + framework框架核心 + + + + + + + org.springframework.boot + spring-boot-starter-web + + + + + org.springframework.boot + spring-boot-starter-aop + + + + + com.alibaba + druid-spring-boot-starter + + + + + com.github.penggle + kaptcha + + + javax.servlet-api + javax.servlet + + + + + + + com.github.oshi + oshi-core + + + + + com.ruoyi + ruoyi-system + + + org.jodd + jodd-http + 6.2.1 + + + + + diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/aspectj/DataScopeAspect.java b/ruoyi-framework/src/main/java/com/ruoyi/framework/aspectj/DataScopeAspect.java new file mode 100644 index 0000000..48f8d72 --- /dev/null +++ b/ruoyi-framework/src/main/java/com/ruoyi/framework/aspectj/DataScopeAspect.java @@ -0,0 +1,149 @@ +package com.ruoyi.framework.aspectj; + +import org.aspectj.lang.JoinPoint; +import org.aspectj.lang.annotation.Aspect; +import org.aspectj.lang.annotation.Before; +import org.springframework.stereotype.Component; +import com.ruoyi.common.annotation.DataScope; +import com.ruoyi.common.core.domain.BaseEntity; +import com.ruoyi.common.core.domain.entity.SysRole; +import com.ruoyi.common.core.domain.entity.SysUser; +import com.ruoyi.common.core.domain.model.LoginUser; +import com.ruoyi.common.utils.StringUtils; +import com.ruoyi.common.utils.SecurityUtils; + +/** + * 数据过滤处理 + * + * @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.getUser(); + // 如果是超级管理员，则不过滤数据 + if (StringUtils.isNotNull(currentUser) && !currentUser.isAdmin()) + { + dataScopeFilter(joinPoint, currentUser, controllerDataScope.deptAlias(), + controllerDataScope.userAlias()); + } + } + } + + /** + * 数据范围过滤 + * + * @param joinPoint 切点 + * @param user 用户 + * @param userAlias 别名 + */ + public static void dataScopeFilter(JoinPoint joinPoint, SysUser user, String deptAlias, String userAlias) + { + StringBuilder sqlString = new StringBuilder(); + + for (SysRole role : user.getRoles()) + { + String dataScope = role.getDataScope(); + if (DATA_SCOPE_ALL.equals(dataScope)) + { + sqlString = new StringBuilder(); + break; + } + else if (DATA_SCOPE_CUSTOM.equals(dataScope)) + { + 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(" OR 1=0 "); + } + } + } + + 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/ruoyi-framework/src/main/java/com/ruoyi/framework/aspectj/DataSourceAspect.java b/ruoyi-framework/src/main/java/com/ruoyi/framework/aspectj/DataSourceAspect.java new file mode 100644 index 0000000..8c2c9f4 --- /dev/null +++ b/ruoyi-framework/src/main/java/com/ruoyi/framework/aspectj/DataSourceAspect.java @@ -0,0 +1,72 @@ +package com.ruoyi.framework.aspectj; + +import java.util.Objects; +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.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.core.annotation.AnnotationUtils; +import org.springframework.core.annotation.Order; +import org.springframework.stereotype.Component; +import com.ruoyi.common.annotation.DataSource; +import com.ruoyi.common.utils.StringUtils; +import com.ruoyi.framework.datasource.DynamicDataSourceContextHolder; + +/** + * 多数据源处理 + * + * @author ruoyi + */ +@Aspect +@Order(1) +@Component +public class DataSourceAspect +{ + protected Logger logger = LoggerFactory.getLogger(getClass()); + + @Pointcut("@annotation(com.ruoyi.common.annotation.DataSource)" + + "|| @within(com.ruoyi.common.annotation.DataSource)") + public void dsPointCut() + { + + } + + @Around("dsPointCut()") + public Object around(ProceedingJoinPoint point) throws Throwable + { + DataSource dataSource = getDataSource(point); + + if (StringUtils.isNotNull(dataSource)) + { + DynamicDataSourceContextHolder.setDataSourceType(dataSource.value().name()); + } + + try + { + return point.proceed(); + } + finally + { + // 销毁数据源 在执行方法之后 + DynamicDataSourceContextHolder.clearDataSourceType(); + } + } + + /** + * 获取需要切换的数据源 + */ + public DataSource getDataSource(ProceedingJoinPoint point) + { + MethodSignature signature = (MethodSignature) point.getSignature(); + DataSource dataSource = AnnotationUtils.findAnnotation(signature.getMethod(), DataSource.class); + if (Objects.nonNull(dataSource)) + { + return dataSource; + } + + return AnnotationUtils.findAnnotation(signature.getDeclaringType(), DataSource.class); + } +} diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/aspectj/LogAspect.java b/ruoyi-framework/src/main/java/com/ruoyi/framework/aspectj/LogAspect.java new file mode 100644 index 0000000..7f5a257 --- /dev/null +++ b/ruoyi-framework/src/main/java/com/ruoyi/framework/aspectj/LogAspect.java @@ -0,0 +1,217 @@ +package com.ruoyi.framework.aspectj; + +import java.util.Collection; +import java.util.Map; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; +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.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.stereotype.Component; +import org.springframework.validation.BindingResult; +import org.springframework.web.multipart.MultipartFile; +import org.springframework.web.servlet.HandlerMapping; +import com.alibaba.fastjson.JSON; +import com.ruoyi.common.annotation.Log; +import com.ruoyi.common.core.domain.model.LoginUser; +import com.ruoyi.common.enums.BusinessStatus; +import com.ruoyi.common.enums.HttpMethod; +import com.ruoyi.common.utils.ServletUtils; +import com.ruoyi.common.utils.StringUtils; +import com.ruoyi.common.utils.ip.IpUtils; +import com.ruoyi.common.utils.SecurityUtils; +import com.ruoyi.framework.manager.AsyncManager; +import com.ruoyi.framework.manager.factory.AsyncFactory; +import com.ruoyi.system.domain.SysOperLog; + +/** + * 操作日志记录处理 + * + * @author ruoyi + */ +@Aspect +@Component +public class LogAspect +{ + private static final Logger log = LoggerFactory.getLogger(LogAspect.class); + + /** + * 处理完请求后执行 + * + * @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 + { + // 获取当前的用户 + LoginUser loginUser = SecurityUtils.getLoginUser(); + + // *========数据库日志=========*// + SysOperLog operLog = new SysOperLog(); + operLog.setStatus(BusinessStatus.SUCCESS.ordinal()); + // 请求的地址 + String ip = IpUtils.getIpAddr(ServletUtils.getRequest()); + operLog.setOperIp(ip); + operLog.setOperUrl(ServletUtils.getRequest().getRequestURI()); + if (loginUser != null) + { + operLog.setOperName(loginUser.getUsername()); + } + + 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); + // 保存数据库 + AsyncManager.me().execute(AsyncFactory.recordOper(operLog)); + } + catch (Exception exp) + { + // 记录本地异常日志 + log.error("==前置通知异常=="); + log.error("异常信息:{}", exp.getMessage()); + exp.printStackTrace(); + } + } + + /** + * 获取注解中对方法的描述信息 用于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); + } + // 是否需要保存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) throws Exception + { + String requestMethod = operLog.getRequestMethod(); + if (HttpMethod.PUT.name().equals(requestMethod) || HttpMethod.POST.name().equals(requestMethod)) + { + String params = argsArrayToString(joinPoint.getArgs()); + operLog.setOperParam(StringUtils.substring(params, 0, 2000)); + } + else + { + Map paramsMap = (Map) ServletUtils.getRequest().getAttribute(HandlerMapping.URI_TEMPLATE_VARIABLES_ATTRIBUTE); + operLog.setOperParam(StringUtils.substring(paramsMap.toString(), 0, 2000)); + } + } + + /** + * 参数拼装 + */ + private String argsArrayToString(Object[] paramsArray) + { + String params = ""; + if (paramsArray != null && paramsArray.length > 0) + { + for (Object o : paramsArray) + { + if (StringUtils.isNotNull(o) && !isFilterObject(o)) + { + try + { + Object jsonObj = JSON.toJSON(o); + params += jsonObj.toString() + " "; + } + catch (Exception e) + { + } + } + } + } + return params.trim(); + } + + /** + * 判断是否需要过滤的对象。 + * + * @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/ruoyi-framework/src/main/java/com/ruoyi/framework/aspectj/RateLimiterAspect.java b/ruoyi-framework/src/main/java/com/ruoyi/framework/aspectj/RateLimiterAspect.java new file mode 100644 index 0000000..0d1b62f --- /dev/null +++ b/ruoyi-framework/src/main/java/com/ruoyi/framework/aspectj/RateLimiterAspect.java @@ -0,0 +1,91 @@ +package com.ruoyi.framework.aspectj; + +import java.lang.reflect.Method; +import java.util.Collections; +import java.util.List; +import org.aspectj.lang.JoinPoint; +import org.aspectj.lang.annotation.Aspect; +import org.aspectj.lang.annotation.Before; +import org.aspectj.lang.reflect.MethodSignature; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.data.redis.core.RedisTemplate; +import org.springframework.data.redis.core.script.RedisScript; +import org.springframework.stereotype.Component; +import com.ruoyi.common.annotation.RateLimiter; +import com.ruoyi.common.enums.LimitType; +import com.ruoyi.common.exception.ServiceException; +import com.ruoyi.common.utils.ServletUtils; +import com.ruoyi.common.utils.StringUtils; +import com.ruoyi.common.utils.ip.IpUtils; + +/** + * 限流处理 + * + * @author ruoyi + */ +@Aspect +@Component +public class RateLimiterAspect +{ + private static final Logger log = LoggerFactory.getLogger(RateLimiterAspect.class); + + private RedisTemplate redisTemplate; + + private RedisScript limitScript; + + @Autowired + public void setRedisTemplate1(RedisTemplate redisTemplate) + { + this.redisTemplate = redisTemplate; + } + + @Autowired + public void setLimitScript(RedisScript limitScript) + { + this.limitScript = limitScript; + } + + @Before("@annotation(rateLimiter)") + public void doBefore(JoinPoint point, RateLimiter rateLimiter) throws Throwable + { + String key = rateLimiter.key(); + int time = rateLimiter.time(); + int count = rateLimiter.count(); + + String combineKey = getCombineKey(rateLimiter, point); + List keys = Collections.singletonList(combineKey); + try + { + Long number = redisTemplate.execute(limitScript, keys, count, time); + if (StringUtils.isNull(number) || number.intValue() > count) + { + throw new ServiceException("访问过于频繁，请稍候再试"); + } + log.info("限制请求'{}',当前请求'{}',缓存key'{}'", count, number.intValue(), key); + } + catch (ServiceException e) + { + throw e; + } + catch (Exception e) + { + throw new RuntimeException("服务器限流异常，请稍候再试"); + } + } + + public String getCombineKey(RateLimiter rateLimiter, JoinPoint point) + { + StringBuffer stringBuffer = new StringBuffer(rateLimiter.key()); + if (rateLimiter.limitType() == LimitType.IP) + { + stringBuffer.append(IpUtils.getIpAddr(ServletUtils.getRequest())).append("-"); + } + MethodSignature signature = (MethodSignature) point.getSignature(); + Method method = signature.getMethod(); + Class targetClass = method.getDeclaringClass(); + stringBuffer.append(targetClass.getName()).append("-").append(method.getName()); + return stringBuffer.toString(); + } +} diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/config/ApplicationConfig.java b/ruoyi-framework/src/main/java/com/ruoyi/framework/config/ApplicationConfig.java new file mode 100644 index 0000000..1d4dc1f --- /dev/null +++ b/ruoyi-framework/src/main/java/com/ruoyi/framework/config/ApplicationConfig.java @@ -0,0 +1,30 @@ +package com.ruoyi.framework.config; + +import java.util.TimeZone; +import org.mybatis.spring.annotation.MapperScan; +import org.springframework.boot.autoconfigure.jackson.Jackson2ObjectMapperBuilderCustomizer; +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; +import org.springframework.context.annotation.EnableAspectJAutoProxy; + +/** + * 程序注解配置 + * + * @author ruoyi + */ +@Configuration +// 表示通过aop框架暴露该代理对象,AopContext能够访问 +@EnableAspectJAutoProxy(exposeProxy = true) +// 指定要扫描的Mapper类的包的路径 +@MapperScan("com.ruoyi.**.mapper") +public class ApplicationConfig +{ + /** + * 时区配置 + */ + @Bean + public Jackson2ObjectMapperBuilderCustomizer jacksonObjectMapperCustomization() + { + return jacksonObjectMapperBuilder -> jacksonObjectMapperBuilder.timeZone(TimeZone.getDefault()); + } +} diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/config/CaptchaConfig.java b/ruoyi-framework/src/main/java/com/ruoyi/framework/config/CaptchaConfig.java new file mode 100644 index 0000000..43e78ae --- /dev/null +++ b/ruoyi-framework/src/main/java/com/ruoyi/framework/config/CaptchaConfig.java @@ -0,0 +1,83 @@ +package com.ruoyi.framework.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.ruoyi.framework.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; + } +} diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/config/DruidConfig.java b/ruoyi-framework/src/main/java/com/ruoyi/framework/config/DruidConfig.java new file mode 100644 index 0000000..0918e8e --- /dev/null +++ b/ruoyi-framework/src/main/java/com/ruoyi/framework/config/DruidConfig.java @@ -0,0 +1,138 @@ +package com.ruoyi.framework.config; + +import java.io.IOException; +import java.util.HashMap; +import java.util.Map; +import javax.servlet.Filter; +import javax.servlet.FilterChain; +import javax.servlet.ServletException; +import javax.servlet.ServletRequest; +import javax.servlet.ServletResponse; +import javax.sql.DataSource; +import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; +import org.springframework.boot.context.properties.ConfigurationProperties; +import org.springframework.boot.web.servlet.FilterRegistrationBean; +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; +import org.springframework.context.annotation.Primary; +import com.alibaba.druid.pool.DruidDataSource; +import com.alibaba.druid.spring.boot.autoconfigure.DruidDataSourceBuilder; +import com.alibaba.druid.spring.boot.autoconfigure.properties.DruidStatProperties; +import com.alibaba.druid.util.Utils; +import com.ruoyi.common.enums.DataSourceType; +import com.ruoyi.common.utils.spring.SpringUtils; +import com.ruoyi.framework.config.properties.DruidProperties; +import com.ruoyi.framework.datasource.DynamicDataSource; + +/** + * druid 配置多数据源 + * + * @author ruoyi + */ +@Configuration +public class DruidConfig +{ + @Bean + @ConfigurationProperties("spring.datasource.druid.master") + public DataSource masterDataSource(DruidProperties druidProperties) + { + DruidDataSource dataSource = DruidDataSourceBuilder.create().build(); + return druidProperties.dataSource(dataSource); + } + + @Bean + @ConfigurationProperties("spring.datasource.druid.slave") + @ConditionalOnProperty(prefix = "spring.datasource.druid.slave", name = "enabled", havingValue = "true") + public DataSource slaveDataSource(DruidProperties druidProperties) + { + DruidDataSource dataSource = DruidDataSourceBuilder.create().build(); + return druidProperties.dataSource(dataSource); + } + + @Bean + @ConfigurationProperties("spring.datasource.druid.shardsource") + @ConditionalOnProperty(prefix = "spring.datasource.druid.shardsource", name = "enabled", havingValue = "true") + public DataSource shardDataSource(DruidProperties druidProperties) + { + DruidDataSource dataSource = DruidDataSourceBuilder.create().build(); + return druidProperties.dataSource(dataSource); + } + + + + @Bean(name = "dynamicDataSource") + @Primary + public DynamicDataSource dataSource(DataSource masterDataSource) + { + Map targetDataSources = new HashMap<>(); + targetDataSources.put(DataSourceType.MASTER.name(), masterDataSource); + setDataSource(targetDataSources, DataSourceType.SLAVE.name(), "slaveDataSource"); + setDataSource(targetDataSources, DataSourceType.SHARDING.name(), "shardDataSource"); + return new DynamicDataSource(masterDataSource, targetDataSources); + } + + /** + * 设置数据源 + * + * @param targetDataSources 备选数据源集合 + * @param sourceName 数据源名称 + * @param beanName bean名称 + */ + public void setDataSource(Map targetDataSources, String sourceName, String beanName) + { + try + { + DataSource dataSource = SpringUtils.getBean(beanName); + targetDataSources.put(sourceName, dataSource); + } + catch (Exception e) + { + } + } + + /** + * 去除监控页面底部的广告 + */ + @SuppressWarnings({ "rawtypes", "unchecked" }) + @Bean + @ConditionalOnProperty(name = "spring.datasource.druid.statViewServlet.enabled", havingValue = "true") + public FilterRegistrationBean removeDruidFilterRegistrationBean(DruidStatProperties properties) + { + // 获取web监控页面的参数 + DruidStatProperties.StatViewServlet config = properties.getStatViewServlet(); + // 提取common.js的配置路径 + String pattern = config.getUrlPattern() != null ? config.getUrlPattern() : "/druid/*"; + String commonJsPattern = pattern.replaceAll("\\*", "js/common.js"); + final String filePath = "support/http/resources/js/common.js"; + // 创建filter进行过滤 + Filter filter = new Filter() + { + @Override + public void init(javax.servlet.FilterConfig filterConfig) throws ServletException + { + } + @Override + public void doFilter(ServletRequest request, ServletResponse response, FilterChain chain) + throws IOException, ServletException + { + chain.doFilter(request, response); + // 重置缓冲区，响应头不会被重置 + response.resetBuffer(); + // 获取common.js + String text = Utils.readFromResource(filePath); + // 正则替换banner, 除去底部的广告信息 + text = text.replaceAll("
", ""); + text = text.replaceAll("powered.*?shrek.wang", ""); + response.getWriter().write(text); + } + @Override + public void destroy() + { + } + }; + FilterRegistrationBean registrationBean = new FilterRegistrationBean(); + registrationBean.setFilter(filter); + registrationBean.addUrlPatterns(commonJsPattern); + return registrationBean; + } +} diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/config/FastJson2JsonRedisSerializer.java b/ruoyi-framework/src/main/java/com/ruoyi/framework/config/FastJson2JsonRedisSerializer.java new file mode 100644 index 0000000..59812ea --- /dev/null +++ b/ruoyi-framework/src/main/java/com/ruoyi/framework/config/FastJson2JsonRedisSerializer.java @@ -0,0 +1,71 @@ +package com.ruoyi.framework.config; + +import com.alibaba.fastjson.JSON; +import com.alibaba.fastjson.serializer.SerializerFeature; +import com.fasterxml.jackson.databind.JavaType; +import com.fasterxml.jackson.databind.ObjectMapper; +import com.fasterxml.jackson.databind.type.TypeFactory; +import org.springframework.data.redis.serializer.RedisSerializer; +import org.springframework.data.redis.serializer.SerializationException; +import com.alibaba.fastjson.parser.ParserConfig; +import org.springframework.util.Assert; +import java.nio.charset.Charset; + +/** + * Redis使用FastJson序列化 + * + * @author ruoyi + */ +public class FastJson2JsonRedisSerializer implements RedisSerializer +{ + @SuppressWarnings("unused") + private ObjectMapper objectMapper = new ObjectMapper(); + + public static final Charset DEFAULT_CHARSET = Charset.forName("UTF-8"); + + private Class clazz; + + static + { + ParserConfig.getGlobalInstance().setAutoTypeSupport(true); + } + + 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, SerializerFeature.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); + } + + public void setObjectMapper(ObjectMapper objectMapper) + { + Assert.notNull(objectMapper, "'objectMapper' must not be null"); + this.objectMapper = objectMapper; + } + + protected JavaType getJavaType(Class clazz) + { + return TypeFactory.defaultInstance().constructType(clazz); + } +} diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/config/FilterConfig.java b/ruoyi-framework/src/main/java/com/ruoyi/framework/config/FilterConfig.java new file mode 100644 index 0000000..bb14c04 --- /dev/null +++ b/ruoyi-framework/src/main/java/com/ruoyi/framework/config/FilterConfig.java @@ -0,0 +1,58 @@ +package com.ruoyi.framework.config; + +import java.util.HashMap; +import java.util.Map; +import javax.servlet.DispatcherType; +import org.springframework.beans.factory.annotation.Value; +import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; +import org.springframework.boot.web.servlet.FilterRegistrationBean; +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; +import com.ruoyi.common.filter.RepeatableFilter; +import com.ruoyi.common.filter.XssFilter; +import com.ruoyi.common.utils.StringUtils; + +/** + * Filter配置 + * + * @author ruoyi + */ +@Configuration +public class FilterConfig +{ + @Value("${xss.excludes}") + private String excludes; + + @Value("${xss.urlPatterns}") + private String urlPatterns; + + @SuppressWarnings({ "rawtypes", "unchecked" }) + @Bean + @ConditionalOnProperty(value = "xss.enabled", havingValue = "true") + public FilterRegistrationBean xssFilterRegistration() + { + FilterRegistrationBean registration = new FilterRegistrationBean(); + registration.setDispatcherTypes(DispatcherType.REQUEST); + registration.setFilter(new XssFilter()); + registration.addUrlPatterns(StringUtils.split(urlPatterns, ",")); + registration.setName("xssFilter"); + registration.setOrder(FilterRegistrationBean.HIGHEST_PRECEDENCE); + Map initParameters = new HashMap(); + initParameters.put("excludes", excludes); + registration.setInitParameters(initParameters); + return registration; + } + + @SuppressWarnings({ "rawtypes", "unchecked" }) + @Bean + public FilterRegistrationBean someFilterRegistration() + { + FilterRegistrationBean registration = new FilterRegistrationBean(); + registration.setFilter(new RepeatableFilter()); + registration.addUrlPatterns("/*"); + registration.setName("repeatableFilter"); + registration.setOrder(FilterRegistrationBean.LOWEST_PRECEDENCE); + return registration; + } + +} diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/config/KaptchaTextCreator.java b/ruoyi-framework/src/main/java/com/ruoyi/framework/config/KaptchaTextCreator.java new file mode 100644 index 0000000..3e74580 --- /dev/null +++ b/ruoyi-framework/src/main/java/com/ruoyi/framework/config/KaptchaTextCreator.java @@ -0,0 +1,75 @@ +package com.ruoyi.framework.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 = (int) Math.round(Math.random() * 2); + 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/ruoyi-framework/src/main/java/com/ruoyi/framework/config/MybatisPlusConfig.java b/ruoyi-framework/src/main/java/com/ruoyi/framework/config/MybatisPlusConfig.java new file mode 100644 index 0000000..f712180 --- /dev/null +++ b/ruoyi-framework/src/main/java/com/ruoyi/framework/config/MybatisPlusConfig.java @@ -0,0 +1,62 @@ +package com.ruoyi.framework.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(); + } +} \ No newline at end of file diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/config/RedisConfig.java b/ruoyi-framework/src/main/java/com/ruoyi/framework/config/RedisConfig.java new file mode 100644 index 0000000..833f219 --- /dev/null +++ b/ruoyi-framework/src/main/java/com/ruoyi/framework/config/RedisConfig.java @@ -0,0 +1,79 @@ +package com.ruoyi.framework.config; + +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.core.script.DefaultRedisScript; +import org.springframework.data.redis.serializer.StringRedisSerializer; +import com.fasterxml.jackson.annotation.JsonAutoDetect; +import com.fasterxml.jackson.annotation.JsonTypeInfo; +import com.fasterxml.jackson.annotation.PropertyAccessor; +import com.fasterxml.jackson.databind.ObjectMapper; +import com.fasterxml.jackson.databind.jsontype.impl.LaissezFaireSubTypeValidator; + +/** + * redis配置 + * + * @author ruoyi + */ +@Configuration +@EnableCaching +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); + + ObjectMapper mapper = new ObjectMapper(); + mapper.setVisibility(PropertyAccessor.ALL, JsonAutoDetect.Visibility.ANY); + mapper.activateDefaultTyping(LaissezFaireSubTypeValidator.instance, ObjectMapper.DefaultTyping.NON_FINAL, JsonTypeInfo.As.PROPERTY); + serializer.setObjectMapper(mapper); + + // 使用StringRedisSerializer来序列化和反序列化redis的key值 + template.setKeySerializer(new StringRedisSerializer()); + template.setValueSerializer(serializer); + + // Hash的key也采用StringRedisSerializer的序列化方式 + template.setHashKeySerializer(new StringRedisSerializer()); + template.setHashValueSerializer(serializer); + + template.afterPropertiesSet(); + return template; + } + + @Bean + public DefaultRedisScript limitScript() + { + DefaultRedisScript redisScript = new DefaultRedisScript<>(); + redisScript.setScriptText(limitScriptText()); + redisScript.setResultType(Long.class); + return redisScript; + } + + /** + * 限流脚本 + */ + private String limitScriptText() + { + return "local key = KEYS[1]\n" + + "local count = tonumber(ARGV[1])\n" + + "local time = tonumber(ARGV[2])\n" + + "local current = redis.call('get', key);\n" + + "if current and tonumber(current) > count then\n" + + " return tonumber(current);\n" + + "end\n" + + "current = redis.call('incr', key)\n" + + "if tonumber(current) == 1 then\n" + + " redis.call('expire', key, time)\n" + + "end\n" + + "return tonumber(current);"; + } +} diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/config/ResourcesConfig.java b/ruoyi-framework/src/main/java/com/ruoyi/framework/config/ResourcesConfig.java new file mode 100644 index 0000000..50ad496 --- /dev/null +++ b/ruoyi-framework/src/main/java/com/ruoyi/framework/config/ResourcesConfig.java @@ -0,0 +1,70 @@ +package com.ruoyi.framework.config; + +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; +import org.springframework.web.cors.CorsConfiguration; +import org.springframework.web.cors.UrlBasedCorsConfigurationSource; +import org.springframework.web.filter.CorsFilter; +import org.springframework.web.servlet.config.annotation.InterceptorRegistry; +import org.springframework.web.servlet.config.annotation.ResourceHandlerRegistry; +import org.springframework.web.servlet.config.annotation.WebMvcConfigurer; +import com.ruoyi.common.config.RuoYiConfig; +import com.ruoyi.common.constant.Constants; +import com.ruoyi.framework.interceptor.RepeatSubmitInterceptor; + +/** + * 通用配置 + * + * @author ruoyi + */ +@Configuration +public class ResourcesConfig implements WebMvcConfigurer +{ + @Autowired + private RepeatSubmitInterceptor repeatSubmitInterceptor; + + @Override + public void addResourceHandlers(ResourceHandlerRegistry registry) + { + /** 本地文件上传路径 */ + registry.addResourceHandler(Constants.RESOURCE_PREFIX + "/**") + .addResourceLocations("file:" + RuoYiConfig.getProfile() + "/"); + + /** swagger配置 */ + registry.addResourceHandler("/swagger-ui/**") + .addResourceLocations("classpath:/META-INF/resources/webjars/springfox-swagger-ui/"); + } + + /** + * 自定义拦截规则 + */ + @Override + public void addInterceptors(InterceptorRegistry registry) + { + registry.addInterceptor(repeatSubmitInterceptor).addPathPatterns("/**"); + } + + /** + * 跨域配置 + */ + @Bean + public CorsFilter corsFilter() + { + CorsConfiguration config = new CorsConfiguration(); + config.setAllowCredentials(true); + // 设置访问源地址 + config.addAllowedOriginPattern("*"); + // 设置访问源请求头 + config.addAllowedHeader("*"); + // 设置访问源请求方法 + config.addAllowedMethod("*"); + // 有效期 1800秒 + config.setMaxAge(1800L); + // 添加映射路径，拦截一切请求 + UrlBasedCorsConfigurationSource source = new UrlBasedCorsConfigurationSource(); + source.registerCorsConfiguration("/**", config); + // 返回新的CorsFilter + return new CorsFilter(source); + } +} \ No newline at end of file diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/config/SecurityConfig.java b/ruoyi-framework/src/main/java/com/ruoyi/framework/config/SecurityConfig.java new file mode 100644 index 0000000..458a8cf --- /dev/null +++ b/ruoyi-framework/src/main/java/com/ruoyi/framework/config/SecurityConfig.java @@ -0,0 +1,145 @@ +package com.ruoyi.framework.config; + +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.context.annotation.Bean; +import org.springframework.http.HttpMethod; +import org.springframework.security.authentication.AuthenticationManager; +import org.springframework.security.config.annotation.authentication.builders.AuthenticationManagerBuilder; +import org.springframework.security.config.annotation.method.configuration.EnableGlobalMethodSecurity; +import org.springframework.security.config.annotation.web.builders.HttpSecurity; +import org.springframework.security.config.annotation.web.configuration.WebSecurityConfigurerAdapter; +import org.springframework.security.config.http.SessionCreationPolicy; +import org.springframework.security.core.userdetails.UserDetailsService; +import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder; +import org.springframework.security.web.authentication.UsernamePasswordAuthenticationFilter; +import org.springframework.security.web.authentication.logout.LogoutFilter; +import org.springframework.web.filter.CorsFilter; +import com.ruoyi.framework.security.filter.JwtAuthenticationTokenFilter; +import com.ruoyi.framework.security.handle.AuthenticationEntryPointImpl; +import com.ruoyi.framework.security.handle.LogoutSuccessHandlerImpl; + +/** + * spring security配置 + * + * @author ruoyi + */ +@EnableGlobalMethodSecurity(prePostEnabled = true, securedEnabled = true) +public class SecurityConfig extends WebSecurityConfigurerAdapter +{ + /** + * 自定义用户认证逻辑 + */ + @Autowired + private UserDetailsService userDetailsService; + + /** + * 认证失败处理类 + */ + @Autowired + private AuthenticationEntryPointImpl unauthorizedHandler; + + /** + * 退出处理类 + */ + @Autowired + private LogoutSuccessHandlerImpl logoutSuccessHandler; + + /** + * token认证过滤器 + */ + @Autowired + private JwtAuthenticationTokenFilter authenticationTokenFilter; + + /** + * 跨域过滤器 + */ + @Autowired + private CorsFilter corsFilter; + + /** + * 解决 无法直接注入 AuthenticationManager + * + * @return + * @throws Exception + */ + @Bean + @Override + public AuthenticationManager authenticationManagerBean() throws Exception + { + return super.authenticationManagerBean(); + } + + /** + * anyRequest | 匹配所有请求路径 + * access | SpringEl表达式结果为true时可以访问 + * anonymous | 匿名可以访问 + * denyAll | 用户不能访问 + * fullyAuthenticated | 用户完全认证可以访问（非remember-me下自动登录） + * hasAnyAuthority | 如果有参数，参数表示权限，则其中任何一个权限可以访问 + * hasAnyRole | 如果有参数，参数表示角色，则其中任何一个角色可以访问 + * hasAuthority | 如果有参数，参数表示权限，则其权限可以访问 + * hasIpAddress | 如果有参数，参数表示IP地址，如果用户IP和参数匹配，则可以访问 + * hasRole | 如果有参数，参数表示角色，则其角色可以访问 + * permitAll | 用户可以任意访问 + * rememberMe | 允许通过remember-me登录的用户访问 + * authenticated | 用户登录后可访问 + */ + @Override + protected void configure(HttpSecurity httpSecurity) throws Exception + { + httpSecurity + // CSRF禁用，因为不使用session + .csrf().disable() + // 认证失败处理类 + .exceptionHandling().authenticationEntryPoint(unauthorizedHandler).and() + // 基于token，所以不需要session + .sessionManagement().sessionCreationPolicy(SessionCreationPolicy.STATELESS).and() + // 过滤请求 + .authorizeRequests() + // 对于登录login 注册register 验证码captchaImage 允许匿名访问 + .antMatchers("/login","/loginSso", "/register", "/captchaImage").anonymous() + .antMatchers( + HttpMethod.GET, + "/", + "/*.html", + "/**/*.html", + "/**/*.css", + "/**/*.js", + "/profile/**" + ).permitAll() + .antMatchers("/swagger-ui.html").anonymous() + .antMatchers("/swagger-resources/**").anonymous() + .antMatchers("/webjars/**").anonymous() + .antMatchers("/*/api-docs").anonymous() + .antMatchers("/druid/**").anonymous() + .antMatchers("/api/**").anonymous() + // 除上面外的所有请求全部需要鉴权认证 + .anyRequest().authenticated() + .and() + .headers().frameOptions().disable(); + httpSecurity.logout().logoutUrl("/logout").logoutSuccessHandler(logoutSuccessHandler); + // 添加JWT filter + httpSecurity.addFilterBefore(authenticationTokenFilter, UsernamePasswordAuthenticationFilter.class); + // 添加CORS filter + httpSecurity.addFilterBefore(corsFilter, JwtAuthenticationTokenFilter.class); + httpSecurity.addFilterBefore(corsFilter, LogoutFilter.class); + } + + /** + * 强散列哈希加密实现 + */ + @Bean + public BCryptPasswordEncoder bCryptPasswordEncoder() + { + return new BCryptPasswordEncoder(); + } + + /** + * 身份认证接口 + */ + @Override + protected void configure(AuthenticationManagerBuilder auth) throws Exception + { + auth.userDetailsService(userDetailsService).passwordEncoder(bCryptPasswordEncoder()); + } +} diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/config/ServerConfig.java b/ruoyi-framework/src/main/java/com/ruoyi/framework/config/ServerConfig.java new file mode 100644 index 0000000..b5b7de3 --- /dev/null +++ b/ruoyi-framework/src/main/java/com/ruoyi/framework/config/ServerConfig.java @@ -0,0 +1,32 @@ +package com.ruoyi.framework.config; + +import javax.servlet.http.HttpServletRequest; +import org.springframework.stereotype.Component; +import com.ruoyi.common.utils.ServletUtils; + +/** + * 服务相关配置 + * + * @author ruoyi + */ +@Component +public class ServerConfig +{ + /** + * 获取完整的请求路径，包括：域名，端口，上下文访问路径 + * + * @return 服务地址 + */ + public String getUrl() + { + HttpServletRequest request = ServletUtils.getRequest(); + return getDomain(request); + } + + public static String getDomain(HttpServletRequest request) + { + StringBuffer url = request.getRequestURL(); + String contextPath = request.getServletContext().getContextPath(); + return url.delete(url.length() - request.getRequestURI().length(), url.length()).append(contextPath).toString(); + } +} diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/config/SlaveDataSourceConfig.java b/ruoyi-framework/src/main/java/com/ruoyi/framework/config/SlaveDataSourceConfig.java new file mode 100644 index 0000000..b07ebf2 --- /dev/null +++ b/ruoyi-framework/src/main/java/com/ruoyi/framework/config/SlaveDataSourceConfig.java @@ -0,0 +1,50 @@ +//package com.ruoyi.framework.config; +// +//import com.alibaba.druid.pool.DruidDataSource; +//import com.alibaba.druid.spring.boot.autoconfigure.DruidDataSourceBuilder; +//import com.ruoyi.framework.config.properties.DruidProperties; +//import org.springframework.beans.factory.annotation.Qualifier; +//import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; +//import org.springframework.boot.context.properties.ConfigurationProperties; +//import org.springframework.context.annotation.Bean; +//import org.springframework.context.annotation.Configuration; +// +//import javax.sql.DataSource; +//import java.sql.SQLException; +//import java.util.HashMap; +//import java.util.Map; +//import java.util.Properties; +// +///** +// * @Author al +// * @Date 2024/12/27 14:30 +// * @Description: TODO +// * @Version +// */ +/////** +//// * sharding 配置信息 +//// * +//// * @author ruoyi +//// */ +//@Configuration +//public class SlaveDataSourceConfig +//{ +// @Bean +// @ConfigurationProperties("spring.datasource.druid.shardsource") +// @ConditionalOnProperty(prefix = "spring.datasource.druid.shardsource", name = "enabled", havingValue = "true") +// public DataSource shardDataSource(DruidProperties druidProperties) +// { +// DruidDataSource dataSource = DruidDataSourceBuilder.create().build(); +// return druidProperties.dataSource(dataSource); +// } +// +// /** +// * 系统参数配置 +// */ +// private Properties getProperties() +// { +// Properties shardingProperties = new Properties(); +// shardingProperties.put("sql.show", true); +// return shardingProperties; +// } +//} \ No newline at end of file diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/config/ThreadPoolConfig.java b/ruoyi-framework/src/main/java/com/ruoyi/framework/config/ThreadPoolConfig.java new file mode 100644 index 0000000..7840141 --- /dev/null +++ b/ruoyi-framework/src/main/java/com/ruoyi/framework/config/ThreadPoolConfig.java @@ -0,0 +1,63 @@ +package com.ruoyi.framework.config; + +import com.ruoyi.common.utils.Threads; +import org.apache.commons.lang3.concurrent.BasicThreadFactory; +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; +import org.springframework.scheduling.concurrent.ThreadPoolTaskExecutor; +import java.util.concurrent.ScheduledExecutorService; +import java.util.concurrent.ScheduledThreadPoolExecutor; +import java.util.concurrent.ThreadPoolExecutor; + +/** + * 线程池配置 + * + * @author ruoyi + **/ +@Configuration +public class ThreadPoolConfig +{ + // 核心线程池大小 + private int corePoolSize = 50; + + // 最大可创建的线程数 + private int maxPoolSize = 200; + + // 队列最大长度 + private int queueCapacity = 1000; + + // 线程池维护线程所允许的空闲时间 + private int keepAliveSeconds = 300; + + @Bean(name = "threadPoolTaskExecutor") + public ThreadPoolTaskExecutor threadPoolTaskExecutor() + { + ThreadPoolTaskExecutor executor = new ThreadPoolTaskExecutor(); + executor.setMaxPoolSize(maxPoolSize); + executor.setCorePoolSize(corePoolSize); + executor.setQueueCapacity(queueCapacity); + executor.setKeepAliveSeconds(keepAliveSeconds); + // 线程池对拒绝任务(无线程可用)的处理策略 + executor.setRejectedExecutionHandler(new ThreadPoolExecutor.CallerRunsPolicy()); + return executor; + } + + /** + * 执行周期性或定时任务 + */ + @Bean(name = "scheduledExecutorService") + protected ScheduledExecutorService scheduledExecutorService() + { + return new ScheduledThreadPoolExecutor(corePoolSize, + new BasicThreadFactory.Builder().namingPattern("schedule-pool-%d").daemon(true).build(), + new ThreadPoolExecutor.CallerRunsPolicy()) + { + @Override + protected void afterExecute(Runnable r, Throwable t) + { + super.afterExecute(r, t); + Threads.printException(r, t); + } + }; + } +} diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/config/properties/DruidProperties.java b/ruoyi-framework/src/main/java/com/ruoyi/framework/config/properties/DruidProperties.java new file mode 100644 index 0000000..84f7e00 --- /dev/null +++ b/ruoyi-framework/src/main/java/com/ruoyi/framework/config/properties/DruidProperties.java @@ -0,0 +1,77 @@ +package com.ruoyi.framework.config.properties; + +import org.springframework.beans.factory.annotation.Value; +import org.springframework.context.annotation.Configuration; +import com.alibaba.druid.pool.DruidDataSource; + +/** + * druid 配置属性 + * + * @author ruoyi + */ +@Configuration +public class DruidProperties +{ + @Value("${spring.datasource.druid.initialSize}") + private int initialSize; + + @Value("${spring.datasource.druid.minIdle}") + private int minIdle; + + @Value("${spring.datasource.druid.maxActive}") + private int maxActive; + + @Value("${spring.datasource.druid.maxWait}") + private int maxWait; + + @Value("${spring.datasource.druid.timeBetweenEvictionRunsMillis}") + private int timeBetweenEvictionRunsMillis; + + @Value("${spring.datasource.druid.minEvictableIdleTimeMillis}") + private int minEvictableIdleTimeMillis; + + @Value("${spring.datasource.druid.maxEvictableIdleTimeMillis}") + private int maxEvictableIdleTimeMillis; + + @Value("${spring.datasource.druid.validationQuery}") + private String validationQuery; + + @Value("${spring.datasource.druid.testWhileIdle}") + private boolean testWhileIdle; + + @Value("${spring.datasource.druid.testOnBorrow}") + private boolean testOnBorrow; + + @Value("${spring.datasource.druid.testOnReturn}") + private boolean testOnReturn; + + public DruidDataSource dataSource(DruidDataSource datasource) + { + /** 配置初始化大小、最小、最大 */ + datasource.setInitialSize(initialSize); + datasource.setMaxActive(maxActive); + datasource.setMinIdle(minIdle); + + /** 配置获取连接等待超时的时间 */ + datasource.setMaxWait(maxWait); + + /** 配置间隔多久才进行一次检测，检测需要关闭的空闲连接，单位是毫秒 */ + datasource.setTimeBetweenEvictionRunsMillis(timeBetweenEvictionRunsMillis); + + /** 配置一个连接在池中最小、最大生存的时间，单位是毫秒 */ + datasource.setMinEvictableIdleTimeMillis(minEvictableIdleTimeMillis); + datasource.setMaxEvictableIdleTimeMillis(maxEvictableIdleTimeMillis); + + /** + * 用来检测连接是否有效的sql，要求是一个查询语句，常用select 'x'。如果validationQuery为null，testOnBorrow、testOnReturn、testWhileIdle都不会起作用。 + */ + datasource.setValidationQuery(validationQuery); + /** 建议配置为true，不影响性能，并且保证安全性。申请连接的时候检测，如果空闲时间大于timeBetweenEvictionRunsMillis，执行validationQuery检测连接是否有效。 */ + datasource.setTestWhileIdle(testWhileIdle); + /** 申请连接时执行validationQuery检测连接是否有效，做了这个配置会降低性能。 */ + datasource.setTestOnBorrow(testOnBorrow); + /** 归还连接时执行validationQuery检测连接是否有效，做了这个配置会降低性能。 */ + datasource.setTestOnReturn(testOnReturn); + return datasource; + } +} diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/datasource/DynamicDataSource.java b/ruoyi-framework/src/main/java/com/ruoyi/framework/datasource/DynamicDataSource.java new file mode 100644 index 0000000..e70b8cf --- /dev/null +++ b/ruoyi-framework/src/main/java/com/ruoyi/framework/datasource/DynamicDataSource.java @@ -0,0 +1,26 @@ +package com.ruoyi.framework.datasource; + +import java.util.Map; +import javax.sql.DataSource; +import org.springframework.jdbc.datasource.lookup.AbstractRoutingDataSource; + +/** + * 动态数据源 + * + * @author ruoyi + */ +public class DynamicDataSource extends AbstractRoutingDataSource +{ + public DynamicDataSource(DataSource defaultTargetDataSource, Map targetDataSources) + { + super.setDefaultTargetDataSource(defaultTargetDataSource); + super.setTargetDataSources(targetDataSources); + super.afterPropertiesSet(); + } + + @Override + protected Object determineCurrentLookupKey() + { + return DynamicDataSourceContextHolder.getDataSourceType(); + } +} \ No newline at end of file diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/datasource/DynamicDataSourceContextHolder.java b/ruoyi-framework/src/main/java/com/ruoyi/framework/datasource/DynamicDataSourceContextHolder.java new file mode 100644 index 0000000..3572db9 --- /dev/null +++ b/ruoyi-framework/src/main/java/com/ruoyi/framework/datasource/DynamicDataSourceContextHolder.java @@ -0,0 +1,45 @@ +package com.ruoyi.framework.datasource; + +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +/** + * 数据源切换处理 + * + * @author ruoyi + */ +public class DynamicDataSourceContextHolder +{ + public static final Logger log = LoggerFactory.getLogger(DynamicDataSourceContextHolder.class); + + /** + * 使用ThreadLocal维护变量，ThreadLocal为每个使用该变量的线程提供独立的变量副本， + * 所以每一个线程都可以独立地改变自己的副本，而不会影响其它线程所对应的副本。 + */ + private static final ThreadLocal CONTEXT_HOLDER = new ThreadLocal<>(); + + /** + * 设置数据源的变量 + */ + public static void setDataSourceType(String dsType) + { + log.info("切换到{}数据源", dsType); + CONTEXT_HOLDER.set(dsType); + } + + /** + * 获得数据源的变量 + */ + public static String getDataSourceType() + { + return CONTEXT_HOLDER.get(); + } + + /** + * 清空数据源变量 + */ + public static void clearDataSourceType() + { + CONTEXT_HOLDER.remove(); + } +} diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/interceptor/RepeatSubmitInterceptor.java b/ruoyi-framework/src/main/java/com/ruoyi/framework/interceptor/RepeatSubmitInterceptor.java new file mode 100644 index 0000000..7575748 --- /dev/null +++ b/ruoyi-framework/src/main/java/com/ruoyi/framework/interceptor/RepeatSubmitInterceptor.java @@ -0,0 +1,55 @@ +package com.ruoyi.framework.interceptor; + +import java.lang.reflect.Method; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; +import org.springframework.stereotype.Component; +import org.springframework.web.method.HandlerMethod; +import org.springframework.web.servlet.HandlerInterceptor; +import com.alibaba.fastjson.JSONObject; +import com.ruoyi.common.annotation.RepeatSubmit; +import com.ruoyi.common.core.domain.AjaxResult; +import com.ruoyi.common.utils.ServletUtils; + +/** + * 防止重复提交拦截器 + * + * @author ruoyi + */ +@Component +public abstract class RepeatSubmitInterceptor implements HandlerInterceptor +{ + @Override + public boolean preHandle(HttpServletRequest request, HttpServletResponse response, Object handler) throws Exception + { + if (handler instanceof HandlerMethod) + { + HandlerMethod handlerMethod = (HandlerMethod) handler; + Method method = handlerMethod.getMethod(); + RepeatSubmit annotation = method.getAnnotation(RepeatSubmit.class); + if (annotation != null) + { + if (this.isRepeatSubmit(request, annotation)) + { + AjaxResult ajaxResult = AjaxResult.error(annotation.message()); + ServletUtils.renderString(response, JSONObject.toJSONString(ajaxResult)); + return false; + } + } + return true; + } + else + { + return true; + } + } + + /** + * 验证是否重复提交由子类实现具体的防重复提交的规则 + * + * @param request + * @return + * @throws Exception + */ + public abstract boolean isRepeatSubmit(HttpServletRequest request, RepeatSubmit annotation); +} diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/interceptor/impl/SameUrlDataInterceptor.java b/ruoyi-framework/src/main/java/com/ruoyi/framework/interceptor/impl/SameUrlDataInterceptor.java new file mode 100644 index 0000000..0e1ff68 --- /dev/null +++ b/ruoyi-framework/src/main/java/com/ruoyi/framework/interceptor/impl/SameUrlDataInterceptor.java @@ -0,0 +1,110 @@ +package com.ruoyi.framework.interceptor.impl; + +import java.util.HashMap; +import java.util.Map; +import java.util.concurrent.TimeUnit; +import javax.servlet.http.HttpServletRequest; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.beans.factory.annotation.Value; +import org.springframework.stereotype.Component; +import com.alibaba.fastjson.JSONObject; +import com.ruoyi.common.annotation.RepeatSubmit; +import com.ruoyi.common.constant.Constants; +import com.ruoyi.common.core.redis.RedisCache; +import com.ruoyi.common.filter.RepeatedlyRequestWrapper; +import com.ruoyi.common.utils.StringUtils; +import com.ruoyi.common.utils.http.HttpHelper; +import com.ruoyi.framework.interceptor.RepeatSubmitInterceptor; + +/** + * 判断请求url和数据是否和上一次相同， + * 如果和上次相同，则是重复提交表单。 有效时间为10秒内。 + * + * @author ruoyi + */ +@Component +public class SameUrlDataInterceptor extends RepeatSubmitInterceptor +{ + public final String REPEAT_PARAMS = "repeatParams"; + + public final String REPEAT_TIME = "repeatTime"; + + // 令牌自定义标识 + @Value("${token.header}") + private String header; + + @Autowired + private RedisCache redisCache; + + @SuppressWarnings("unchecked") + @Override + public boolean isRepeatSubmit(HttpServletRequest request, RepeatSubmit annotation) + { + String nowParams = ""; + if (request instanceof RepeatedlyRequestWrapper) + { + RepeatedlyRequestWrapper repeatedlyRequest = (RepeatedlyRequestWrapper) request; + nowParams = HttpHelper.getBodyString(repeatedlyRequest); + } + + // body参数为空，获取Parameter的数据 + if (StringUtils.isEmpty(nowParams)) + { + nowParams = JSONObject.toJSONString(request.getParameterMap()); + } + Map nowDataMap = new HashMap(); + nowDataMap.put(REPEAT_PARAMS, nowParams); + nowDataMap.put(REPEAT_TIME, System.currentTimeMillis()); + + // 请求地址（作为存放cache的key值） + String url = request.getRequestURI(); + + // 唯一值（没有消息头则使用请求地址） + String submitKey = StringUtils.trimToEmpty(request.getHeader(header)); + + // 唯一标识（指定key + url + 消息头） + String cacheRepeatKey = Constants.REPEAT_SUBMIT_KEY + url + submitKey; + + Object sessionObj = redisCache.getCacheObject(cacheRepeatKey); + if (sessionObj != null) + { + Map sessionMap = (Map) sessionObj; + if (sessionMap.containsKey(url)) + { + Map preDataMap = (Map) sessionMap.get(url); + if (compareParams(nowDataMap, preDataMap) && compareTime(nowDataMap, preDataMap, annotation.interval())) + { + return true; + } + } + } + Map cacheMap = new HashMap(); + cacheMap.put(url, nowDataMap); + redisCache.setCacheObject(cacheRepeatKey, cacheMap, annotation.interval(), TimeUnit.MILLISECONDS); + return false; + } + + /** + * 判断参数是否相同 + */ + private boolean compareParams(Map nowMap, Map preMap) + { + String nowParams = (String) nowMap.get(REPEAT_PARAMS); + String preParams = (String) preMap.get(REPEAT_PARAMS); + return nowParams.equals(preParams); + } + + /** + * 判断两次间隔时间 + */ + private boolean compareTime(Map nowMap, Map preMap, int interval) + { + long time1 = (Long) nowMap.get(REPEAT_TIME); + long time2 = (Long) preMap.get(REPEAT_TIME); + if ((time1 - time2) < interval) + { + return true; + } + return false; + } +} diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/manager/AsyncManager.java b/ruoyi-framework/src/main/java/com/ruoyi/framework/manager/AsyncManager.java new file mode 100644 index 0000000..7387a02 --- /dev/null +++ b/ruoyi-framework/src/main/java/com/ruoyi/framework/manager/AsyncManager.java @@ -0,0 +1,55 @@ +package com.ruoyi.framework.manager; + +import java.util.TimerTask; +import java.util.concurrent.ScheduledExecutorService; +import java.util.concurrent.TimeUnit; +import com.ruoyi.common.utils.Threads; +import com.ruoyi.common.utils.spring.SpringUtils; + +/** + * 异步任务管理器 + * + * @author ruoyi + */ +public class AsyncManager +{ + /** + * 操作延迟10毫秒 + */ + private final int OPERATE_DELAY_TIME = 10; + + /** + * 异步操作任务调度线程池 + */ + private ScheduledExecutorService executor = SpringUtils.getBean("scheduledExecutorService"); + + /** + * 单例模式 + */ + private AsyncManager(){} + + private static AsyncManager me = new AsyncManager(); + + public static AsyncManager me() + { + return me; + } + + /** + * 执行任务 + * + * @param task 任务 + */ + public void execute(TimerTask task) + { + executor.schedule(task, OPERATE_DELAY_TIME, TimeUnit.MILLISECONDS); + } + + /** + * 停止任务线程池 + */ + public void shutdown() + { + Threads.shutdownAndAwaitTermination(executor); + } +} diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/manager/ShutdownManager.java b/ruoyi-framework/src/main/java/com/ruoyi/framework/manager/ShutdownManager.java new file mode 100644 index 0000000..e36ca3c --- /dev/null +++ b/ruoyi-framework/src/main/java/com/ruoyi/framework/manager/ShutdownManager.java @@ -0,0 +1,39 @@ +package com.ruoyi.framework.manager; + +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.stereotype.Component; +import javax.annotation.PreDestroy; + +/** + * 确保应用退出时能关闭后台线程 + * + * @author ruoyi + */ +@Component +public class ShutdownManager +{ + private static final Logger logger = LoggerFactory.getLogger("sys-user"); + + @PreDestroy + public void destroy() + { + shutdownAsyncManager(); + } + + /** + * 停止异步执行任务 + */ + private void shutdownAsyncManager() + { + try + { + logger.info("====关闭后台任务任务线程池===="); + AsyncManager.me().shutdown(); + } + catch (Exception e) + { + logger.error(e.getMessage(), e); + } + } +} diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/manager/factory/AsyncFactory.java b/ruoyi-framework/src/main/java/com/ruoyi/framework/manager/factory/AsyncFactory.java new file mode 100644 index 0000000..23d0230 --- /dev/null +++ b/ruoyi-framework/src/main/java/com/ruoyi/framework/manager/factory/AsyncFactory.java @@ -0,0 +1,102 @@ +package com.ruoyi.framework.manager.factory; + +import java.util.TimerTask; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import com.ruoyi.common.constant.Constants; +import com.ruoyi.common.utils.LogUtils; +import com.ruoyi.common.utils.ServletUtils; +import com.ruoyi.common.utils.StringUtils; +import com.ruoyi.common.utils.ip.AddressUtils; +import com.ruoyi.common.utils.ip.IpUtils; +import com.ruoyi.common.utils.spring.SpringUtils; +import com.ruoyi.system.domain.SysLogininfor; +import com.ruoyi.system.domain.SysOperLog; +import com.ruoyi.system.service.ISysLogininforService; +import com.ruoyi.system.service.ISysOperLogService; +import eu.bitwalker.useragentutils.UserAgent; + +/** + * 异步工厂（产生任务用） + * + * @author ruoyi + */ +public class AsyncFactory +{ + private static final Logger sys_user_logger = LoggerFactory.getLogger("sys-user"); + + /** + * 记录登录信息 + * + * @param username 用户名 + * @param status 状态 + * @param message 消息 + * @param args 列表 + * @return 任务task + */ + public static TimerTask recordLogininfor(final String username, final String status, final String message, + final Object... args) + { + final UserAgent userAgent = UserAgent.parseUserAgentString(ServletUtils.getRequest().getHeader("User-Agent")); + final String ip = IpUtils.getIpAddr(ServletUtils.getRequest()); + return new TimerTask() + { + @Override + public void run() + { + String address = AddressUtils.getRealAddressByIP(ip); + StringBuilder s = new StringBuilder(); + s.append(LogUtils.getBlock(ip)); + s.append(address); + s.append(LogUtils.getBlock(username)); + s.append(LogUtils.getBlock(status)); + s.append(LogUtils.getBlock(message)); + // 打印信息到日志 + sys_user_logger.info(s.toString(), args); + // 获取客户端操作系统 + String os = userAgent.getOperatingSystem().getName(); + // 获取客户端浏览器 + String browser = userAgent.getBrowser().getName(); + // 封装对象 + SysLogininfor logininfor = new SysLogininfor(); + logininfor.setUserName(username); + logininfor.setIpaddr(ip); + logininfor.setLoginLocation(address); + logininfor.setBrowser(browser); + logininfor.setOs(os); + logininfor.setMsg(message); + // 日志状态 + if (StringUtils.equalsAny(status, Constants.LOGIN_SUCCESS, Constants.LOGOUT, Constants.REGISTER)) + { + logininfor.setStatus(Constants.SUCCESS); + } + else if (Constants.LOGIN_FAIL.equals(status)) + { + logininfor.setStatus(Constants.FAIL); + } + // 插入数据 + SpringUtils.getBean(ISysLogininforService.class).insertLogininfor(logininfor); + } + }; + } + + /** + * 操作日志记录 + * + * @param operLog 操作日志信息 + * @return 任务task + */ + public static TimerTask recordOper(final SysOperLog operLog) + { + return new TimerTask() + { + @Override + public void run() + { + // 远程查询操作地点 + operLog.setOperLocation(AddressUtils.getRealAddressByIP(operLog.getOperIp())); + SpringUtils.getBean(ISysOperLogService.class).insertOperlog(operLog); + } + }; + } +} diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/security/filter/JwtAuthenticationTokenFilter.java b/ruoyi-framework/src/main/java/com/ruoyi/framework/security/filter/JwtAuthenticationTokenFilter.java new file mode 100644 index 0000000..3eb2495 --- /dev/null +++ b/ruoyi-framework/src/main/java/com/ruoyi/framework/security/filter/JwtAuthenticationTokenFilter.java @@ -0,0 +1,44 @@ +package com.ruoyi.framework.security.filter; + +import java.io.IOException; +import javax.servlet.FilterChain; +import javax.servlet.ServletException; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.security.authentication.UsernamePasswordAuthenticationToken; +import org.springframework.security.core.context.SecurityContextHolder; +import org.springframework.security.web.authentication.WebAuthenticationDetailsSource; +import org.springframework.stereotype.Component; +import org.springframework.web.filter.OncePerRequestFilter; +import com.ruoyi.common.core.domain.model.LoginUser; +import com.ruoyi.common.utils.SecurityUtils; +import com.ruoyi.common.utils.StringUtils; +import com.ruoyi.framework.web.service.TokenService; + +/** + * token过滤器 验证token有效性 + * + * @author ruoyi + */ +@Component +public class JwtAuthenticationTokenFilter extends OncePerRequestFilter +{ + @Autowired + private TokenService tokenService; + + @Override + protected void doFilterInternal(HttpServletRequest request, HttpServletResponse response, FilterChain chain) + throws ServletException, IOException + { + LoginUser loginUser = tokenService.getLoginUser(request); + if (StringUtils.isNotNull(loginUser) && StringUtils.isNull(SecurityUtils.getAuthentication())) + { + tokenService.verifyToken(loginUser); + UsernamePasswordAuthenticationToken authenticationToken = new UsernamePasswordAuthenticationToken(loginUser, null, loginUser.getAuthorities()); + authenticationToken.setDetails(new WebAuthenticationDetailsSource().buildDetails(request)); + SecurityContextHolder.getContext().setAuthentication(authenticationToken); + } + chain.doFilter(request, response); + } +} diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/security/handle/AuthenticationEntryPointImpl.java b/ruoyi-framework/src/main/java/com/ruoyi/framework/security/handle/AuthenticationEntryPointImpl.java new file mode 100644 index 0000000..c22dd32 --- /dev/null +++ b/ruoyi-framework/src/main/java/com/ruoyi/framework/security/handle/AuthenticationEntryPointImpl.java @@ -0,0 +1,34 @@ +package com.ruoyi.framework.security.handle; + +import java.io.IOException; +import java.io.Serializable; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; +import org.springframework.security.core.AuthenticationException; +import org.springframework.security.web.AuthenticationEntryPoint; +import org.springframework.stereotype.Component; +import com.alibaba.fastjson.JSON; +import com.ruoyi.common.constant.HttpStatus; +import com.ruoyi.common.core.domain.AjaxResult; +import com.ruoyi.common.utils.ServletUtils; +import com.ruoyi.common.utils.StringUtils; + +/** + * 认证失败处理类 返回未授权 + * + * @author ruoyi + */ +@Component +public class AuthenticationEntryPointImpl implements AuthenticationEntryPoint, Serializable +{ + private static final long serialVersionUID = -8970718410437077606L; + + @Override + public void commence(HttpServletRequest request, HttpServletResponse response, AuthenticationException e) + throws IOException + { + int code = HttpStatus.UNAUTHORIZED; + String msg = StringUtils.format("请求访问：{}，认证失败，无法访问系统资源", request.getRequestURI()); + ServletUtils.renderString(response, JSON.toJSONString(AjaxResult.error(code, msg))); + } +} diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/security/handle/LogoutSuccessHandlerImpl.java b/ruoyi-framework/src/main/java/com/ruoyi/framework/security/handle/LogoutSuccessHandlerImpl.java new file mode 100644 index 0000000..e5fc11d --- /dev/null +++ b/ruoyi-framework/src/main/java/com/ruoyi/framework/security/handle/LogoutSuccessHandlerImpl.java @@ -0,0 +1,53 @@ +package com.ruoyi.framework.security.handle; + +import java.io.IOException; +import javax.servlet.ServletException; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.context.annotation.Configuration; +import org.springframework.security.core.Authentication; +import org.springframework.security.web.authentication.logout.LogoutSuccessHandler; +import com.alibaba.fastjson.JSON; +import com.ruoyi.common.constant.Constants; +import com.ruoyi.common.constant.HttpStatus; +import com.ruoyi.common.core.domain.AjaxResult; +import com.ruoyi.common.core.domain.model.LoginUser; +import com.ruoyi.common.utils.ServletUtils; +import com.ruoyi.common.utils.StringUtils; +import com.ruoyi.framework.manager.AsyncManager; +import com.ruoyi.framework.manager.factory.AsyncFactory; +import com.ruoyi.framework.web.service.TokenService; + +/** + * 自定义退出处理类 返回成功 + * + * @author ruoyi + */ +@Configuration +public class LogoutSuccessHandlerImpl implements LogoutSuccessHandler +{ + @Autowired + private TokenService tokenService; + + /** + * 退出处理 + * + * @return + */ + @Override + public void onLogoutSuccess(HttpServletRequest request, HttpServletResponse response, Authentication authentication) + throws IOException, ServletException + { + LoginUser loginUser = tokenService.getLoginUser(request); + if (StringUtils.isNotNull(loginUser)) + { + String userName = loginUser.getUsername(); + // 删除用户缓存记录 + tokenService.delLoginUser(loginUser.getToken()); + // 记录用户退出日志 + AsyncManager.me().execute(AsyncFactory.recordLogininfor(userName, Constants.LOGOUT, "退出成功")); + } + ServletUtils.renderString(response, JSON.toJSONString(AjaxResult.error(HttpStatus.SUCCESS, "退出成功"))); + } +} diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/web/domain/Server.java b/ruoyi-framework/src/main/java/com/ruoyi/framework/web/domain/Server.java new file mode 100644 index 0000000..63b03da --- /dev/null +++ b/ruoyi-framework/src/main/java/com/ruoyi/framework/web/domain/Server.java @@ -0,0 +1,240 @@ +package com.ruoyi.framework.web.domain; + +import java.net.UnknownHostException; +import java.util.LinkedList; +import java.util.List; +import java.util.Properties; +import com.ruoyi.common.utils.Arith; +import com.ruoyi.common.utils.ip.IpUtils; +import com.ruoyi.framework.web.domain.server.Cpu; +import com.ruoyi.framework.web.domain.server.Jvm; +import com.ruoyi.framework.web.domain.server.Mem; +import com.ruoyi.framework.web.domain.server.Sys; +import com.ruoyi.framework.web.domain.server.SysFile; +import oshi.SystemInfo; +import oshi.hardware.CentralProcessor; +import oshi.hardware.CentralProcessor.TickType; +import oshi.hardware.GlobalMemory; +import oshi.hardware.HardwareAbstractionLayer; +import oshi.software.os.FileSystem; +import oshi.software.os.OSFileStore; +import oshi.software.os.OperatingSystem; +import oshi.util.Util; + +/** + * 服务器相关信息 + * + * @author ruoyi + */ +public class Server +{ + private static final int OSHI_WAIT_SECOND = 1000; + + /** + * CPU相关信息 + */ + private Cpu cpu = new Cpu(); + + /** + * 內存相关信息 + */ + private Mem mem = new Mem(); + + /** + * JVM相关信息 + */ + private Jvm jvm = new Jvm(); + + /** + * 服务器相关信息 + */ + private Sys sys = new Sys(); + + /** + * 磁盘相关信息 + */ + private List sysFiles = new LinkedList(); + + public Cpu getCpu() + { + return cpu; + } + + public void setCpu(Cpu cpu) + { + this.cpu = cpu; + } + + public Mem getMem() + { + return mem; + } + + public void setMem(Mem mem) + { + this.mem = mem; + } + + public Jvm getJvm() + { + return jvm; + } + + public void setJvm(Jvm jvm) + { + this.jvm = jvm; + } + + public Sys getSys() + { + return sys; + } + + public void setSys(Sys sys) + { + this.sys = sys; + } + + public List getSysFiles() + { + return sysFiles; + } + + public void setSysFiles(List sysFiles) + { + this.sysFiles = sysFiles; + } + + public void copyTo() throws Exception + { + SystemInfo si = new SystemInfo(); + HardwareAbstractionLayer hal = si.getHardware(); + + setCpuInfo(hal.getProcessor()); + + setMemInfo(hal.getMemory()); + + setSysInfo(); + + setJvmInfo(); + + setSysFiles(si.getOperatingSystem()); + } + + /** + * 设置CPU信息 + */ + private void setCpuInfo(CentralProcessor processor) + { + // CPU信息 + long[] prevTicks = processor.getSystemCpuLoadTicks(); + Util.sleep(OSHI_WAIT_SECOND); + long[] ticks = processor.getSystemCpuLoadTicks(); + long nice = ticks[TickType.NICE.getIndex()] - prevTicks[TickType.NICE.getIndex()]; + long irq = ticks[TickType.IRQ.getIndex()] - prevTicks[TickType.IRQ.getIndex()]; + long softirq = ticks[TickType.SOFTIRQ.getIndex()] - prevTicks[TickType.SOFTIRQ.getIndex()]; + long steal = ticks[TickType.STEAL.getIndex()] - prevTicks[TickType.STEAL.getIndex()]; + long cSys = ticks[TickType.SYSTEM.getIndex()] - prevTicks[TickType.SYSTEM.getIndex()]; + long user = ticks[TickType.USER.getIndex()] - prevTicks[TickType.USER.getIndex()]; + long iowait = ticks[TickType.IOWAIT.getIndex()] - prevTicks[TickType.IOWAIT.getIndex()]; + long idle = ticks[TickType.IDLE.getIndex()] - prevTicks[TickType.IDLE.getIndex()]; + long totalCpu = user + nice + cSys + idle + iowait + irq + softirq + steal; + cpu.setCpuNum(processor.getLogicalProcessorCount()); + cpu.setTotal(totalCpu); + cpu.setSys(cSys); + cpu.setUsed(user); + cpu.setWait(iowait); + cpu.setFree(idle); + } + + /** + * 设置内存信息 + */ + private void setMemInfo(GlobalMemory memory) + { + mem.setTotal(memory.getTotal()); + mem.setUsed(memory.getTotal() - memory.getAvailable()); + mem.setFree(memory.getAvailable()); + } + + /** + * 设置服务器信息 + */ + private void setSysInfo() + { + Properties props = System.getProperties(); + sys.setComputerName(IpUtils.getHostName()); + sys.setComputerIp(IpUtils.getHostIp()); + sys.setOsName(props.getProperty("os.name")); + sys.setOsArch(props.getProperty("os.arch")); + sys.setUserDir(props.getProperty("user.dir")); + } + + /** + * 设置Java虚拟机 + */ + private void setJvmInfo() throws UnknownHostException + { + Properties props = System.getProperties(); + jvm.setTotal(Runtime.getRuntime().totalMemory()); + jvm.setMax(Runtime.getRuntime().maxMemory()); + jvm.setFree(Runtime.getRuntime().freeMemory()); + jvm.setVersion(props.getProperty("java.version")); + jvm.setHome(props.getProperty("java.home")); + } + + /** + * 设置磁盘信息 + */ + private void setSysFiles(OperatingSystem os) + { + FileSystem fileSystem = os.getFileSystem(); + List fsArray = fileSystem.getFileStores(); + for (OSFileStore fs : fsArray) + { + long free = fs.getUsableSpace(); + long total = fs.getTotalSpace(); + long used = total - free; + SysFile sysFile = new SysFile(); + sysFile.setDirName(fs.getMount()); + sysFile.setSysTypeName(fs.getType()); + sysFile.setTypeName(fs.getName()); + sysFile.setTotal(convertFileSize(total)); + sysFile.setFree(convertFileSize(free)); + sysFile.setUsed(convertFileSize(used)); + sysFile.setUsage(Arith.mul(Arith.div(used, total, 4), 100)); + sysFiles.add(sysFile); + } + } + + /** + * 字节转换 + * + * @param size 字节大小 + * @return 转换后值 + */ + public String convertFileSize(long size) + { + long kb = 1024; + long mb = kb * 1024; + long gb = mb * 1024; + if (size >= gb) + { + return String.format("%.1f GB", (float) size / gb); + } + else if (size >= mb) + { + float f = (float) size / mb; + return String.format(f > 100 ? "%.0f MB" : "%.1f MB", f); + } + else if (size >= kb) + { + float f = (float) size / kb; + return String.format(f > 100 ? "%.0f KB" : "%.1f KB", f); + } + else + { + return String.format("%d B", size); + } + } +} diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/web/domain/server/Cpu.java b/ruoyi-framework/src/main/java/com/ruoyi/framework/web/domain/server/Cpu.java new file mode 100644 index 0000000..a13a66c --- /dev/null +++ b/ruoyi-framework/src/main/java/com/ruoyi/framework/web/domain/server/Cpu.java @@ -0,0 +1,101 @@ +package com.ruoyi.framework.web.domain.server; + +import com.ruoyi.common.utils.Arith; + +/** + * CPU相关信息 + * + * @author ruoyi + */ +public class Cpu +{ + /** + * 核心数 + */ + private int cpuNum; + + /** + * CPU总的使用率 + */ + private double total; + + /** + * CPU系统使用率 + */ + private double sys; + + /** + * CPU用户使用率 + */ + private double used; + + /** + * CPU当前等待率 + */ + private double wait; + + /** + * CPU当前空闲率 + */ + private double free; + + public int getCpuNum() + { + return cpuNum; + } + + public void setCpuNum(int cpuNum) + { + this.cpuNum = cpuNum; + } + + public double getTotal() + { + return Arith.round(Arith.mul(total, 100), 2); + } + + public void setTotal(double total) + { + this.total = total; + } + + public double getSys() + { + return Arith.round(Arith.mul(sys / total, 100), 2); + } + + public void setSys(double sys) + { + this.sys = sys; + } + + public double getUsed() + { + return Arith.round(Arith.mul(used / total, 100), 2); + } + + public void setUsed(double used) + { + this.used = used; + } + + public double getWait() + { + return Arith.round(Arith.mul(wait / total, 100), 2); + } + + public void setWait(double wait) + { + this.wait = wait; + } + + public double getFree() + { + return Arith.round(Arith.mul(free / total, 100), 2); + } + + public void setFree(double free) + { + this.free = free; + } +} diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/web/domain/server/Jvm.java b/ruoyi-framework/src/main/java/com/ruoyi/framework/web/domain/server/Jvm.java new file mode 100644 index 0000000..444b280 --- /dev/null +++ b/ruoyi-framework/src/main/java/com/ruoyi/framework/web/domain/server/Jvm.java @@ -0,0 +1,130 @@ +package com.ruoyi.framework.web.domain.server; + +import java.lang.management.ManagementFactory; +import com.ruoyi.common.utils.Arith; +import com.ruoyi.common.utils.DateUtils; + +/** + * JVM相关信息 + * + * @author ruoyi + */ +public class Jvm +{ + /** + * 当前JVM占用的内存总数(M) + */ + private double total; + + /** + * JVM最大可用内存总数(M) + */ + private double max; + + /** + * JVM空闲内存(M) + */ + private double free; + + /** + * JDK版本 + */ + private String version; + + /** + * JDK路径 + */ + private String home; + + public double getTotal() + { + return Arith.div(total, (1024 * 1024), 2); + } + + public void setTotal(double total) + { + this.total = total; + } + + public double getMax() + { + return Arith.div(max, (1024 * 1024), 2); + } + + public void setMax(double max) + { + this.max = max; + } + + public double getFree() + { + return Arith.div(free, (1024 * 1024), 2); + } + + public void setFree(double free) + { + this.free = free; + } + + public double getUsed() + { + return Arith.div(total - free, (1024 * 1024), 2); + } + + public double getUsage() + { + return Arith.mul(Arith.div(total - free, total, 4), 100); + } + + /** + * 获取JDK名称 + */ + public String getName() + { + return ManagementFactory.getRuntimeMXBean().getVmName(); + } + + public String getVersion() + { + return version; + } + + public void setVersion(String version) + { + this.version = version; + } + + public String getHome() + { + return home; + } + + public void setHome(String home) + { + this.home = home; + } + + /** + * JDK启动时间 + */ + public String getStartTime() + { + return DateUtils.parseDateToStr(DateUtils.YYYY_MM_DD_HH_MM_SS, DateUtils.getServerStartDate()); + } + + /** + * JDK运行时间 + */ + public String getRunTime() + { + return DateUtils.getDatePoor(DateUtils.getNowDate(), DateUtils.getServerStartDate()); + } + + /** + * 运行参数 + */ + public String getInputArgs() + { + return ManagementFactory.getRuntimeMXBean().getInputArguments().toString(); + } +} diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/web/domain/server/Mem.java b/ruoyi-framework/src/main/java/com/ruoyi/framework/web/domain/server/Mem.java new file mode 100644 index 0000000..13eec52 --- /dev/null +++ b/ruoyi-framework/src/main/java/com/ruoyi/framework/web/domain/server/Mem.java @@ -0,0 +1,61 @@ +package com.ruoyi.framework.web.domain.server; + +import com.ruoyi.common.utils.Arith; + +/** + * 內存相关信息 + * + * @author ruoyi + */ +public class Mem +{ + /** + * 内存总量 + */ + private double total; + + /** + * 已用内存 + */ + private double used; + + /** + * 剩余内存 + */ + private double free; + + public double getTotal() + { + return Arith.div(total, (1024 * 1024 * 1024), 2); + } + + public void setTotal(long total) + { + this.total = total; + } + + public double getUsed() + { + return Arith.div(used, (1024 * 1024 * 1024), 2); + } + + public void setUsed(long used) + { + this.used = used; + } + + public double getFree() + { + return Arith.div(free, (1024 * 1024 * 1024), 2); + } + + public void setFree(long free) + { + this.free = free; + } + + public double getUsage() + { + return Arith.mul(Arith.div(used, total, 4), 100); + } +} diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/web/domain/server/Sys.java b/ruoyi-framework/src/main/java/com/ruoyi/framework/web/domain/server/Sys.java new file mode 100644 index 0000000..45d64d9 --- /dev/null +++ b/ruoyi-framework/src/main/java/com/ruoyi/framework/web/domain/server/Sys.java @@ -0,0 +1,84 @@ +package com.ruoyi.framework.web.domain.server; + +/** + * 系统相关信息 + * + * @author ruoyi + */ +public class Sys +{ + /** + * 服务器名称 + */ + private String computerName; + + /** + * 服务器Ip + */ + private String computerIp; + + /** + * 项目路径 + */ + private String userDir; + + /** + * 操作系统 + */ + private String osName; + + /** + * 系统架构 + */ + private String osArch; + + public String getComputerName() + { + return computerName; + } + + public void setComputerName(String computerName) + { + this.computerName = computerName; + } + + public String getComputerIp() + { + return computerIp; + } + + public void setComputerIp(String computerIp) + { + this.computerIp = computerIp; + } + + public String getUserDir() + { + return userDir; + } + + public void setUserDir(String userDir) + { + this.userDir = userDir; + } + + public String getOsName() + { + return osName; + } + + public void setOsName(String osName) + { + this.osName = osName; + } + + public String getOsArch() + { + return osArch; + } + + public void setOsArch(String osArch) + { + this.osArch = osArch; + } +} diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/web/domain/server/SysFile.java b/ruoyi-framework/src/main/java/com/ruoyi/framework/web/domain/server/SysFile.java new file mode 100644 index 0000000..1320cde --- /dev/null +++ b/ruoyi-framework/src/main/java/com/ruoyi/framework/web/domain/server/SysFile.java @@ -0,0 +1,114 @@ +package com.ruoyi.framework.web.domain.server; + +/** + * 系统文件相关信息 + * + * @author ruoyi + */ +public class SysFile +{ + /** + * 盘符路径 + */ + private String dirName; + + /** + * 盘符类型 + */ + private String sysTypeName; + + /** + * 文件类型 + */ + private String typeName; + + /** + * 总大小 + */ + private String total; + + /** + * 剩余大小 + */ + private String free; + + /** + * 已经使用量 + */ + private String used; + + /** + * 资源的使用率 + */ + private double usage; + + public String getDirName() + { + return dirName; + } + + public void setDirName(String dirName) + { + this.dirName = dirName; + } + + public String getSysTypeName() + { + return sysTypeName; + } + + public void setSysTypeName(String sysTypeName) + { + this.sysTypeName = sysTypeName; + } + + public String getTypeName() + { + return typeName; + } + + public void setTypeName(String typeName) + { + this.typeName = typeName; + } + + public String getTotal() + { + return total; + } + + public void setTotal(String total) + { + this.total = total; + } + + public String getFree() + { + return free; + } + + public void setFree(String free) + { + this.free = free; + } + + public String getUsed() + { + return used; + } + + public void setUsed(String used) + { + this.used = used; + } + + public double getUsage() + { + return usage; + } + + public void setUsage(double usage) + { + this.usage = usage; + } +} diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/web/exception/GlobalExceptionHandler.java b/ruoyi-framework/src/main/java/com/ruoyi/framework/web/exception/GlobalExceptionHandler.java new file mode 100644 index 0000000..51dd8c5 --- /dev/null +++ b/ruoyi-framework/src/main/java/com/ruoyi/framework/web/exception/GlobalExceptionHandler.java @@ -0,0 +1,114 @@ +package com.ruoyi.framework.web.exception; + +import javax.servlet.http.HttpServletRequest; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.security.access.AccessDeniedException; +import org.springframework.validation.BindException; +import org.springframework.web.HttpRequestMethodNotSupportedException; +import org.springframework.web.bind.MethodArgumentNotValidException; +import org.springframework.web.bind.annotation.ExceptionHandler; +import org.springframework.web.bind.annotation.RestControllerAdvice; +import com.ruoyi.common.constant.HttpStatus; +import com.ruoyi.common.core.domain.AjaxResult; +import com.ruoyi.common.exception.DemoModeException; +import com.ruoyi.common.exception.ServiceException; +import com.ruoyi.common.utils.StringUtils; + +/** + * 全局异常处理器 + * + * @author ruoyi + */ +@RestControllerAdvice +public class GlobalExceptionHandler +{ + private static final Logger log = LoggerFactory.getLogger(GlobalExceptionHandler.class); + + /** + * 权限校验异常 + */ + @ExceptionHandler(AccessDeniedException.class) + public AjaxResult handleAccessDeniedException(AccessDeniedException 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(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(DemoModeException.class) + public AjaxResult handleDemoModeException(DemoModeException e) + { + return AjaxResult.error("演示模式，不允许操作"); + } +} diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/PermissionService.java b/ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/PermissionService.java new file mode 100644 index 0000000..68b1d69 --- /dev/null +++ b/ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/PermissionService.java @@ -0,0 +1,165 @@ +package com.ruoyi.framework.web.service; + +import java.util.Set; +import org.springframework.stereotype.Service; +import org.springframework.util.CollectionUtils; +import com.ruoyi.common.core.domain.entity.SysRole; +import com.ruoyi.common.core.domain.model.LoginUser; +import com.ruoyi.common.utils.SecurityUtils; +import com.ruoyi.common.utils.StringUtils; + +/** + * RuoYi首创 自定义权限实现，ss取自SpringSecurity首字母 + * + * @author ruoyi + */ +@Service("ss") +public class PermissionService +{ + /** 所有权限标识 */ + private static final String ALL_PERMISSION = "*:*:*"; + + /** 管理员角色权限标识 */ + private static final String SUPER_ADMIN = "admin"; + + private static final String ROLE_DELIMETER = ","; + + private static final String PERMISSION_DELIMETER = ","; + + /** + * 验证用户是否具备某权限 + * + * @param permission 权限字符串 + * @return 用户是否具备某权限 + */ + public boolean hasPermi(String permission) + { + if (StringUtils.isEmpty(permission)) + { + return false; + } + LoginUser loginUser = SecurityUtils.getLoginUser(); + if (StringUtils.isNull(loginUser) || CollectionUtils.isEmpty(loginUser.getPermissions())) + { + return false; + } + return hasPermissions(loginUser.getPermissions(), permission); + } + + /** + * 验证用户是否不具备某权限，与 hasPermi逻辑相反 + * + * @param permission 权限字符串 + * @return 用户是否不具备某权限 + */ + public boolean lacksPermi(String permission) + { + return hasPermi(permission) != true; + } + + /** + * 验证用户是否具有以下任意一个权限 + * + * @param permissions 以 PERMISSION_NAMES_DELIMETER 为分隔符的权限列表 + * @return 用户是否具有以下任意一个权限 + */ + public boolean hasAnyPermi(String permissions) + { + if (StringUtils.isEmpty(permissions)) + { + return false; + } + LoginUser loginUser = SecurityUtils.getLoginUser(); + if (StringUtils.isNull(loginUser) || CollectionUtils.isEmpty(loginUser.getPermissions())) + { + return false; + } + Set authorities = loginUser.getPermissions(); + for (String permission : permissions.split(PERMISSION_DELIMETER)) + { + if (permission != null && hasPermissions(authorities, permission)) + { + return true; + } + } + return false; + } + + /** + * 判断用户是否拥有某个角色 + * + * @param role 角色字符串 + * @return 用户是否具备某角色 + */ + public boolean hasRole(String role) + { + if (StringUtils.isEmpty(role)) + { + return false; + } + LoginUser loginUser = SecurityUtils.getLoginUser(); + if (StringUtils.isNull(loginUser) || CollectionUtils.isEmpty(loginUser.getUser().getRoles())) + { + return false; + } + for (SysRole sysRole : loginUser.getUser().getRoles()) + { + String roleKey = sysRole.getRoleKey(); + if (SUPER_ADMIN.equals(roleKey) || roleKey.equals(StringUtils.trim(role))) + { + return true; + } + } + return false; + } + + /** + * 验证用户是否不具备某角色，与 isRole逻辑相反。 + * + * @param role 角色名称 + * @return 用户是否不具备某角色 + */ + public boolean lacksRole(String role) + { + return hasRole(role) != true; + } + + /** + * 验证用户是否具有以下任意一个角色 + * + * @param roles 以 ROLE_NAMES_DELIMETER 为分隔符的角色列表 + * @return 用户是否具有以下任意一个角色 + */ + public boolean hasAnyRoles(String roles) + { + if (StringUtils.isEmpty(roles)) + { + return false; + } + LoginUser loginUser = SecurityUtils.getLoginUser(); + if (StringUtils.isNull(loginUser) || CollectionUtils.isEmpty(loginUser.getUser().getRoles())) + { + return false; + } + for (String role : roles.split(ROLE_DELIMETER)) + { + if (hasRole(role)) + { + return true; + } + } + return false; + } + + /** + * 判断是否包含权限 + * + * @param permissions 权限列表 + * @param permission 权限字符串 + * @return 用户是否具备某权限 + */ + private boolean hasPermissions(Set permissions, String permission) + { + return permissions.contains(ALL_PERMISSION) || permissions.contains(StringUtils.trim(permission)); + } +} diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/SysLoginService.java b/ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/SysLoginService.java new file mode 100644 index 0000000..e9e051b --- /dev/null +++ b/ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/SysLoginService.java @@ -0,0 +1,134 @@ +package com.ruoyi.framework.web.service; + +import javax.annotation.Resource; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.security.authentication.AuthenticationManager; +import org.springframework.security.authentication.BadCredentialsException; +import org.springframework.security.authentication.UsernamePasswordAuthenticationToken; +import org.springframework.security.core.Authentication; +import org.springframework.stereotype.Component; +import com.ruoyi.common.constant.Constants; +import com.ruoyi.common.core.domain.entity.SysUser; +import com.ruoyi.common.core.domain.model.LoginUser; +import com.ruoyi.common.core.redis.RedisCache; +import com.ruoyi.common.exception.ServiceException; +import com.ruoyi.common.exception.user.CaptchaException; +import com.ruoyi.common.exception.user.CaptchaExpireException; +import com.ruoyi.common.exception.user.UserPasswordNotMatchException; +import com.ruoyi.common.utils.DateUtils; +import com.ruoyi.common.utils.MessageUtils; +import com.ruoyi.common.utils.StringUtils; +import com.ruoyi.common.utils.ServletUtils; +import com.ruoyi.common.utils.ip.IpUtils; +import com.ruoyi.framework.manager.AsyncManager; +import com.ruoyi.framework.manager.factory.AsyncFactory; +import com.ruoyi.system.service.ISysConfigService; +import com.ruoyi.system.service.ISysUserService; + +/** + * 登录校验方法 + * + * @author ruoyi + */ +@Component +public class SysLoginService +{ + @Autowired + private TokenService tokenService; + + @Resource + private AuthenticationManager authenticationManager; + + @Autowired + private RedisCache redisCache; + + @Autowired + private ISysUserService userService; + + @Autowired + private ISysConfigService configService; + + /** + * 登录验证 + * + * @param username 用户名 + * @param password 密码 + * @param code 验证码 + * @param uuid 唯一标识 + * @return 结果 + */ + public String login(String username, String password, String code, String uuid) + { + boolean captchaOnOff = configService.selectCaptchaOnOff(); + // 验证码开关 + if (captchaOnOff) + { + validateCaptcha(username, code, uuid); + } + // 用户验证 + Authentication authentication = null; + try + { + // 该方法会去调用UserDetailsServiceImpl.loadUserByUsername + authentication = authenticationManager + .authenticate(new UsernamePasswordAuthenticationToken(username, password)); + } + catch (Exception e) + { + if (e instanceof BadCredentialsException) + { + AsyncManager.me().execute(AsyncFactory.recordLogininfor(username, Constants.LOGIN_FAIL, MessageUtils.message("user.password.not.match"))); + throw new UserPasswordNotMatchException(); + } + else + { + AsyncManager.me().execute(AsyncFactory.recordLogininfor(username, Constants.LOGIN_FAIL, e.getMessage())); + throw new ServiceException(e.getMessage()); + } + } + AsyncManager.me().execute(AsyncFactory.recordLogininfor(username, Constants.LOGIN_SUCCESS, MessageUtils.message("user.login.success"))); + LoginUser loginUser = (LoginUser) authentication.getPrincipal(); + recordLoginInfo(loginUser.getUserId()); + // 生成token + return tokenService.createToken(loginUser); + } + + /** + * 校验验证码 + * + * @param username 用户名 + * @param code 验证码 + * @param uuid 唯一标识 + * @return 结果 + */ + public void validateCaptcha(String username, String code, String uuid) + { + String verifyKey = Constants.CAPTCHA_CODE_KEY + StringUtils.nvl(uuid, ""); + String captcha = redisCache.getCacheObject(verifyKey); + redisCache.deleteObject(verifyKey); + if (captcha == null) + { + AsyncManager.me().execute(AsyncFactory.recordLogininfor(username, Constants.LOGIN_FAIL, MessageUtils.message("user.jcaptcha.expire"))); + throw new CaptchaExpireException(); + } + if (!code.equalsIgnoreCase(captcha)) + { + AsyncManager.me().execute(AsyncFactory.recordLogininfor(username, Constants.LOGIN_FAIL, MessageUtils.message("user.jcaptcha.error"))); + throw new CaptchaException(); + } + } + + /** + * 记录登录信息 + * + * @param userId 用户ID + */ + public void recordLoginInfo(Long userId) + { + SysUser sysUser = new SysUser(); + sysUser.setUserId(userId); + sysUser.setLoginIp(IpUtils.getIpAddr(ServletUtils.getRequest())); + sysUser.setLoginDate(DateUtils.getNowDate()); + userService.updateUserProfile(sysUser); + } +} diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/SysPermissionService.java b/ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/SysPermissionService.java new file mode 100644 index 0000000..feb8038 --- /dev/null +++ b/ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/SysPermissionService.java @@ -0,0 +1,66 @@ +package com.ruoyi.framework.web.service; + +import java.util.HashSet; +import java.util.Set; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Component; +import com.ruoyi.common.core.domain.entity.SysUser; +import com.ruoyi.system.service.ISysMenuService; +import com.ruoyi.system.service.ISysRoleService; + +/** + * 用户权限处理 + * + * @author ruoyi + */ +@Component +public class SysPermissionService +{ + @Autowired + private ISysRoleService roleService; + + @Autowired + private ISysMenuService menuService; + + /** + * 获取角色数据权限 + * + * @param user 用户信息 + * @return 角色权限信息 + */ + 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 user 用户信息 + * @return 菜单权限信息 + */ + public Set getMenuPermission(SysUser user) + { + Set perms = new HashSet(); + // 管理员拥有所有权限 + if (user.isAdmin()) + { + perms.add("*:*:*"); + } + else + { + perms.addAll(menuService.selectMenuPermsByUserId(user.getUserId())); + } + return perms; + } +} diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/SysRegisterService.java b/ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/SysRegisterService.java new file mode 100644 index 0000000..8cc5ced --- /dev/null +++ b/ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/SysRegisterService.java @@ -0,0 +1,115 @@ +package com.ruoyi.framework.web.service; + +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Component; +import com.ruoyi.common.constant.Constants; +import com.ruoyi.common.constant.UserConstants; +import com.ruoyi.common.core.domain.entity.SysUser; +import com.ruoyi.common.core.domain.model.RegisterBody; +import com.ruoyi.common.core.redis.RedisCache; +import com.ruoyi.common.exception.user.CaptchaException; +import com.ruoyi.common.exception.user.CaptchaExpireException; +import com.ruoyi.common.utils.MessageUtils; +import com.ruoyi.common.utils.SecurityUtils; +import com.ruoyi.common.utils.StringUtils; +import com.ruoyi.framework.manager.AsyncManager; +import com.ruoyi.framework.manager.factory.AsyncFactory; +import com.ruoyi.system.service.ISysConfigService; +import com.ruoyi.system.service.ISysUserService; + +/** + * 注册校验方法 + * + * @author ruoyi + */ +@Component +public class SysRegisterService +{ + @Autowired + private ISysUserService userService; + + @Autowired + private ISysConfigService configService; + + @Autowired + private RedisCache redisCache; + + /** + * 注册 + */ + public String register(RegisterBody registerBody) + { + String msg = "", username = registerBody.getUsername(), password = registerBody.getPassword(); + + boolean captchaOnOff = configService.selectCaptchaOnOff(); + // 验证码开关 + if (captchaOnOff) + { + validateCaptcha(username, registerBody.getCode(), registerBody.getUuid()); + } + + if (StringUtils.isEmpty(username)) + { + msg = "用户名不能为空"; + } + else if (StringUtils.isEmpty(password)) + { + msg = "用户密码不能为空"; + } + else if (username.length() < UserConstants.USERNAME_MIN_LENGTH + || username.length() > UserConstants.USERNAME_MAX_LENGTH) + { + msg = "账户长度必须在2到20个字符之间"; + } + else if (password.length() < UserConstants.PASSWORD_MIN_LENGTH + || password.length() > UserConstants.PASSWORD_MAX_LENGTH) + { + msg = "密码长度必须在5到20个字符之间"; + } + else if (UserConstants.NOT_UNIQUE.equals(userService.checkUserNameUnique(username))) + { + msg = "保存用户'" + username + "'失败，注册账号已存在"; + } + else + { + SysUser sysUser = new SysUser(); + sysUser.setUserName(username); + sysUser.setNickName(username); + sysUser.setPassword(SecurityUtils.encryptPassword(registerBody.getPassword())); + boolean regFlag = userService.registerUser(sysUser); + if (!regFlag) + { + msg = "注册失败,请联系系统管理人员"; + } + else + { + AsyncManager.me().execute(AsyncFactory.recordLogininfor(username, Constants.REGISTER, + MessageUtils.message("user.register.success"))); + } + } + return msg; + } + + /** + * 校验验证码 + * + * @param username 用户名 + * @param code 验证码 + * @param uuid 唯一标识 + * @return 结果 + */ + public void validateCaptcha(String username, String code, String uuid) + { + String verifyKey = Constants.CAPTCHA_CODE_KEY + StringUtils.nvl(uuid, ""); + String captcha = redisCache.getCacheObject(verifyKey); + redisCache.deleteObject(verifyKey); + if (captcha == null) + { + throw new CaptchaExpireException(); + } + if (!code.equalsIgnoreCase(captcha)) + { + throw new CaptchaException(); + } + } +} diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/ThirdLoginService.java b/ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/ThirdLoginService.java new file mode 100644 index 0000000..e3e4f99 --- /dev/null +++ b/ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/ThirdLoginService.java @@ -0,0 +1,172 @@ +package com.ruoyi.framework.web.service; + +import com.alibaba.fastjson.JSONObject; +import com.ruoyi.common.constant.Constants; +import com.ruoyi.common.core.domain.entity.SysUser; +import com.ruoyi.common.core.domain.model.LoginUser; +import com.ruoyi.common.exception.ServiceException; +import com.ruoyi.common.exception.user.UserPasswordNotMatchException; +import com.ruoyi.common.utils.DateUtils; +import com.ruoyi.common.utils.MessageUtils; +import com.ruoyi.common.utils.ServletUtils; +import com.ruoyi.common.utils.ip.IpUtils; +import com.ruoyi.framework.manager.AsyncManager; +import com.ruoyi.framework.manager.factory.AsyncFactory; +import com.ruoyi.system.service.ISysUserService; +import jodd.http.HttpRequest; +import jodd.http.HttpResponse; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.beans.factory.annotation.Value; +import org.springframework.http.HttpHeaders; +import org.springframework.security.authentication.AuthenticationManager; +import org.springframework.security.authentication.BadCredentialsException; +import org.springframework.security.authentication.UsernamePasswordAuthenticationToken; +import org.springframework.security.core.Authentication; +import org.springframework.security.core.context.SecurityContextHolder; +import org.springframework.security.core.userdetails.UserDetailsService; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.util.Optional; + +/** + * @projectName: RuoYi-Vue + * @package: com.ruoyi.framework.web.service + * @className: ThirdLoginService + * @author: lsyong + * @description: TODO + * @date: 2023/2/22 7:53 + * @version: 1.0 + */ +@Service +public class ThirdLoginService { + + @Autowired + private ISysUserService userService; + + @Autowired + private TokenService tokenService; + + @Resource + private AuthenticationManager authenticationManager; + @Autowired + private UserDetailsService userDetailsService; + + /** + * 无密码登录 + * @param userName + * @return + */ + public String noPwdLogin(String userName,String token){ + LoginUser loginUser + = (LoginUser)userDetailsService.loadUserByUsername(userName); + // 记录登陆信息 + AsyncManager.me().execute(AsyncFactory.recordLogininfor(userName, Constants.LOGIN_SUCCESS, + MessageUtils.message("user.login.success"))); + recordLoginInfo(loginUser.getUserId()); + return tokenService.createToken(loginUser); + } + + /** + * 不加验证码登录 + * + * @param username 用户名 + * @param password 密码 + * @param uuid 唯一标识 + * @return 结果 + */ + public String loginNoCode(String username, String password, String uuid) + { + // 用户验证 + Authentication authentication = null; + try + { + // 该方法会去调用UserDetailsServiceImpl.loadUserByUsername + UsernamePasswordAuthenticationToken authenticationToken = new UsernamePasswordAuthenticationToken(username, password); + SecurityContextHolder.getContext().setAuthentication(authenticationToken); + authentication = authenticationManager.authenticate(authenticationToken); + } + catch (Exception e) + { + if (e instanceof BadCredentialsException) + { + AsyncManager.me().execute(AsyncFactory.recordLogininfor(username, Constants.LOGIN_FAIL, MessageUtils.message("user.password.not.match"))); + throw new UserPasswordNotMatchException(); + } + else + { + AsyncManager.me().execute(AsyncFactory.recordLogininfor(username, Constants.LOGIN_FAIL, e.getMessage())); + throw new ServiceException(e.getMessage()); + } + } + AsyncManager.me().execute(AsyncFactory.recordLogininfor(username, Constants.LOGIN_SUCCESS, MessageUtils.message("user.login.success"))); + LoginUser loginUser = + (LoginUser) authentication.getPrincipal(); + recordLoginInfo(loginUser.getUserId()); + // 生成token + return tokenService.createToken(loginUser); + } + + /** + * @param token: + * @return String + * @title thirdLogin + * @descriptions 三方平台登陆 + */ + public String thirdLogin(String token) { + //调用验证token的方法（正式用的时候使用checkJToken()方法返回用户名 + JSONObject jsonObject = checkJToken(token); + String code = jsonObject.getString("code"); + if(!code.equals("200")){ + return null; + }else { + String loginName = jsonObject.getString("data"); + //根据token获取用户相关信息 + SysUser sysUser = userService.selectUserByUserName(loginName); + Optional.ofNullable(sysUser).orElseThrow(()->new ServiceException("用户不存在，请联系管理员")); + return this.noPwdLogin(sysUser.getUserName(),token); + } + } + + + /** + * 记录登录信息 + * + * @param userId 用户ID + */ + public void recordLoginInfo(Long userId) + { + SysUser sysUser = new SysUser(); + sysUser.setUserId(userId); + sysUser.setLoginIp(IpUtils.getIpAddr(ServletUtils.getRequest())); + sysUser.setLoginDate(DateUtils.getNowDate()); + userService.updateUserProfile(sysUser); + } + + + @Value("${ssoip}") + private String ssoip; + @Value("${ssoport}") + private String ssoport; + + /** + * 通过第三方平台接口，鉴定token合法性，并返回userName等登录信息 + * 这个方法需要根据实际需要进行修改 + * @param token + * @return + */ + public JSONObject checkJToken(String token) { + JSONObject jsonObject = new JSONObject(); + //测试环境 + String baseUrl = "http://"+ssoip+":"+ssoport+"/sso/getUserNameByToken?token="+token;//根据实际地址进行修改 + HttpRequest request = HttpRequest.get(baseUrl) + .header(HttpHeaders.CONTENT_TYPE, "application/json") + .header(HttpHeaders.ACCEPT, "application/json") + .header("X-Requested-With","XMLHttpRequest") + .header("satoken",token); + + HttpResponse response = request.send(); + System.out.println(JSONObject.parse(response.bodyText())); + return (JSONObject) JSONObject.parse(response.bodyText()); + } +} diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/TokenService.java b/ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/TokenService.java new file mode 100644 index 0000000..3220c99 --- /dev/null +++ b/ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/TokenService.java @@ -0,0 +1,245 @@ +package com.ruoyi.framework.web.service; + +import java.util.HashMap; +import java.util.Map; +import java.util.concurrent.TimeUnit; +import javax.servlet.http.HttpServletRequest; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.beans.factory.annotation.Value; +import org.springframework.stereotype.Component; +import com.ruoyi.common.constant.Constants; +import com.ruoyi.common.core.domain.model.LoginUser; +import com.ruoyi.common.core.redis.RedisCache; +import com.ruoyi.common.utils.ServletUtils; +import com.ruoyi.common.utils.StringUtils; +import com.ruoyi.common.utils.ip.AddressUtils; +import com.ruoyi.common.utils.ip.IpUtils; +import com.ruoyi.common.utils.uuid.IdUtils; +import eu.bitwalker.useragentutils.UserAgent; +import io.jsonwebtoken.Claims; +import io.jsonwebtoken.Jwts; +import io.jsonwebtoken.SignatureAlgorithm; + +/** + * token验证处理 + * + * @author ruoyi + */ +@Component +public class TokenService +{ + // 令牌自定义标识 + @Value("${token.header}") + private String header; + + // 令牌秘钥 + @Value("${token.secret}") + private String secret; + + // 令牌有效期（默认30分钟） + @Value("${token.expireTime}") + private int expireTime; + + protected static final long MILLIS_SECOND = 1000; + + protected static final long MILLIS_MINUTE = 60 * MILLIS_SECOND; + + private static final Long MILLIS_MINUTE_TEN = 20 * 60 * 1000L; + + @Autowired + private RedisCache redisCache; + + /** + * 获取用户身份信息 + * + * @return 用户信息 + */ + public LoginUser getLoginUser(HttpServletRequest request) + { + // 获取请求携带的令牌 + String token = getToken(request); + if (StringUtils.isNotEmpty(token)) + { + try + { + Claims claims = parseToken(token); + // 解析对应的权限以及用户信息 + String uuid = (String) claims.get(Constants.LOGIN_USER_KEY); + String userKey = getTokenKey(uuid); + LoginUser user = redisCache.getCacheObject(userKey); + return user; + } + catch (Exception e) + { + } + } + return null; + } + + + public LoginUser getThirdLoginUser(String token) + { + if (StringUtils.isNotEmpty(token)) + { + try + { + Claims claims = parseToken(token); + // 解析对应的权限以及用户信息 + String uuid = (String) claims.get(Constants.LOGIN_USER_KEY); + String userKey = getTokenKey(uuid); + LoginUser user = redisCache.getCacheObject(userKey); + return user; + } + catch (Exception e) + { + } + } + return null; + } + /** + * 设置用户身份信息 + */ + 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 = getTokenKey(token); + redisCache.deleteObject(userKey); + } + } + + /** + * 创建令牌 + * + * @param loginUser 用户信息 + * @return 令牌 + */ + public String createToken(LoginUser loginUser) + { + String token = IdUtils.fastUUID(); + loginUser.setToken(token); + setUserAgent(loginUser); + refreshToken(loginUser); + + Map claims = new HashMap<>(); + claims.put(Constants.LOGIN_USER_KEY, token); + return createToken(claims); + } + + /** + * 验证令牌有效期，相差不足20分钟，自动刷新缓存 + * + * @param loginUser + * @return 令牌 + */ + 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()); + redisCache.setCacheObject(userKey, loginUser, expireTime, TimeUnit.MINUTES); + } + + /** + * 设置用户代理信息 + * + * @param loginUser 登录信息 + */ + public void setUserAgent(LoginUser loginUser) + { + UserAgent userAgent = UserAgent.parseUserAgentString(ServletUtils.getRequest().getHeader("User-Agent")); + String ip = IpUtils.getIpAddr(ServletUtils.getRequest()); + loginUser.setIpaddr(ip); + loginUser.setLoginLocation(AddressUtils.getRealAddressByIP(ip)); + loginUser.setBrowser(userAgent.getBrowser().getName()); + loginUser.setOs(userAgent.getOperatingSystem().getName()); + } + + /** + * 从数据声明生成令牌 + * + * @param claims 数据声明 + * @return 令牌 + */ + private String createToken(Map claims) + { + String token = Jwts.builder() + .setClaims(claims) + .signWith(SignatureAlgorithm.HS512, secret).compact(); + return token; + } + + /** + * 从令牌中获取数据声明 + * + * @param token 令牌 + * @return 数据声明 + */ + private Claims parseToken(String token) + { + return Jwts.parser() + .setSigningKey(secret) + .parseClaimsJws(token) + .getBody(); + } + + /** + * 从令牌中获取用户名 + * + * @param token 令牌 + * @return 用户名 + */ + public String getUsernameFromToken(String token) + { + Claims claims = parseToken(token); + return claims.getSubject(); + } + + /** + * 获取请求token + * + * @param request + * @return token + */ + private String getToken(HttpServletRequest request) + { + String token = request.getHeader(header); + if (StringUtils.isNotEmpty(token) && token.startsWith(Constants.TOKEN_PREFIX)) + { + token = token.replace(Constants.TOKEN_PREFIX, ""); + } + return token; + } + + private String getTokenKey(String uuid) + { + return Constants.LOGIN_TOKEN_KEY + uuid; + } +} diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/UserDetailsServiceImpl.java b/ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/UserDetailsServiceImpl.java new file mode 100644 index 0000000..c8b1c7b --- /dev/null +++ b/ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/UserDetailsServiceImpl.java @@ -0,0 +1,60 @@ +package com.ruoyi.framework.web.service; + +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.security.core.userdetails.UserDetails; +import org.springframework.security.core.userdetails.UserDetailsService; +import org.springframework.security.core.userdetails.UsernameNotFoundException; +import org.springframework.stereotype.Service; +import com.ruoyi.common.core.domain.entity.SysUser; +import com.ruoyi.common.core.domain.model.LoginUser; +import com.ruoyi.common.enums.UserStatus; +import com.ruoyi.common.exception.ServiceException; +import com.ruoyi.common.utils.StringUtils; +import com.ruoyi.system.service.ISysUserService; + +/** + * 用户验证处理 + * + * @author ruoyi + */ +@Service +public class UserDetailsServiceImpl implements UserDetailsService +{ + private static final Logger log = LoggerFactory.getLogger(UserDetailsServiceImpl.class); + + @Autowired + private ISysUserService userService; + + @Autowired + private SysPermissionService permissionService; + + @Override + public UserDetails loadUserByUsername(String username) throws UsernameNotFoundException + { + SysUser user = userService.selectUserByUserName(username); + if (StringUtils.isNull(user)) + { + log.info("登录用户：{} 不存在.", username); + throw new ServiceException("登录用户：" + username + " 不存在"); + } + else if (UserStatus.DELETED.getCode().equals(user.getDelFlag())) + { + log.info("登录用户：{} 已被删除.", username); + throw new ServiceException("对不起，您的账号：" + username + " 已被删除"); + } + else if (UserStatus.DISABLE.getCode().equals(user.getStatus())) + { + log.info("登录用户：{} 已被停用.", username); + throw new ServiceException("对不起，您的账号：" + username + " 已停用"); + } + + return createLoginUser(user); + } + + public UserDetails createLoginUser(SysUser user) + { + return new LoginUser(user.getUserId(), user.getDeptId(), user, permissionService.getMenuPermission(user)); + } +} diff --git a/ruoyi-generator/pom.xml b/ruoyi-generator/pom.xml new file mode 100644 index 0000000..f173cc8 --- /dev/null +++ b/ruoyi-generator/pom.xml @@ -0,0 +1,40 @@ + + + + ruoyi + com.ruoyi + 3.8.1 + + 4.0.0 + + ruoyi-generator + + + generator代码生成 + + + + + + + org.apache.velocity + velocity-engine-core + + + + + commons-collections + commons-collections + + + + + com.ruoyi + ruoyi-common + + + + + diff --git a/ruoyi-generator/src/main/java/com/ruoyi/generator/config/GenConfig.java b/ruoyi-generator/src/main/java/com/ruoyi/generator/config/GenConfig.java new file mode 100644 index 0000000..cc4cd14 --- /dev/null +++ b/ruoyi-generator/src/main/java/com/ruoyi/generator/config/GenConfig.java @@ -0,0 +1,73 @@ +package com.ruoyi.generator.config; + +import org.springframework.beans.factory.annotation.Value; +import org.springframework.boot.context.properties.ConfigurationProperties; +import org.springframework.context.annotation.PropertySource; +import org.springframework.stereotype.Component; + +/** + * 读取代码生成相关配置 + * + * @author ruoyi + */ +@Component +@ConfigurationProperties(prefix = "gen") +@PropertySource(value = { "classpath:generator.yml" }) +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; + } + + @Value("${author}") + public void setAuthor(String author) + { + GenConfig.author = author; + } + + public static String getPackageName() + { + return packageName; + } + + @Value("${packageName}") + public void setPackageName(String packageName) + { + GenConfig.packageName = packageName; + } + + public static boolean getAutoRemovePre() + { + return autoRemovePre; + } + + @Value("${autoRemovePre}") + public void setAutoRemovePre(boolean autoRemovePre) + { + GenConfig.autoRemovePre = autoRemovePre; + } + + public static String getTablePrefix() + { + return tablePrefix; + } + + @Value("${tablePrefix}") + public void setTablePrefix(String tablePrefix) + { + GenConfig.tablePrefix = tablePrefix; + } +} diff --git a/ruoyi-generator/src/main/java/com/ruoyi/generator/controller/GenController.java b/ruoyi-generator/src/main/java/com/ruoyi/generator/controller/GenController.java new file mode 100644 index 0000000..8521b53 --- /dev/null +++ b/ruoyi-generator/src/main/java/com/ruoyi/generator/controller/GenController.java @@ -0,0 +1,214 @@ +package com.ruoyi.generator.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.security.access.prepost.PreAuthorize; +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.ruoyi.common.annotation.Log; +import com.ruoyi.common.core.controller.BaseController; +import com.ruoyi.common.core.domain.AjaxResult; +import com.ruoyi.common.core.page.TableDataInfo; +import com.ruoyi.common.core.text.Convert; +import com.ruoyi.common.enums.BusinessType; +import com.ruoyi.generator.domain.GenTable; +import com.ruoyi.generator.domain.GenTableColumn; +import com.ruoyi.generator.service.IGenTableColumnService; +import com.ruoyi.generator.service.IGenTableService; + +/** + * 代码生成 操作处理 + * + * @author ruoyi + */ +@RestController +@RequestMapping("/tool/gen") +public class GenController extends BaseController +{ + @Autowired + private IGenTableService genTableService; + + @Autowired + private IGenTableColumnService genTableColumnService; + + /** + * 查询代码生成列表 + */ + @PreAuthorize("@ss.hasPermi('tool:gen:list')") + @GetMapping("/list") + public TableDataInfo genList(GenTable genTable) + { + startPage(); + List list = genTableService.selectGenTableList(genTable); + return getDataTable(list); + } + + /** + * 修改代码生成业务 + */ + @PreAuthorize("@ss.hasPermi('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 AjaxResult.success(map); + } + + /** + * 查询数据库列表 + */ + @PreAuthorize("@ss.hasPermi('tool:gen:list')") + @GetMapping("/db/list") + public TableDataInfo dataList(GenTable genTable) + { + startPage(); + List list = genTableService.selectDbTableList(genTable); + return getDataTable(list); + } + + /** + * 查询数据表字段列表 + */ + @PreAuthorize("@ss.hasPermi('tool:gen: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; + } + + /** + * 导入表结构（保存） + */ + @PreAuthorize("@ss.hasPermi('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 AjaxResult.success(); + } + + /** + * 修改保存代码生成业务 + */ + @PreAuthorize("@ss.hasPermi('tool:gen:edit')") + @Log(title = "代码生成", businessType = BusinessType.UPDATE) + @PutMapping + public AjaxResult editSave(@Validated @RequestBody GenTable genTable) + { + genTableService.validateEdit(genTable); + genTableService.updateGenTable(genTable); + return AjaxResult.success(); + } + + /** + * 删除代码生成 + */ + @PreAuthorize("@ss.hasPermi('tool:gen:remove')") + @Log(title = "代码生成", businessType = BusinessType.DELETE) + @DeleteMapping("/{tableIds}") + public AjaxResult remove(@PathVariable Long[] tableIds) + { + genTableService.deleteGenTableByIds(tableIds); + return AjaxResult.success(); + } + + /** + * 预览代码 + */ + @PreAuthorize("@ss.hasPermi('tool:gen:preview')") + @GetMapping("/preview/{tableId}") + public AjaxResult preview(@PathVariable("tableId") Long tableId) throws IOException + { + Map dataMap = genTableService.previewCode(tableId); + return AjaxResult.success(dataMap); + } + + /** + * 生成代码（下载方式） + */ + @PreAuthorize("@ss.hasPermi('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); + } + + /** + * 生成代码（自定义路径） + */ + @PreAuthorize("@ss.hasPermi('tool:gen:code')") + @Log(title = "代码生成", businessType = BusinessType.GENCODE) + @GetMapping("/genCode/{tableName}") + public AjaxResult genCode(@PathVariable("tableName") String tableName) + { + genTableService.generatorCode(tableName); + return AjaxResult.success(); + } + + /** + * 同步数据库 + */ + @PreAuthorize("@ss.hasPermi('tool:gen:edit')") + @Log(title = "代码生成", businessType = BusinessType.UPDATE) + @GetMapping("/synchDb/{tableName}") + public AjaxResult synchDb(@PathVariable("tableName") String tableName) + { + genTableService.synchDb(tableName); + return AjaxResult.success(); + } + + /** + * 批量生成代码 + */ + @PreAuthorize("@ss.hasPermi('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.addHeader("Access-Control-Allow-Origin", "*"); + response.addHeader("Access-Control-Expose-Headers", "Content-Disposition"); + 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()); + } +} \ No newline at end of file diff --git a/ruoyi-generator/src/main/java/com/ruoyi/generator/domain/GenTable.java b/ruoyi-generator/src/main/java/com/ruoyi/generator/domain/GenTable.java new file mode 100644 index 0000000..269779c --- /dev/null +++ b/ruoyi-generator/src/main/java/com/ruoyi/generator/domain/GenTable.java @@ -0,0 +1,372 @@ +package com.ruoyi.generator.domain; + +import java.util.List; +import javax.validation.Valid; +import javax.validation.constraints.NotBlank; +import org.apache.commons.lang3.ArrayUtils; +import com.ruoyi.common.constant.GenConstants; +import com.ruoyi.common.core.domain.BaseEntity; +import com.ruoyi.common.utils.StringUtils; + +/** + * 业务表 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; + + /** 生成包路径 */ + @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 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); + } +} \ No newline at end of file diff --git a/ruoyi-generator/src/main/java/com/ruoyi/generator/domain/GenTableColumn.java b/ruoyi-generator/src/main/java/com/ruoyi/generator/domain/GenTableColumn.java new file mode 100644 index 0000000..d1733b6 --- /dev/null +++ b/ruoyi-generator/src/main/java/com/ruoyi/generator/domain/GenTableColumn.java @@ -0,0 +1,373 @@ +package com.ruoyi.generator.domain; + +import javax.validation.constraints.NotBlank; +import com.ruoyi.common.core.domain.BaseEntity; +import com.ruoyi.common.utils.StringUtils; + +/** + * 代码生成业务字段表 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; + } + } +} diff --git a/ruoyi-generator/src/main/java/com/ruoyi/generator/mapper/GenTableColumnMapper.java b/ruoyi-generator/src/main/java/com/ruoyi/generator/mapper/GenTableColumnMapper.java new file mode 100644 index 0000000..951e166 --- /dev/null +++ b/ruoyi-generator/src/main/java/com/ruoyi/generator/mapper/GenTableColumnMapper.java @@ -0,0 +1,60 @@ +package com.ruoyi.generator.mapper; + +import java.util.List; +import com.ruoyi.generator.domain.GenTableColumn; + +/** + * 业务字段 数据层 + * + * @author ruoyi + */ +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); +} diff --git a/ruoyi-generator/src/main/java/com/ruoyi/generator/mapper/GenTableMapper.java b/ruoyi-generator/src/main/java/com/ruoyi/generator/mapper/GenTableMapper.java new file mode 100644 index 0000000..9b330df --- /dev/null +++ b/ruoyi-generator/src/main/java/com/ruoyi/generator/mapper/GenTableMapper.java @@ -0,0 +1,83 @@ +package com.ruoyi.generator.mapper; + +import java.util.List; +import com.ruoyi.generator.domain.GenTable; + +/** + * 业务 数据层 + * + * @author ruoyi + */ +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); +} diff --git a/ruoyi-generator/src/main/java/com/ruoyi/generator/service/GenTableColumnServiceImpl.java b/ruoyi-generator/src/main/java/com/ruoyi/generator/service/GenTableColumnServiceImpl.java new file mode 100644 index 0000000..0679689 --- /dev/null +++ b/ruoyi-generator/src/main/java/com/ruoyi/generator/service/GenTableColumnServiceImpl.java @@ -0,0 +1,68 @@ +package com.ruoyi.generator.service; + +import java.util.List; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import com.ruoyi.common.core.text.Convert; +import com.ruoyi.generator.domain.GenTableColumn; +import com.ruoyi.generator.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)); + } +} diff --git a/ruoyi-generator/src/main/java/com/ruoyi/generator/service/GenTableServiceImpl.java b/ruoyi-generator/src/main/java/com/ruoyi/generator/service/GenTableServiceImpl.java new file mode 100644 index 0000000..168b4c8 --- /dev/null +++ b/ruoyi-generator/src/main/java/com/ruoyi/generator/service/GenTableServiceImpl.java @@ -0,0 +1,521 @@ +package com.ruoyi.generator.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.fastjson.JSON; +import com.alibaba.fastjson.JSONObject; +import com.ruoyi.common.constant.Constants; +import com.ruoyi.common.constant.GenConstants; +import com.ruoyi.common.core.text.CharsetKit; +import com.ruoyi.common.exception.ServiceException; +import com.ruoyi.common.utils.SecurityUtils; +import com.ruoyi.common.utils.StringUtils; +import com.ruoyi.generator.domain.GenTable; +import com.ruoyi.generator.domain.GenTableColumn; +import com.ruoyi.generator.mapper.GenTableColumnMapper; +import com.ruoyi.generator.mapper.GenTableMapper; +import com.ruoyi.generator.util.GenUtils; +import com.ruoyi.generator.util.VelocityInitializer; +import com.ruoyi.generator.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 + 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 + public void deleteGenTableByIds(Long[] tableIds) + { + genTableMapper.deleteGenTableByIds(tableIds); + genTableColumnMapper.deleteGenTableColumnByIds(tableIds); + } + + /** + * 导入表结构 + * + * @param tableList 导入表列表 + */ + @Override + @Transactional + 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()); + 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()); + 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 + 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()); + 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 = JSONObject.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 = JSONObject.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); + } +} \ No newline at end of file diff --git a/ruoyi-generator/src/main/java/com/ruoyi/generator/service/IGenTableColumnService.java b/ruoyi-generator/src/main/java/com/ruoyi/generator/service/IGenTableColumnService.java new file mode 100644 index 0000000..3037f70 --- /dev/null +++ b/ruoyi-generator/src/main/java/com/ruoyi/generator/service/IGenTableColumnService.java @@ -0,0 +1,44 @@ +package com.ruoyi.generator.service; + +import java.util.List; +import com.ruoyi.generator.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/ruoyi-generator/src/main/java/com/ruoyi/generator/service/IGenTableService.java b/ruoyi-generator/src/main/java/com/ruoyi/generator/service/IGenTableService.java new file mode 100644 index 0000000..9d53f95 --- /dev/null +++ b/ruoyi-generator/src/main/java/com/ruoyi/generator/service/IGenTableService.java @@ -0,0 +1,121 @@ +package com.ruoyi.generator.service; + +import java.util.List; +import java.util.Map; +import com.ruoyi.generator.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/ruoyi-generator/src/main/java/com/ruoyi/generator/util/GenUtils.java b/ruoyi-generator/src/main/java/com/ruoyi/generator/util/GenUtils.java new file mode 100644 index 0000000..e7ebc20 --- /dev/null +++ b/ruoyi-generator/src/main/java/com/ruoyi/generator/util/GenUtils.java @@ -0,0 +1,257 @@ +package com.ruoyi.generator.util; + +import java.util.Arrays; +import org.apache.commons.lang3.RegExUtils; +import com.ruoyi.common.constant.GenConstants; +import com.ruoyi.common.utils.StringUtils; +import com.ruoyi.generator.config.GenConfig; +import com.ruoyi.generator.domain.GenTable; +import com.ruoyi.generator.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/ruoyi-generator/src/main/java/com/ruoyi/generator/util/VelocityInitializer.java b/ruoyi-generator/src/main/java/com/ruoyi/generator/util/VelocityInitializer.java new file mode 100644 index 0000000..9f69403 --- /dev/null +++ b/ruoyi-generator/src/main/java/com/ruoyi/generator/util/VelocityInitializer.java @@ -0,0 +1,34 @@ +package com.ruoyi.generator.util; + +import java.util.Properties; +import org.apache.velocity.app.Velocity; +import com.ruoyi.common.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/ruoyi-generator/src/main/java/com/ruoyi/generator/util/VelocityUtils.java b/ruoyi-generator/src/main/java/com/ruoyi/generator/util/VelocityUtils.java new file mode 100644 index 0000000..9a05b69 --- /dev/null +++ b/ruoyi-generator/src/main/java/com/ruoyi/generator/util/VelocityUtils.java @@ -0,0 +1,401 @@ +package com.ruoyi.generator.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.fastjson.JSONObject; +import com.ruoyi.common.constant.GenConstants; +import com.ruoyi.common.utils.DateUtils; +import com.ruoyi.common.utils.StringUtils; +import com.ruoyi.generator.domain.GenTable; +import com.ruoyi.generator.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 = JSONObject.parseObject(options); + String parentMenuId = getParentMenuId(paramsObj); + context.put("parentMenuId", parentMenuId); + } + + public static void setTreeVelocityContext(VelocityContext context, GenTable genTable) + { + String options = genTable.getOptions(); + JSONObject paramsObj = JSONObject.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())); + } + + /** + * 获取模板信息 + * + * @return 模板列表 + */ + public static List getTemplateList(String tplCategory) + { + 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("vm/vue/index.vue.vm"); + } + else if (GenConstants.TPL_TREE.equals(tplCategory)) + { + templates.add("vm/vue/index-tree.vue.vm"); + } + else if (GenConstants.TPL_SUB.equals(tplCategory)) + { + templates.add("vm/vue/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 = JSONObject.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/ruoyi-generator/src/main/resources/generator.yml b/ruoyi-generator/src/main/resources/generator.yml new file mode 100644 index 0000000..5bd3dd6 --- /dev/null +++ b/ruoyi-generator/src/main/resources/generator.yml @@ -0,0 +1,10 @@ +# 代码生成 +gen: + # 作者 + author: ruoyi + # 默认生成包路径 system 需改成自己的模块名称 如 system monitor tool + packageName: com.ruoyi.system + # 自动去除表前缀，默认是false + autoRemovePre: false + # 表前缀（生成类名不会包含表前缀，多个用逗号分隔） + tablePrefix: sys_ \ No newline at end of file diff --git a/ruoyi-generator/src/main/resources/mapper/generator/GenTableColumnMapper.xml b/ruoyi-generator/src/main/resources/mapper/generator/GenTableColumnMapper.xml new file mode 100644 index 0000000..5fa790f --- /dev/null +++ b/ruoyi-generator/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/ruoyi-generator/src/main/resources/mapper/generator/GenTableMapper.xml b/ruoyi-generator/src/main/resources/mapper/generator/GenTableMapper.xml new file mode 100644 index 0000000..b605e90 --- /dev/null +++ b/ruoyi-generator/src/main/resources/mapper/generator/GenTableMapper.xml @@ -0,0 +1,202 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + select table_id, table_name, table_comment, sub_table_name, sub_table_fk_name, class_name, tpl_category, 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, + package_name, + module_name, + business_name, + function_name, + function_author, + gen_type, + gen_path, + remark, + create_by, + create_time + )values( + #{tableName}, + #{tableComment}, + #{className}, + #{tplCategory}, + #{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}, + 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/ruoyi-generator/src/main/resources/vm/java/controller.java.vm b/ruoyi-generator/src/main/resources/vm/java/controller.java.vm new file mode 100644 index 0000000..00e0dd9 --- /dev/null +++ b/ruoyi-generator/src/main/resources/vm/java/controller.java.vm @@ -0,0 +1,106 @@ +package ${packageName}.controller; + +import java.util.List; +import java.util.Arrays; +import java.util.Map; +import javax.servlet.http.HttpServletResponse; +import javax.annotation.Resource; +import com.ruoyi.common.core.page.R; +import org.springframework.security.access.prepost.PreAuthorize; +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.RequestParam; +import org.springframework.web.bind.annotation.RestController; +import com.ruoyi.common.annotation.Log; +import com.ruoyi.common.core.controller.BaseController; +import com.ruoyi.common.enums.BusinessType; +import ${packageName}.domain.${ClassName}; +import ${packageName}.service.I${ClassName}Service; +import com.ruoyi.common.utils.poi.ExcelUtil; +/** + * ${functionName}Controller + * + * @author ${author} + * @date ${datetime} + */ +@RestController +@RequestMapping("/${moduleName}/${businessName}") +public class ${ClassName}Controller extends BaseController +{ + @Resource + private I${ClassName}Service ${className}Service; + + /** + * 查询列表 + */ + @PreAuthorize("@ss.hasPermi('${permissionPrefix}:list')") + @RequestMapping("/list") + public R list(@RequestParam Map params){ + return ${className}Service.queryPage(params); + } + + /** + * 获取详细信息 + */ + @RequestMapping("/info/{${pkColumn.javaField}}") + @PreAuthorize("@ss.hasPermi('${permissionPrefix}:query')") + public R info(@PathVariable("${pkColumn.javaField}") ${pkColumn.javaType} ${pkColumn.javaField}){ + ${ClassName} ${className} = ${className}Service.getById(${pkColumn.javaField}); + + return R.ok().put("data", ${className}); + } + + + /** + * 导出列表 + */ + @PreAuthorize("@ss.hasPermi('${permissionPrefix}:export')") + @Log(title = "列表", businessType = BusinessType.EXPORT) + @PostMapping("/export") + public void export(HttpServletResponse response, ${ClassName} ${className}) + { + List<${ClassName}> list = ${className}Service.list(); + ExcelUtil<${ClassName}> util = new ExcelUtil<${ClassName}>(${ClassName}.class); + util.exportExcel(response, list, "列表数据"); + } + + /** + * 新增 + */ + @RequestMapping("/add") + @Log(title = "${ClassName}", businessType = BusinessType.INSERT) + @PreAuthorize("@ss.hasPermi('${permissionPrefix}:add')") + public R add(@RequestBody ${ClassName} ${className}){ + ${className}Service.save(${className}); + return R.ok(); + } + + /** + * 修改 + */ + @RequestMapping("/edit") + @PreAuthorize("@ss.hasPermi('${permissionPrefix}:edit')") + @Log(title = "${ClassName}", businessType = BusinessType.UPDATE) + public R edit(@RequestBody ${ClassName} ${className}){ + ${className}Service.updateById(${className}); + return R.ok(); + } + + /** + * 删除 + */ + @RequestMapping("/delete/{${pkColumn.javaField}s}") + @PreAuthorize("@ss.hasPermi('${permissionPrefix}:remove')") + @Log(title = "${ClassName}", businessType = BusinessType.DELETE) + public R delete(@PathVariable ${pkColumn.javaType}[] ${pkColumn.javaField}s){ + ${className}Service.removeByIds(Arrays.asList(${pkColumn.javaField}s)); + return R.ok(); + } + +} diff --git a/ruoyi-generator/src/main/resources/vm/java/domain.java.vm b/ruoyi-generator/src/main/resources/vm/java/domain.java.vm new file mode 100644 index 0000000..bc1a28f --- /dev/null +++ b/ruoyi-generator/src/main/resources/vm/java/domain.java.vm @@ -0,0 +1,52 @@ +package ${packageName}.domain; + +#foreach ($import in $importList) +import ${import}; +#end +import com.baomidou.mybatisplus.annotation.IdType; +import org.apache.commons.lang3.builder.ToStringBuilder; +import org.apache.commons.lang3.builder.ToStringStyle; +import com.baomidou.mybatisplus.annotation.TableName; +import com.baomidou.mybatisplus.annotation.TableId; +import com.ruoyi.common.annotation.Excel; +import java.io.Serializable; +import lombok.Data; + + +/** + * ${functionName}对象 ${tableName} + * + * @author ${author} + * @date ${datetime} + */ +@Data +@TableName("${tableName}") +public class ${ClassName} implements Serializable +{ + 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 +#end + #if($column.columnName == $pkColumn.columnName) + @TableId(type = IdType.INPUT) + #end + private $column.javaType $column.javaField; + +#end +#end +#if($table.sub) + /** $table.subTable.functionName信息 */ + private List<${subClassName}> ${subclassName}List; + +#end + +} diff --git a/ruoyi-generator/src/main/resources/vm/java/mapper.java.vm b/ruoyi-generator/src/main/resources/vm/java/mapper.java.vm new file mode 100644 index 0000000..ee91132 --- /dev/null +++ b/ruoyi-generator/src/main/resources/vm/java/mapper.java.vm @@ -0,0 +1,18 @@ +package ${packageName}.mapper; + +import java.util.List; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import org.apache.ibatis.annotations.Mapper; +import ${packageName}.domain.${ClassName}; + +/** + * Mapper接口 + * + * @author ${author} + * @date ${datetime} + */ +@Mapper +public interface ${ClassName}Mapper extends BaseMapper<${ClassName}> +{ + +} diff --git a/ruoyi-generator/src/main/resources/vm/java/service.java.vm b/ruoyi-generator/src/main/resources/vm/java/service.java.vm new file mode 100644 index 0000000..5485a3d --- /dev/null +++ b/ruoyi-generator/src/main/resources/vm/java/service.java.vm @@ -0,0 +1,21 @@ +package ${packageName}.service; + +import com.baomidou.mybatisplus.extension.service.IService; +import com.ruoyi.common.core.page.R; +import java.util.Map; +import ${packageName}.domain.${ClassName}; + +/** + * Service接口 + * + * @author ${author} + * @date ${datetime} + */ +public interface I${ClassName}Service extends IService<${ClassName}> +{ + /** + * 查询 + */ + R queryPage(Map params); + +} diff --git a/ruoyi-generator/src/main/resources/vm/java/serviceImpl.java.vm b/ruoyi-generator/src/main/resources/vm/java/serviceImpl.java.vm new file mode 100644 index 0000000..aa8667c --- /dev/null +++ b/ruoyi-generator/src/main/resources/vm/java/serviceImpl.java.vm @@ -0,0 +1,33 @@ +package ${packageName}.service.impl; + +import java.util.Map; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.ruoyi.common.core.page.R; +import com.ruoyi.common.utils.Query; +import org.springframework.stereotype.Service; +import ${packageName}.mapper.${ClassName}Mapper; +import ${packageName}.domain.${ClassName}; +import ${packageName}.service.I${ClassName}Service; + +/** + * Service业务层处理 + * + * @author ${author} + * @date ${datetime} + */ +@Service("${className}Service") +public class ${ClassName}ServiceImpl extends ServiceImpl<${ClassName}Mapper, ${ClassName}> implements I${ClassName}Service +{ + @Override + public R queryPage(Map params) { + IPage<${ClassName}> page = this.page( + new Query<${ClassName}>().getPage(params), + new QueryWrapper<${ClassName}>() + ); + + return R.ok().put("count", page.getTotal()).put("data", page.getRecords()); + } + +} diff --git a/ruoyi-generator/src/main/resources/vm/java/sub-domain.java.vm b/ruoyi-generator/src/main/resources/vm/java/sub-domain.java.vm new file mode 100644 index 0000000..a3f53eb --- /dev/null +++ b/ruoyi-generator/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.ruoyi.common.annotation.Excel; +import com.ruoyi.common.core.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/ruoyi-generator/src/main/resources/vm/js/api.js.vm b/ruoyi-generator/src/main/resources/vm/js/api.js.vm new file mode 100644 index 0000000..9295524 --- /dev/null +++ b/ruoyi-generator/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/ruoyi-generator/src/main/resources/vm/sql/sql.vm b/ruoyi-generator/src/main/resources/vm/sql/sql.vm new file mode 100644 index 0000000..0575583 --- /dev/null +++ b/ruoyi-generator/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/ruoyi-generator/src/main/resources/vm/vue/index-tree.vue.vm b/ruoyi-generator/src/main/resources/vm/vue/index-tree.vue.vm new file mode 100644 index 0000000..d9a5c45 --- /dev/null +++ b/ruoyi-generator/src/main/resources/vm/vue/index-tree.vue.vm @@ -0,0 +1,480 @@ + + + diff --git a/ruoyi-generator/src/main/resources/vm/vue/index.vue.vm b/ruoyi-generator/src/main/resources/vm/vue/index.vue.vm new file mode 100644 index 0000000..4a6e907 --- /dev/null +++ b/ruoyi-generator/src/main/resources/vm/vue/index.vue.vm @@ -0,0 +1,541 @@ + + + diff --git a/ruoyi-generator/src/main/resources/vm/vue/v3/index-tree.vue.vm b/ruoyi-generator/src/main/resources/vm/vue/v3/index-tree.vue.vm new file mode 100644 index 0000000..d57bbdf --- /dev/null +++ b/ruoyi-generator/src/main/resources/vm/vue/v3/index-tree.vue.vm @@ -0,0 +1,464 @@ + + + diff --git a/ruoyi-generator/src/main/resources/vm/vue/v3/index.vue.vm b/ruoyi-generator/src/main/resources/vm/vue/v3/index.vue.vm new file mode 100644 index 0000000..a363ef3 --- /dev/null +++ b/ruoyi-generator/src/main/resources/vm/vue/v3/index.vue.vm @@ -0,0 +1,596 @@ + + + diff --git a/ruoyi-generator/src/main/resources/vm/vue/v3/readme.txt b/ruoyi-generator/src/main/resources/vm/vue/v3/readme.txt new file mode 100644 index 0000000..99239bb --- /dev/null +++ b/ruoyi-generator/src/main/resources/vm/vue/v3/readme.txt @@ -0,0 +1 @@ +ʹõRuoYi-Vue3ǰˣôҪһ´Ŀ¼ģindex.vue.vmindex-tree.vue.vmļϼvueĿ¼ \ No newline at end of file diff --git a/ruoyi-generator/src/main/resources/vm/xml/mapper.xml.vm b/ruoyi-generator/src/main/resources/vm/xml/mapper.xml.vm new file mode 100644 index 0000000..9fb48d9 --- /dev/null +++ b/ruoyi-generator/src/main/resources/vm/xml/mapper.xml.vm @@ -0,0 +1,7 @@ + + + + + diff --git a/ruoyi-quartz/pom.xml b/ruoyi-quartz/pom.xml new file mode 100644 index 0000000..1e1f855 --- /dev/null +++ b/ruoyi-quartz/pom.xml @@ -0,0 +1,46 @@ + + + + ruoyi + com.ruoyi + 3.8.1 + + 4.0.0 + + ruoyi-quartz + + + quartz定时任务 + + + + + + + org.quartz-scheduler + quartz + + + com.mchange + c3p0 + + + + + + + com.ruoyi + ruoyi-common + + + + com.ruoyi + ruoyi-api + + + + + + diff --git a/ruoyi-quartz/src/main/java/com/ruoyi/quartz/config/ScheduleConfig.java b/ruoyi-quartz/src/main/java/com/ruoyi/quartz/config/ScheduleConfig.java new file mode 100644 index 0000000..a558170 --- /dev/null +++ b/ruoyi-quartz/src/main/java/com/ruoyi/quartz/config/ScheduleConfig.java @@ -0,0 +1,57 @@ +//package com.ruoyi.quartz.config; +// +//import org.springframework.context.annotation.Bean; +//import org.springframework.context.annotation.Configuration; +//import org.springframework.scheduling.quartz.SchedulerFactoryBean; +//import javax.sql.DataSource; +//import java.util.Properties; +// +///** +// * 定时任务配置（单机部署建议删除此类和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", "1"); +// 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/ruoyi-quartz/src/main/java/com/ruoyi/quartz/controller/SysJobController.java b/ruoyi-quartz/src/main/java/com/ruoyi/quartz/controller/SysJobController.java new file mode 100644 index 0000000..f248430 --- /dev/null +++ b/ruoyi-quartz/src/main/java/com/ruoyi/quartz/controller/SysJobController.java @@ -0,0 +1,185 @@ +package com.ruoyi.quartz.controller; + +import java.util.List; +import javax.servlet.http.HttpServletResponse; +import org.quartz.SchedulerException; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.security.access.prepost.PreAuthorize; +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.ruoyi.common.annotation.Log; +import com.ruoyi.common.constant.Constants; +import com.ruoyi.common.core.controller.BaseController; +import com.ruoyi.common.core.domain.AjaxResult; +import com.ruoyi.common.core.page.TableDataInfo; +import com.ruoyi.common.enums.BusinessType; +import com.ruoyi.common.exception.job.TaskException; +import com.ruoyi.common.utils.StringUtils; +import com.ruoyi.common.utils.poi.ExcelUtil; +import com.ruoyi.quartz.domain.SysJob; +import com.ruoyi.quartz.service.ISysJobService; +import com.ruoyi.quartz.util.CronUtils; +import com.ruoyi.quartz.util.ScheduleUtils; + +/** + * 调度任务信息操作处理 + * + * @author ruoyi + */ +@RestController +@RequestMapping("/monitor/job") +public class SysJobController extends BaseController +{ + @Autowired + private ISysJobService jobService; + + /** + * 查询定时任务列表 + */ + @PreAuthorize("@ss.hasPermi('monitor:job:list')") + @GetMapping("/list") + public TableDataInfo list(SysJob sysJob) + { + startPage(); + List list = jobService.selectJobList(sysJob); + return getDataTable(list); + } + + /** + * 导出定时任务列表 + */ + @PreAuthorize("@ss.hasPermi('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, "定时任务"); + } + + /** + * 获取定时任务详细信息 + */ + @PreAuthorize("@ss.hasPermi('monitor:job:query')") + @GetMapping(value = "/{jobId}") + public AjaxResult getInfo(@PathVariable("jobId") Long jobId) + { + return AjaxResult.success(jobService.selectJobById(jobId)); + } + + /** + * 新增定时任务 + */ + @PreAuthorize("@ss.hasPermi('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(getUsername()); + return toAjax(jobService.insertJob(job)); + } + + /** + * 修改定时任务 + */ + @PreAuthorize("@ss.hasPermi('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(getUsername()); + return toAjax(jobService.updateJob(job)); + } + + /** + * 定时任务状态修改 + */ + @PreAuthorize("@ss.hasPermi('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)); + } + + /** + * 定时任务立即执行一次 + */ + @PreAuthorize("@ss.hasPermi('monitor:job:changeStatus')") + @Log(title = "定时任务", businessType = BusinessType.UPDATE) + @PutMapping("/run") + public AjaxResult run(@RequestBody SysJob job) throws SchedulerException + { + jobService.run(job); + return AjaxResult.success(); + } + + /** + * 删除定时任务 + */ + @PreAuthorize("@ss.hasPermi('monitor:job:remove')") + @Log(title = "定时任务", businessType = BusinessType.DELETE) + @DeleteMapping("/{jobIds}") + public AjaxResult remove(@PathVariable Long[] jobIds) throws SchedulerException, TaskException + { + jobService.deleteJobByIds(jobIds); + return AjaxResult.success(); + } +} diff --git a/ruoyi-quartz/src/main/java/com/ruoyi/quartz/controller/SysJobLogController.java b/ruoyi-quartz/src/main/java/com/ruoyi/quartz/controller/SysJobLogController.java new file mode 100644 index 0000000..d27100d --- /dev/null +++ b/ruoyi-quartz/src/main/java/com/ruoyi/quartz/controller/SysJobLogController.java @@ -0,0 +1,92 @@ +package com.ruoyi.quartz.controller; + +import java.util.List; +import javax.servlet.http.HttpServletResponse; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.security.access.prepost.PreAuthorize; +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.ruoyi.common.annotation.Log; +import com.ruoyi.common.core.controller.BaseController; +import com.ruoyi.common.core.domain.AjaxResult; +import com.ruoyi.common.core.page.TableDataInfo; +import com.ruoyi.common.enums.BusinessType; +import com.ruoyi.common.utils.poi.ExcelUtil; +import com.ruoyi.quartz.domain.SysJobLog; +import com.ruoyi.quartz.service.ISysJobLogService; + +/** + * 调度日志操作处理 + * + * @author ruoyi + */ +@RestController +@RequestMapping("/monitor/jobLog") +public class SysJobLogController extends BaseController +{ + @Autowired + private ISysJobLogService jobLogService; + + /** + * 查询定时任务调度日志列表 + */ + @PreAuthorize("@ss.hasPermi('monitor:job:list')") + @GetMapping("/list") + public TableDataInfo list(SysJobLog sysJobLog) + { + startPage(); + List list = jobLogService.selectJobLogList(sysJobLog); + return getDataTable(list); + } + + /** + * 导出定时任务调度日志列表 + */ + @PreAuthorize("@ss.hasPermi('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, "调度日志"); + } + + /** + * 根据调度编号获取详细信息 + */ + @PreAuthorize("@ss.hasPermi('monitor:job:query')") + @GetMapping(value = "/{configId}") + public AjaxResult getInfo(@PathVariable Long jobLogId) + { + return AjaxResult.success(jobLogService.selectJobLogById(jobLogId)); + } + + + /** + * 删除定时任务调度日志 + */ + @PreAuthorize("@ss.hasPermi('monitor:job:remove')") + @Log(title = "定时任务调度日志", businessType = BusinessType.DELETE) + @DeleteMapping("/{jobLogIds}") + public AjaxResult remove(@PathVariable Long[] jobLogIds) + { + return toAjax(jobLogService.deleteJobLogByIds(jobLogIds)); + } + + /** + * 清空定时任务调度日志 + */ + @PreAuthorize("@ss.hasPermi('monitor:job:remove')") + @Log(title = "调度日志", businessType = BusinessType.CLEAN) + @DeleteMapping("/clean") + public AjaxResult clean() + { + jobLogService.cleanJobLog(); + return AjaxResult.success(); + } +} diff --git a/ruoyi-quartz/src/main/java/com/ruoyi/quartz/domain/SysJob.java b/ruoyi-quartz/src/main/java/com/ruoyi/quartz/domain/SysJob.java new file mode 100644 index 0000000..1f49695 --- /dev/null +++ b/ruoyi-quartz/src/main/java/com/ruoyi/quartz/domain/SysJob.java @@ -0,0 +1,171 @@ +package com.ruoyi.quartz.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.ruoyi.common.annotation.Excel; +import com.ruoyi.common.annotation.Excel.ColumnType; +import com.ruoyi.common.constant.ScheduleConstants; +import com.ruoyi.common.core.domain.BaseEntity; +import com.ruoyi.common.utils.StringUtils; +import com.ruoyi.quartz.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(); + } +} diff --git a/ruoyi-quartz/src/main/java/com/ruoyi/quartz/domain/SysJobLog.java b/ruoyi-quartz/src/main/java/com/ruoyi/quartz/domain/SysJobLog.java new file mode 100644 index 0000000..121c035 --- /dev/null +++ b/ruoyi-quartz/src/main/java/com/ruoyi/quartz/domain/SysJobLog.java @@ -0,0 +1,155 @@ +package com.ruoyi.quartz.domain; + +import java.util.Date; +import org.apache.commons.lang3.builder.ToStringBuilder; +import org.apache.commons.lang3.builder.ToStringStyle; +import com.ruoyi.common.annotation.Excel; +import com.ruoyi.common.core.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/ruoyi-quartz/src/main/java/com/ruoyi/quartz/mapper/SysJobLogMapper.java b/ruoyi-quartz/src/main/java/com/ruoyi/quartz/mapper/SysJobLogMapper.java new file mode 100644 index 0000000..727d916 --- /dev/null +++ b/ruoyi-quartz/src/main/java/com/ruoyi/quartz/mapper/SysJobLogMapper.java @@ -0,0 +1,64 @@ +package com.ruoyi.quartz.mapper; + +import java.util.List; +import com.ruoyi.quartz.domain.SysJobLog; + +/** + * 调度任务日志信息 数据层 + * + * @author ruoyi + */ +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/ruoyi-quartz/src/main/java/com/ruoyi/quartz/mapper/SysJobMapper.java b/ruoyi-quartz/src/main/java/com/ruoyi/quartz/mapper/SysJobMapper.java new file mode 100644 index 0000000..20f45db --- /dev/null +++ b/ruoyi-quartz/src/main/java/com/ruoyi/quartz/mapper/SysJobMapper.java @@ -0,0 +1,67 @@ +package com.ruoyi.quartz.mapper; + +import java.util.List; +import com.ruoyi.quartz.domain.SysJob; + +/** + * 调度任务信息 数据层 + * + * @author ruoyi + */ +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/ruoyi-quartz/src/main/java/com/ruoyi/quartz/service/ISysJobLogService.java b/ruoyi-quartz/src/main/java/com/ruoyi/quartz/service/ISysJobLogService.java new file mode 100644 index 0000000..8546792 --- /dev/null +++ b/ruoyi-quartz/src/main/java/com/ruoyi/quartz/service/ISysJobLogService.java @@ -0,0 +1,56 @@ +package com.ruoyi.quartz.service; + +import java.util.List; +import com.ruoyi.quartz.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/ruoyi-quartz/src/main/java/com/ruoyi/quartz/service/ISysJobService.java b/ruoyi-quartz/src/main/java/com/ruoyi/quartz/service/ISysJobService.java new file mode 100644 index 0000000..6d62661 --- /dev/null +++ b/ruoyi-quartz/src/main/java/com/ruoyi/quartz/service/ISysJobService.java @@ -0,0 +1,102 @@ +package com.ruoyi.quartz.service; + +import java.util.List; +import org.quartz.SchedulerException; +import com.ruoyi.common.exception.job.TaskException; +import com.ruoyi.quartz.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 void 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); +} diff --git a/ruoyi-quartz/src/main/java/com/ruoyi/quartz/service/impl/SysJobLogServiceImpl.java b/ruoyi-quartz/src/main/java/com/ruoyi/quartz/service/impl/SysJobLogServiceImpl.java new file mode 100644 index 0000000..812eed7 --- /dev/null +++ b/ruoyi-quartz/src/main/java/com/ruoyi/quartz/service/impl/SysJobLogServiceImpl.java @@ -0,0 +1,87 @@ +package com.ruoyi.quartz.service.impl; + +import java.util.List; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import com.ruoyi.quartz.domain.SysJobLog; +import com.ruoyi.quartz.mapper.SysJobLogMapper; +import com.ruoyi.quartz.service.ISysJobLogService; + +/** + * 定时任务调度日志信息 服务层 + * + * @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/ruoyi-quartz/src/main/java/com/ruoyi/quartz/service/impl/SysJobServiceImpl.java b/ruoyi-quartz/src/main/java/com/ruoyi/quartz/service/impl/SysJobServiceImpl.java new file mode 100644 index 0000000..0d9a53d --- /dev/null +++ b/ruoyi-quartz/src/main/java/com/ruoyi/quartz/service/impl/SysJobServiceImpl.java @@ -0,0 +1,254 @@ +package com.ruoyi.quartz.service.impl; + +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.ruoyi.common.constant.ScheduleConstants; +import com.ruoyi.common.exception.job.TaskException; +import com.ruoyi.quartz.domain.SysJob; +import com.ruoyi.quartz.mapper.SysJobMapper; +import com.ruoyi.quartz.service.ISysJobService; +import com.ruoyi.quartz.util.CronUtils; +import com.ruoyi.quartz.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 void run(SysJob job) throws SchedulerException + { + Long jobId = job.getJobId(); + String jobGroup = job.getJobGroup(); + SysJob properties = selectJobById(job.getJobId()); + // 参数 + JobDataMap dataMap = new JobDataMap(); + dataMap.put(ScheduleConstants.TASK_PROPERTIES, properties); + scheduler.triggerJob(ScheduleUtils.getJobKey(jobId, jobGroup), dataMap); + } + + /** + * 新增任务 + * + * @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); + } +} diff --git a/ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/RyTask.java b/ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/RyTask.java new file mode 100644 index 0000000..f360097 --- /dev/null +++ b/ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/RyTask.java @@ -0,0 +1,29 @@ +package com.ruoyi.quartz.task; + +import com.ruoyi.common.utils.StringUtils; +import org.springframework.stereotype.Component; + +/** + * 定时任务调度测试 + * + * @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/ruoyi-quartz/src/main/java/com/ruoyi/quartz/util/AbstractQuartzJob.java b/ruoyi-quartz/src/main/java/com/ruoyi/quartz/util/AbstractQuartzJob.java new file mode 100644 index 0000000..731a5eb --- /dev/null +++ b/ruoyi-quartz/src/main/java/com/ruoyi/quartz/util/AbstractQuartzJob.java @@ -0,0 +1,107 @@ +package com.ruoyi.quartz.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.ruoyi.common.constant.Constants; +import com.ruoyi.common.constant.ScheduleConstants; +import com.ruoyi.common.utils.ExceptionUtil; +import com.ruoyi.common.utils.StringUtils; +import com.ruoyi.common.utils.bean.BeanUtils; +import com.ruoyi.common.utils.spring.SpringUtils; +import com.ruoyi.quartz.domain.SysJob; +import com.ruoyi.quartz.domain.SysJobLog; +import com.ruoyi.quartz.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(Constants.FAIL); + String errorMsg = StringUtils.substring(ExceptionUtil.getExceptionMessage(e), 0, 2000); + sysJobLog.setExceptionInfo(errorMsg); + } + else + { + sysJobLog.setStatus(Constants.SUCCESS); + } + + // 写入数据库当中 + 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/ruoyi-quartz/src/main/java/com/ruoyi/quartz/util/CronUtils.java b/ruoyi-quartz/src/main/java/com/ruoyi/quartz/util/CronUtils.java new file mode 100644 index 0000000..dd53839 --- /dev/null +++ b/ruoyi-quartz/src/main/java/com/ruoyi/quartz/util/CronUtils.java @@ -0,0 +1,63 @@ +package com.ruoyi.quartz.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/ruoyi-quartz/src/main/java/com/ruoyi/quartz/util/JobInvokeUtil.java b/ruoyi-quartz/src/main/java/com/ruoyi/quartz/util/JobInvokeUtil.java new file mode 100644 index 0000000..e2e420e --- /dev/null +++ b/ruoyi-quartz/src/main/java/com/ruoyi/quartz/util/JobInvokeUtil.java @@ -0,0 +1,182 @@ +package com.ruoyi.quartz.util; + +import java.lang.reflect.InvocationTargetException; +import java.lang.reflect.Method; +import java.util.LinkedList; +import java.util.List; +import com.ruoyi.common.utils.StringUtils; +import com.ruoyi.common.utils.spring.SpringUtils; +import com.ruoyi.quartz.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).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().getDeclaredMethod(methodName, getMethodParamsType(methodParams)); + method.invoke(bean, getMethodParamsValue(methodParams)); + } + else + { + Method method = bean.getClass().getDeclaredMethod(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/ruoyi-quartz/src/main/java/com/ruoyi/quartz/util/QuartzDisallowConcurrentExecution.java b/ruoyi-quartz/src/main/java/com/ruoyi/quartz/util/QuartzDisallowConcurrentExecution.java new file mode 100644 index 0000000..5e13558 --- /dev/null +++ b/ruoyi-quartz/src/main/java/com/ruoyi/quartz/util/QuartzDisallowConcurrentExecution.java @@ -0,0 +1,21 @@ +package com.ruoyi.quartz.util; + +import org.quartz.DisallowConcurrentExecution; +import org.quartz.JobExecutionContext; +import com.ruoyi.quartz.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/ruoyi-quartz/src/main/java/com/ruoyi/quartz/util/QuartzJobExecution.java b/ruoyi-quartz/src/main/java/com/ruoyi/quartz/util/QuartzJobExecution.java new file mode 100644 index 0000000..e975326 --- /dev/null +++ b/ruoyi-quartz/src/main/java/com/ruoyi/quartz/util/QuartzJobExecution.java @@ -0,0 +1,19 @@ +package com.ruoyi.quartz.util; + +import org.quartz.JobExecutionContext; +import com.ruoyi.quartz.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/ruoyi-quartz/src/main/java/com/ruoyi/quartz/util/ScheduleUtils.java b/ruoyi-quartz/src/main/java/com/ruoyi/quartz/util/ScheduleUtils.java new file mode 100644 index 0000000..5d00c2c --- /dev/null +++ b/ruoyi-quartz/src/main/java/com/ruoyi/quartz/util/ScheduleUtils.java @@ -0,0 +1,134 @@ +package com.ruoyi.quartz.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.ruoyi.common.constant.Constants; +import com.ruoyi.common.constant.ScheduleConstants; +import com.ruoyi.common.exception.job.TaskException; +import com.ruoyi.common.exception.job.TaskException.Code; +import com.ruoyi.common.utils.StringUtils; +import com.ruoyi.common.utils.spring.SpringUtils; +import com.ruoyi.quartz.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)); + } + + 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]); + return StringUtils.containsAnyIgnoreCase(obj.getClass().getPackage().getName(), Constants.JOB_WHITELIST_STR); + } +} diff --git a/ruoyi-quartz/src/main/resources/mapper/quartz/SysJobLogMapper.xml b/ruoyi-quartz/src/main/resources/mapper/quartz/SysJobLogMapper.xml new file mode 100644 index 0000000..e608e42 --- /dev/null +++ b/ruoyi-quartz/src/main/resources/mapper/quartz/SysJobLogMapper.xml @@ -0,0 +1,93 @@ + + + + + + + + + + + + + + + + + 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/ruoyi-quartz/src/main/resources/mapper/quartz/SysJobMapper.xml b/ruoyi-quartz/src/main/resources/mapper/quartz/SysJobMapper.xml new file mode 100644 index 0000000..5605c44 --- /dev/null +++ b/ruoyi-quartz/src/main/resources/mapper/quartz/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/ruoyi-system/pom.xml b/ruoyi-system/pom.xml new file mode 100644 index 0000000..2f419a4 --- /dev/null +++ b/ruoyi-system/pom.xml @@ -0,0 +1,28 @@ + + + + ruoyi + com.ruoyi + 3.8.1 + + 4.0.0 + + ruoyi-system + + + system系统模块 + + + + + + + com.ruoyi + ruoyi-common + + + + + diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysConfig.java b/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysConfig.java new file mode 100644 index 0000000..c54678c --- /dev/null +++ b/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysConfig.java @@ -0,0 +1,111 @@ +package com.ruoyi.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.ruoyi.common.annotation.Excel; +import com.ruoyi.common.annotation.Excel.ColumnType; +import com.ruoyi.common.core.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/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysLogininfor.java b/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysLogininfor.java new file mode 100644 index 0000000..7fdea30 --- /dev/null +++ b/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysLogininfor.java @@ -0,0 +1,144 @@ +package com.ruoyi.system.domain; + +import java.util.Date; +import com.fasterxml.jackson.annotation.JsonFormat; +import com.ruoyi.common.annotation.Excel; +import com.ruoyi.common.annotation.Excel.ColumnType; +import com.ruoyi.common.core.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; + + /** 登录IP地址 */ + @Excel(name = "登录地址") + private String ipaddr; + + /** 登录地点 */ + @Excel(name = "登录地点") + private String loginLocation; + + /** 浏览器类型 */ + @Excel(name = "浏览器") + private String browser; + + /** 操作系统 */ + @Excel(name = "操作系统") + private String os; + + /** 提示消息 */ + @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 loginTime; + + 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 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 String getMsg() + { + return msg; + } + + public void setMsg(String msg) + { + this.msg = msg; + } + + public Date getLoginTime() + { + return loginTime; + } + + public void setLoginTime(Date loginTime) + { + this.loginTime = loginTime; + } +} diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysNotice.java b/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysNotice.java new file mode 100644 index 0000000..8c07a54 --- /dev/null +++ b/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysNotice.java @@ -0,0 +1,102 @@ +package com.ruoyi.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.ruoyi.common.core.domain.BaseEntity; +import com.ruoyi.common.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/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysOperLog.java b/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysOperLog.java new file mode 100644 index 0000000..175ee03 --- /dev/null +++ b/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysOperLog.java @@ -0,0 +1,255 @@ +package com.ruoyi.system.domain; + +import java.util.Date; +import com.fasterxml.jackson.annotation.JsonFormat; +import com.ruoyi.common.annotation.Excel; +import com.ruoyi.common.annotation.Excel.ColumnType; +import com.ruoyi.common.core.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 operLocation; + + /** 请求参数 */ + @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; + + 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 getOperLocation() + { + return operLocation; + } + + public void setOperLocation(String operLocation) + { + this.operLocation = operLocation; + } + + 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; + } +} diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysPost.java b/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysPost.java new file mode 100644 index 0000000..1f1fcf4 --- /dev/null +++ b/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysPost.java @@ -0,0 +1,123 @@ +package com.ruoyi.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.ruoyi.common.annotation.Excel; +import com.ruoyi.common.annotation.Excel.ColumnType; +import com.ruoyi.common.core.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 String 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; + } + + @NotBlank(message = "显示顺序不能为空") + public String getPostSort() + { + return postSort; + } + + public void setPostSort(String 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/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysRoleDept.java b/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysRoleDept.java new file mode 100644 index 0000000..47b21bf --- /dev/null +++ b/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysRoleDept.java @@ -0,0 +1,46 @@ +package com.ruoyi.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/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysRoleMenu.java b/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysRoleMenu.java new file mode 100644 index 0000000..de10a74 --- /dev/null +++ b/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysRoleMenu.java @@ -0,0 +1,46 @@ +package com.ruoyi.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/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysUserOnline.java b/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysUserOnline.java new file mode 100644 index 0000000..2bbd318 --- /dev/null +++ b/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysUserOnline.java @@ -0,0 +1,113 @@ +package com.ruoyi.system.domain; + +/** + * 当前在线会话 + * + * @author ruoyi + */ +public class SysUserOnline +{ + /** 会话编号 */ + private String tokenId; + + /** 部门名称 */ + private String deptName; + + /** 用户名称 */ + 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 getDeptName() + { + return deptName; + } + + public void setDeptName(String deptName) + { + this.deptName = deptName; + } + + 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/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysUserPost.java b/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysUserPost.java new file mode 100644 index 0000000..6e8c416 --- /dev/null +++ b/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysUserPost.java @@ -0,0 +1,46 @@ +package com.ruoyi.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/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysUserRole.java b/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysUserRole.java new file mode 100644 index 0000000..4d15810 --- /dev/null +++ b/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysUserRole.java @@ -0,0 +1,46 @@ +package com.ruoyi.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/ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/MetaVo.java b/ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/MetaVo.java new file mode 100644 index 0000000..a5d5fdc --- /dev/null +++ b/ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/MetaVo.java @@ -0,0 +1,106 @@ +package com.ruoyi.system.domain.vo; + +import com.ruoyi.common.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/ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/RouterVo.java b/ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/RouterVo.java new file mode 100644 index 0000000..afff8c9 --- /dev/null +++ b/ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/RouterVo.java @@ -0,0 +1,148 @@ +package com.ruoyi.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/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysConfigMapper.java b/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysConfigMapper.java new file mode 100644 index 0000000..eb0c97c --- /dev/null +++ b/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysConfigMapper.java @@ -0,0 +1,70 @@ +package com.ruoyi.system.mapper; + +import java.util.List; +import com.ruoyi.system.domain.SysConfig; +import org.apache.ibatis.annotations.Mapper; + +/** + * 参数配置 数据层 + * + * @author ruoyi + */ +@Mapper +public interface SysConfigMapper +{ + /** + * 查询参数配置信息 + * + * @param config 参数配置信息 + * @return 参数配置信息 + */ + public SysConfig selectConfig(SysConfig config); + + /** + * 查询参数配置列表 + * + * @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); +} diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysDeptMapper.java b/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysDeptMapper.java new file mode 100644 index 0000000..384a9b6 --- /dev/null +++ b/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysDeptMapper.java @@ -0,0 +1,118 @@ +package com.ruoyi.system.mapper; + +import java.util.List; +import org.apache.ibatis.annotations.Param; +import com.ruoyi.common.core.domain.entity.SysDept; + +/** + * 部门管理 数据层 + * + * @author ruoyi + */ +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/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysDictDataMapper.java b/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysDictDataMapper.java new file mode 100644 index 0000000..a341f1e --- /dev/null +++ b/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysDictDataMapper.java @@ -0,0 +1,95 @@ +package com.ruoyi.system.mapper; + +import java.util.List; +import org.apache.ibatis.annotations.Param; +import com.ruoyi.common.core.domain.entity.SysDictData; + +/** + * 字典表 数据层 + * + * @author ruoyi + */ +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); +} diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysDictTypeMapper.java b/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysDictTypeMapper.java new file mode 100644 index 0000000..17545cd --- /dev/null +++ b/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysDictTypeMapper.java @@ -0,0 +1,85 @@ +package com.ruoyi.system.mapper; + +import java.util.List; +import org.apache.ibatis.annotations.Mapper; +import com.ruoyi.common.core.domain.entity.SysDictType; + +/** + * 字典表 数据层 + * + * @author ruoyi + */ +@Mapper +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/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysLogininforMapper.java b/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysLogininforMapper.java new file mode 100644 index 0000000..629866f --- /dev/null +++ b/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysLogininforMapper.java @@ -0,0 +1,42 @@ +package com.ruoyi.system.mapper; + +import java.util.List; +import com.ruoyi.system.domain.SysLogininfor; + +/** + * 系统访问日志情况信息 数据层 + * + * @author ruoyi + */ +public interface SysLogininforMapper +{ + /** + * 新增系统登录日志 + * + * @param logininfor 访问日志对象 + */ + public void 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/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysMenuMapper.java b/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysMenuMapper.java new file mode 100644 index 0000000..123b47f --- /dev/null +++ b/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysMenuMapper.java @@ -0,0 +1,117 @@ +package com.ruoyi.system.mapper; + +import java.util.List; +import org.apache.ibatis.annotations.Param; +import com.ruoyi.common.core.domain.entity.SysMenu; + +/** + * 菜单表 数据层 + * + * @author ruoyi + */ +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 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/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysNoticeMapper.java b/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysNoticeMapper.java new file mode 100644 index 0000000..c34f0a2 --- /dev/null +++ b/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysNoticeMapper.java @@ -0,0 +1,60 @@ +package com.ruoyi.system.mapper; + +import java.util.List; +import com.ruoyi.system.domain.SysNotice; + +/** + * 通知公告表 数据层 + * + * @author ruoyi + */ +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); +} diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysOperLogMapper.java b/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysOperLogMapper.java new file mode 100644 index 0000000..2ae6457 --- /dev/null +++ b/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysOperLogMapper.java @@ -0,0 +1,48 @@ +package com.ruoyi.system.mapper; + +import java.util.List; +import com.ruoyi.system.domain.SysOperLog; + +/** + * 操作日志 数据层 + * + * @author ruoyi + */ +public interface SysOperLogMapper +{ + /** + * 新增操作日志 + * + * @param operLog 操作日志对象 + */ + public void 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/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysPostMapper.java b/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysPostMapper.java new file mode 100644 index 0000000..19be227 --- /dev/null +++ b/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysPostMapper.java @@ -0,0 +1,99 @@ +package com.ruoyi.system.mapper; + +import java.util.List; +import com.ruoyi.system.domain.SysPost; + +/** + * 岗位信息 数据层 + * + * @author ruoyi + */ +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/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysRoleDeptMapper.java b/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysRoleDeptMapper.java new file mode 100644 index 0000000..f9d3a2f --- /dev/null +++ b/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysRoleDeptMapper.java @@ -0,0 +1,44 @@ +package com.ruoyi.system.mapper; + +import java.util.List; +import com.ruoyi.system.domain.SysRoleDept; + +/** + * 角色与部门关联表 数据层 + * + * @author ruoyi + */ +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/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysRoleMapper.java b/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysRoleMapper.java new file mode 100644 index 0000000..cf2bd8c --- /dev/null +++ b/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysRoleMapper.java @@ -0,0 +1,107 @@ +package com.ruoyi.system.mapper; + +import java.util.List; +import com.ruoyi.common.core.domain.entity.SysRole; + +/** + * 角色表 数据层 + * + * @author ruoyi + */ +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); +} diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysRoleMenuMapper.java b/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysRoleMenuMapper.java new file mode 100644 index 0000000..6602bee --- /dev/null +++ b/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysRoleMenuMapper.java @@ -0,0 +1,44 @@ +package com.ruoyi.system.mapper; + +import java.util.List; +import com.ruoyi.system.domain.SysRoleMenu; + +/** + * 角色与菜单关联表 数据层 + * + * @author ruoyi + */ +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/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysUserMapper.java b/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysUserMapper.java new file mode 100644 index 0000000..b42ac52 --- /dev/null +++ b/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysUserMapper.java @@ -0,0 +1,127 @@ +package com.ruoyi.system.mapper; + +import java.util.List; +import org.apache.ibatis.annotations.Param; +import com.ruoyi.common.core.domain.entity.SysUser; + +/** + * 用户表 数据层 + * + * @author ruoyi + */ +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 int checkUserNameUnique(String userName); + + /** + * 校验手机号码是否唯一 + * + * @param phonenumber 手机号码 + * @return 结果 + */ + public SysUser checkPhoneUnique(String phonenumber); + + /** + * 校验email是否唯一 + * + * @param email 用户邮箱 + * @return 结果 + */ + public SysUser checkEmailUnique(String email); +} diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysUserPostMapper.java b/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysUserPostMapper.java new file mode 100644 index 0000000..e08991d --- /dev/null +++ b/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysUserPostMapper.java @@ -0,0 +1,44 @@ +package com.ruoyi.system.mapper; + +import java.util.List; +import com.ruoyi.system.domain.SysUserPost; + +/** + * 用户与岗位关联表 数据层 + * + * @author ruoyi + */ +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/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysUserRoleMapper.java b/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysUserRoleMapper.java new file mode 100644 index 0000000..3143ec8 --- /dev/null +++ b/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysUserRoleMapper.java @@ -0,0 +1,62 @@ +package com.ruoyi.system.mapper; + +import java.util.List; +import org.apache.ibatis.annotations.Param; +import com.ruoyi.system.domain.SysUserRole; + +/** + * 用户与角色关联表 数据层 + * + * @author ruoyi + */ +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/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysConfigService.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysConfigService.java new file mode 100644 index 0000000..00b037a --- /dev/null +++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysConfigService.java @@ -0,0 +1,89 @@ +package com.ruoyi.system.service; + +import java.util.List; +import com.ruoyi.system.domain.SysConfig; + +/** + * 参数配置 服务层 + * + * @author ruoyi + */ +public interface ISysConfigService +{ + /** + * 查询参数配置信息 + * + * @param configId 参数配置ID + * @return 参数配置信息 + */ + public SysConfig selectConfigById(Long configId); + + /** + * 根据键名查询参数配置信息 + * + * @param configKey 参数键名 + * @return 参数键值 + */ + public String selectConfigByKey(String configKey); + + /** + * 获取验证码开关 + * + * @return true开启，false关闭 + */ + public boolean selectCaptchaOnOff(); + + /** + * 查询参数配置列表 + * + * @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 String checkConfigKeyUnique(SysConfig config); +} diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysDeptService.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysDeptService.java new file mode 100644 index 0000000..72ca048 --- /dev/null +++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysDeptService.java @@ -0,0 +1,116 @@ +package com.ruoyi.system.service; + +import java.util.List; +import com.ruoyi.common.core.domain.TreeSelect; +import com.ruoyi.common.core.domain.entity.SysDept; + +/** + * 部门管理 服务层 + * + * @author ruoyi + */ +public interface ISysDeptService +{ + /** + * 查询部门管理数据 + * + * @param dept 部门信息 + * @return 部门信息集合 + */ + public List selectDeptList(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 String 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/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysDictDataService.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysDictDataService.java new file mode 100644 index 0000000..9bc4f13 --- /dev/null +++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysDictDataService.java @@ -0,0 +1,60 @@ +package com.ruoyi.system.service; + +import java.util.List; +import com.ruoyi.common.core.domain.entity.SysDictData; + +/** + * 字典 业务层 + * + * @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); +} diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysDictTypeService.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysDictTypeService.java new file mode 100644 index 0000000..dbb2c16 --- /dev/null +++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysDictTypeService.java @@ -0,0 +1,98 @@ +package com.ruoyi.system.service; + +import java.util.List; +import com.ruoyi.common.core.domain.entity.SysDictData; +import com.ruoyi.common.core.domain.entity.SysDictType; + +/** + * 字典 业务层 + * + * @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 String checkDictTypeUnique(SysDictType dictType); +} diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysLogininforService.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysLogininforService.java new file mode 100644 index 0000000..ce3151d --- /dev/null +++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysLogininforService.java @@ -0,0 +1,40 @@ +package com.ruoyi.system.service; + +import java.util.List; +import com.ruoyi.system.domain.SysLogininfor; + +/** + * 系统访问日志情况信息 服务层 + * + * @author ruoyi + */ +public interface ISysLogininforService +{ + /** + * 新增系统登录日志 + * + * @param logininfor 访问日志对象 + */ + public void 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/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysMenuService.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysMenuService.java new file mode 100644 index 0000000..1b43174 --- /dev/null +++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysMenuService.java @@ -0,0 +1,136 @@ +package com.ruoyi.system.service; + +import java.util.List; +import java.util.Set; +import com.ruoyi.common.core.domain.TreeSelect; +import com.ruoyi.common.core.domain.entity.SysMenu; +import com.ruoyi.system.domain.vo.RouterVo; + +/** + * 菜单 业务层 + * + * @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 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 String checkMenuNameUnique(SysMenu menu); +} diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysNoticeService.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysNoticeService.java new file mode 100644 index 0000000..47ce1b7 --- /dev/null +++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysNoticeService.java @@ -0,0 +1,60 @@ +package com.ruoyi.system.service; + +import java.util.List; +import com.ruoyi.system.domain.SysNotice; + +/** + * 公告 服务层 + * + * @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/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysOperLogService.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysOperLogService.java new file mode 100644 index 0000000..4fd8e5a --- /dev/null +++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysOperLogService.java @@ -0,0 +1,48 @@ +package com.ruoyi.system.service; + +import java.util.List; +import com.ruoyi.system.domain.SysOperLog; + +/** + * 操作日志 服务层 + * + * @author ruoyi + */ +public interface ISysOperLogService +{ + /** + * 新增操作日志 + * + * @param operLog 操作日志对象 + */ + public void 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/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysPostService.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysPostService.java new file mode 100644 index 0000000..4ffee39 --- /dev/null +++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysPostService.java @@ -0,0 +1,99 @@ +package com.ruoyi.system.service; + +import java.util.List; +import com.ruoyi.system.domain.SysPost; + +/** + * 岗位信息 服务层 + * + * @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 String checkPostNameUnique(SysPost post); + + /** + * 校验岗位编码 + * + * @param post 岗位信息 + * @return 结果 + */ + public String 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/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysRoleService.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysRoleService.java new file mode 100644 index 0000000..28c73cc --- /dev/null +++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysRoleService.java @@ -0,0 +1,173 @@ +package com.ruoyi.system.service; + +import java.util.List; +import java.util.Set; +import com.ruoyi.common.core.domain.entity.SysRole; +import com.ruoyi.system.domain.SysUserRole; + +/** + * 角色业务层 + * + * @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 String checkRoleNameUnique(SysRole role); + + /** + * 校验角色权限是否唯一 + * + * @param role 角色信息 + * @return 结果 + */ + public String checkRoleKeyUnique(SysRole role); + + /** + * 校验角色是否允许操作 + * + * @param role 角色信息 + */ + public void checkRoleAllowed(SysRole role); + + /** + * 校验角色是否有数据权限 + * + * @param roleId 角色id + */ + public void checkRoleDataScope(Long roleId); + + /** + * 通过角色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); +} diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysUserOnlineService.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysUserOnlineService.java new file mode 100644 index 0000000..8eb5448 --- /dev/null +++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysUserOnlineService.java @@ -0,0 +1,48 @@ +package com.ruoyi.system.service; + +import com.ruoyi.common.core.domain.model.LoginUser; +import com.ruoyi.system.domain.SysUserOnline; + +/** + * 在线用户 服务层 + * + * @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/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysUserService.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysUserService.java new file mode 100644 index 0000000..59a41a1 --- /dev/null +++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysUserService.java @@ -0,0 +1,206 @@ +package com.ruoyi.system.service; + +import java.util.List; +import com.ruoyi.common.core.domain.entity.SysUser; + +/** + * 用户 业务层 + * + * @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 userName 用户名称 + * @return 结果 + */ + public String checkUserNameUnique(String userName); + + /** + * 校验手机号码是否唯一 + * + * @param user 用户信息 + * @return 结果 + */ + public String checkPhoneUnique(SysUser user); + + /** + * 校验email是否唯一 + * + * @param user 用户信息 + * @return 结果 + */ + public String 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 int 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); +} diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysConfigServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysConfigServiceImpl.java new file mode 100644 index 0000000..e723ce4 --- /dev/null +++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysConfigServiceImpl.java @@ -0,0 +1,226 @@ +package com.ruoyi.system.service.impl; + +import com.ruoyi.common.annotation.DataSource; +import com.ruoyi.common.constant.Constants; +import com.ruoyi.common.constant.UserConstants; +import com.ruoyi.common.core.redis.RedisCache; +import com.ruoyi.common.core.text.Convert; +import com.ruoyi.common.enums.DataSourceType; +import com.ruoyi.common.exception.ServiceException; +import com.ruoyi.common.utils.StringUtils; +import com.ruoyi.system.domain.SysConfig; +import com.ruoyi.system.mapper.SysConfigMapper; +import com.ruoyi.system.service.ISysConfigService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import javax.annotation.PostConstruct; +import java.util.Collection; +import java.util.List; + +/** + * 参数配置 服务层实现 + * + * @author ruoyi + */ +@Service +public class SysConfigServiceImpl implements ISysConfigService +{ + @Autowired + private SysConfigMapper configMapper; + + @Autowired + private RedisCache redisCache; + + /** + * 项目启动时，初始化参数到缓存 + */ + @PostConstruct + public void init() + { + loadingConfigCache(); + } + + /** + * 查询参数配置信息 + * + * @param configId 参数配置ID + * @return 参数配置信息 + */ + @Override + @DataSource(DataSourceType.MASTER) + 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(redisCache.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)) + { + redisCache.setCacheObject(getCacheKey(configKey), retConfig.getConfigValue()); + return retConfig.getConfigValue(); + } + return StringUtils.EMPTY; + } + + /** + * 获取验证码开关 + * + * @return true开启，false关闭 + */ + @Override + public boolean selectCaptchaOnOff() + { + String captchaOnOff = selectConfigByKey("sys.account.captchaOnOff"); + if (StringUtils.isEmpty(captchaOnOff)) + { + return true; + } + return Convert.toBool(captchaOnOff); + } + + /** + * 查询参数配置列表 + * + * @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) + { + redisCache.setCacheObject(getCacheKey(config.getConfigKey()), config.getConfigValue()); + } + return row; + } + + /** + * 修改参数配置 + * + * @param config 参数配置信息 + * @return 结果 + */ + @Override + public int updateConfig(SysConfig config) + { + int row = configMapper.updateConfig(config); + if (row > 0) + { + redisCache.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); + redisCache.deleteObject(getCacheKey(config.getConfigKey())); + } + } + + /** + * 加载参数缓存数据 + */ + @Override + public void loadingConfigCache() + { + List configsList = configMapper.selectConfigList(new SysConfig()); + for (SysConfig config : configsList) + { + redisCache.setCacheObject(getCacheKey(config.getConfigKey()), config.getConfigValue()); + } + } + + /** + * 清空参数缓存数据 + */ + @Override + public void clearConfigCache() + { + Collection keys = redisCache.keys(Constants.SYS_CONFIG_KEY + "*"); + redisCache.deleteObject(keys); + } + + /** + * 重置参数缓存数据 + */ + @Override + public void resetConfigCache() + { + clearConfigCache(); + loadingConfigCache(); + } + + /** + * 校验参数键名是否唯一 + * + * @param config 参数配置信息 + * @return 结果 + */ + @Override + public String 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 Constants.SYS_CONFIG_KEY + configKey; + } +} diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysDeptServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysDeptServiceImpl.java new file mode 100644 index 0000000..96d215e --- /dev/null +++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysDeptServiceImpl.java @@ -0,0 +1,329 @@ +package com.ruoyi.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.ruoyi.common.annotation.DataScope; +import com.ruoyi.common.constant.UserConstants; +import com.ruoyi.common.core.domain.TreeSelect; +import com.ruoyi.common.core.domain.entity.SysDept; +import com.ruoyi.common.core.domain.entity.SysRole; +import com.ruoyi.common.core.domain.entity.SysUser; +import com.ruoyi.common.core.text.Convert; +import com.ruoyi.common.exception.ServiceException; +import com.ruoyi.common.utils.SecurityUtils; +import com.ruoyi.common.utils.StringUtils; +import com.ruoyi.common.utils.spring.SpringUtils; +import com.ruoyi.system.mapper.SysDeptMapper; +import com.ruoyi.system.mapper.SysRoleMapper; +import com.ruoyi.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 depts 部门列表 + * @return 树结构列表 + */ + @Override + public List buildDeptTree(List depts) + { + List returnList = new ArrayList(); + List tempList = new ArrayList(); + for (SysDept dept : depts) + { + tempList.add(dept.getDeptId()); + } + 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 String 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())) + { + 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; + } +} diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysDictDataServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysDictDataServiceImpl.java new file mode 100644 index 0000000..fced569 --- /dev/null +++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysDictDataServiceImpl.java @@ -0,0 +1,111 @@ +package com.ruoyi.system.service.impl; + +import java.util.List; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import com.ruoyi.common.core.domain.entity.SysDictData; +import com.ruoyi.common.utils.DictUtils; +import com.ruoyi.system.mapper.SysDictDataMapper; +import com.ruoyi.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; + } +} diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysDictTypeServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysDictTypeServiceImpl.java new file mode 100644 index 0000000..8da7983 --- /dev/null +++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysDictTypeServiceImpl.java @@ -0,0 +1,223 @@ +package com.ruoyi.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.ruoyi.common.constant.UserConstants; +import com.ruoyi.common.core.domain.entity.SysDictData; +import com.ruoyi.common.core.domain.entity.SysDictType; +import com.ruoyi.common.exception.ServiceException; +import com.ruoyi.common.utils.DictUtils; +import com.ruoyi.common.utils.StringUtils; +import com.ruoyi.system.mapper.SysDictDataMapper; +import com.ruoyi.system.mapper.SysDictTypeMapper; +import com.ruoyi.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 + 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 String 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/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysLogininforServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysLogininforServiceImpl.java new file mode 100644 index 0000000..216aecb --- /dev/null +++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysLogininforServiceImpl.java @@ -0,0 +1,65 @@ +package com.ruoyi.system.service.impl; + +import java.util.List; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import com.ruoyi.system.domain.SysLogininfor; +import com.ruoyi.system.mapper.SysLogininforMapper; +import com.ruoyi.system.service.ISysLogininforService; + +/** + * 系统访问日志情况信息 服务层处理 + * + * @author ruoyi + */ +@Service +public class SysLogininforServiceImpl implements ISysLogininforService +{ + + @Autowired + private SysLogininforMapper logininforMapper; + + /** + * 新增系统登录日志 + * + * @param logininfor 访问日志对象 + */ + @Override + public void insertLogininfor(SysLogininfor logininfor) + { + 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/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysMenuServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysMenuServiceImpl.java new file mode 100644 index 0000000..37dcc19 --- /dev/null +++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysMenuServiceImpl.java @@ -0,0 +1,514 @@ +package com.ruoyi.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.ruoyi.common.constant.Constants; +import com.ruoyi.common.constant.UserConstants; +import com.ruoyi.common.core.domain.TreeSelect; +import com.ruoyi.common.core.domain.entity.SysMenu; +import com.ruoyi.common.core.domain.entity.SysRole; +import com.ruoyi.common.core.domain.entity.SysUser; +import com.ruoyi.common.utils.SecurityUtils; +import com.ruoyi.common.utils.StringUtils; +import com.ruoyi.system.domain.vo.MetaVo; +import com.ruoyi.system.domain.vo.RouterVo; +import com.ruoyi.system.mapper.SysMenuMapper; +import com.ruoyi.system.mapper.SysRoleMapper; +import com.ruoyi.system.mapper.SysRoleMenuMapper; +import com.ruoyi.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 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 (!cMenus.isEmpty() && cMenus.size() > 0 && 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(StringUtils.capitalize(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(StringUtils.capitalize(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 = new ArrayList(); + for (SysMenu dept : menus) + { + tempList.add(dept.getMenuId()); + } + 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 ? true : false; + } + + /** + * 查询菜单使用数量 + * + * @param menuId 菜单ID + * @return 结果 + */ + @Override + public boolean checkMenuExistRole(Long menuId) + { + int result = roleMenuMapper.checkMenuExistRole(menuId); + return result > 0 ? true : false; + } + + /** + * 新增保存菜单信息 + * + * @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 String 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) + { + String routerName = StringUtils.capitalize(menu.getPath()); + // 非外链并且是一级目录（类型为目录） + if (isMenuFrame(menu)) + { + routerName = StringUtils.EMPTY; + } + return 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 }, + new String[] { "", "" }); + } +} diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysNoticeServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysNoticeServiceImpl.java new file mode 100644 index 0000000..765438b --- /dev/null +++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysNoticeServiceImpl.java @@ -0,0 +1,92 @@ +package com.ruoyi.system.service.impl; + +import java.util.List; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import com.ruoyi.system.domain.SysNotice; +import com.ruoyi.system.mapper.SysNoticeMapper; +import com.ruoyi.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/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysOperLogServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysOperLogServiceImpl.java new file mode 100644 index 0000000..5489815 --- /dev/null +++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysOperLogServiceImpl.java @@ -0,0 +1,76 @@ +package com.ruoyi.system.service.impl; + +import java.util.List; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import com.ruoyi.system.domain.SysOperLog; +import com.ruoyi.system.mapper.SysOperLogMapper; +import com.ruoyi.system.service.ISysOperLogService; + +/** + * 操作日志 服务层处理 + * + * @author ruoyi + */ +@Service +public class SysOperLogServiceImpl implements ISysOperLogService +{ + @Autowired + private SysOperLogMapper operLogMapper; + + /** + * 新增操作日志 + * + * @param operLog 操作日志对象 + */ + @Override + public void insertOperlog(SysOperLog operLog) + { + 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/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysPostServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysPostServiceImpl.java new file mode 100644 index 0000000..78f1cb7 --- /dev/null +++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysPostServiceImpl.java @@ -0,0 +1,178 @@ +package com.ruoyi.system.service.impl; + +import java.util.List; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import com.ruoyi.common.constant.UserConstants; +import com.ruoyi.common.exception.ServiceException; +import com.ruoyi.common.utils.StringUtils; +import com.ruoyi.system.domain.SysPost; +import com.ruoyi.system.mapper.SysPostMapper; +import com.ruoyi.system.mapper.SysUserPostMapper; +import com.ruoyi.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 String 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 String 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/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysRoleServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysRoleServiceImpl.java new file mode 100644 index 0000000..b9b8f32 --- /dev/null +++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysRoleServiceImpl.java @@ -0,0 +1,424 @@ +package com.ruoyi.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.ruoyi.common.annotation.DataScope; +import com.ruoyi.common.constant.UserConstants; +import com.ruoyi.common.core.domain.entity.SysRole; +import com.ruoyi.common.core.domain.entity.SysUser; +import com.ruoyi.common.exception.ServiceException; +import com.ruoyi.common.utils.SecurityUtils; +import com.ruoyi.common.utils.StringUtils; +import com.ruoyi.common.utils.spring.SpringUtils; +import com.ruoyi.system.domain.SysRoleDept; +import com.ruoyi.system.domain.SysRoleMenu; +import com.ruoyi.system.domain.SysUserRole; +import com.ruoyi.system.mapper.SysRoleDeptMapper; +import com.ruoyi.system.mapper.SysRoleMapper; +import com.ruoyi.system.mapper.SysRoleMenuMapper; +import com.ruoyi.system.mapper.SysUserRoleMapper; +import com.ruoyi.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 String 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 String 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 roleId 角色id + */ + @Override + public void checkRoleDataScope(Long roleId) + { + if (!SysUser.isAdmin(SecurityUtils.getUserId())) + { + 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 + public int insertRole(SysRole role) + { + // 新增角色信息 + roleMapper.insertRole(role); + return insertRoleMenu(role); + } + + /** + * 修改保存角色信息 + * + * @param role 角色信息 + * @return 结果 + */ + @Override + @Transactional + 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 + 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 + public int deleteRoleById(Long roleId) + { + // 删除角色与菜单关联 + roleMenuMapper.deleteRoleMenuByRoleId(roleId); + // 删除角色与部门关联 + roleDeptMapper.deleteRoleDeptByRoleId(roleId); + return roleMapper.deleteRoleById(roleId); + } + + /** + * 批量删除角色信息 + * + * @param roleIds 需要删除的角色ID + * @return 结果 + */ + @Override + @Transactional + 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); + } +} diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserOnlineServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserOnlineServiceImpl.java new file mode 100644 index 0000000..f80a877 --- /dev/null +++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserOnlineServiceImpl.java @@ -0,0 +1,96 @@ +package com.ruoyi.system.service.impl; + +import org.springframework.stereotype.Service; +import com.ruoyi.common.core.domain.model.LoginUser; +import com.ruoyi.common.utils.StringUtils; +import com.ruoyi.system.domain.SysUserOnline; +import com.ruoyi.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) || StringUtils.isNull(user.getUser())) + { + return null; + } + SysUserOnline sysUserOnline = new SysUserOnline(); + sysUserOnline.setTokenId(user.getToken()); + sysUserOnline.setUserName(user.getUsername()); + sysUserOnline.setIpaddr(user.getIpaddr()); + sysUserOnline.setLoginLocation(user.getLoginLocation()); + sysUserOnline.setBrowser(user.getBrowser()); + sysUserOnline.setOs(user.getOs()); + sysUserOnline.setLoginTime(user.getLoginTime()); + if (StringUtils.isNotNull(user.getUser().getDept())) + { + sysUserOnline.setDeptName(user.getUser().getDept().getDeptName()); + } + return sysUserOnline; + } +} diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java new file mode 100644 index 0000000..52f9cf9 --- /dev/null +++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java @@ -0,0 +1,562 @@ +package com.ruoyi.system.service.impl; + +import java.util.ArrayList; +import java.util.List; +import java.util.stream.Collectors; +import javax.validation.Validator; +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.ruoyi.common.annotation.DataScope; +import com.ruoyi.common.constant.UserConstants; +import com.ruoyi.common.core.domain.entity.SysRole; +import com.ruoyi.common.core.domain.entity.SysUser; +import com.ruoyi.common.exception.ServiceException; +import com.ruoyi.common.utils.SecurityUtils; +import com.ruoyi.common.utils.StringUtils; +import com.ruoyi.common.utils.bean.BeanValidators; +import com.ruoyi.common.utils.spring.SpringUtils; +import com.ruoyi.system.domain.SysPost; +import com.ruoyi.system.domain.SysUserPost; +import com.ruoyi.system.domain.SysUserRole; +import com.ruoyi.system.mapper.SysPostMapper; +import com.ruoyi.system.mapper.SysRoleMapper; +import com.ruoyi.system.mapper.SysUserMapper; +import com.ruoyi.system.mapper.SysUserPostMapper; +import com.ruoyi.system.mapper.SysUserRoleMapper; +import com.ruoyi.system.service.ISysConfigService; +import com.ruoyi.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 + protected Validator validator; + + /** + * 根据条件分页查询用户列表 + * + * @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 userName 用户名称 + * @return 结果 + */ + @Override + public String checkUserNameUnique(String userName) + { + int count = userMapper.checkUserNameUnique(userName); + if (count > 0) + { + return UserConstants.NOT_UNIQUE; + } + return UserConstants.UNIQUE; + } + + /** + * 校验手机号码是否唯一 + * + * @param user 用户信息 + * @return + */ + @Override + public String 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 String 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 + 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 + 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 + 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 int updateUserProfile(SysUser user) + { + return userMapper.updateUser(user); + } + + /** + * 修改用户头像 + * + * @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) + { + Long[] roles = user.getRoleIds(); + if (StringUtils.isNotNull(roles)) + { + // 新增用户与角色管理 + List list = new ArrayList(); + for (Long roleId : roles) + { + SysUserRole ur = new SysUserRole(); + ur.setUserId(user.getUserId()); + ur.setRoleId(roleId); + list.add(ur); + } + if (list.size() > 0) + { + userRoleMapper.batchUserRole(list); + } + } + } + + /** + * 新增用户岗位信息 + * + * @param user 用户对象 + */ + public void insertUserPost(SysUser user) + { + Long[] posts = user.getPostIds(); + if (StringUtils.isNotNull(posts)) + { + // 新增用户与岗位管理 + List list = new ArrayList(); + for (Long postId : posts) + { + SysUserPost up = new SysUserPost(); + up.setUserId(user.getUserId()); + up.setPostId(postId); + list.add(up); + } + if (list.size() > 0) + { + userPostMapper.batchUserPost(list); + } + } + } + + /** + * 新增用户角色信息 + * + * @param userId 用户ID + * @param roleIds 角色组 + */ + public void insertUserRole(Long userId, Long[] roleIds) + { + if (StringUtils.isNotNull(roleIds)) + { + // 新增用户与角色管理 + List list = new ArrayList(); + for (Long roleId : roleIds) + { + SysUserRole ur = new SysUserRole(); + ur.setUserId(userId); + ur.setRoleId(roleId); + list.add(ur); + } + if (list.size() > 0) + { + userRoleMapper.batchUserRole(list); + } + } + } + + /** + * 通过用户ID删除用户 + * + * @param userId 用户ID + * @return 结果 + */ + @Override + @Transactional + public int deleteUserById(Long userId) + { + // 删除用户与角色关联 + userRoleMapper.deleteUserRoleByUserId(userId); + // 删除用户与岗位表 + userPostMapper.deleteUserPostByUserId(userId); + return userMapper.deleteUserById(userId); + } + + /** + * 批量删除用户信息 + * + * @param userIds 需要删除的用户ID + * @return 结果 + */ + @Override + @Transactional + 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(); + String password = configService.selectConfigByKey("sys.user.initPassword"); + for (SysUser user : userList) + { + try + { + // 验证是否存在这个用户 + SysUser u = userMapper.selectUserByUserName(user.getUserName()); + if (StringUtils.isNull(u)) + { + BeanValidators.validateWithException(validator, user); + user.setPassword(SecurityUtils.encryptPassword(password)); + user.setCreateBy(operName); + this.insertUser(user); + successNum++; + successMsg.append("
" + successNum + "、账号 " + user.getUserName() + " 导入成功"); + } + else if (isUpdateSupport) + { + BeanValidators.validateWithException(validator, user); + user.setUpdateBy(operName); + this.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(); + } +} diff --git a/ruoyi-system/src/main/resources/mapper/system/SysConfigMapper.xml b/ruoyi-system/src/main/resources/mapper/system/SysConfigMapper.xml new file mode 100644 index 0000000..8b97906 --- /dev/null +++ b/ruoyi-system/src/main/resources/mapper/system/SysConfigMapper.xml @@ -0,0 +1,112 @@ + + + + + + + + + + + + + + + + + + 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/ruoyi-system/src/main/resources/mapper/system/SysDeptMapper.xml b/ruoyi-system/src/main/resources/mapper/system/SysDeptMapper.xml new file mode 100644 index 0000000..b01bb32 --- /dev/null +++ b/ruoyi-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/ruoyi-system/src/main/resources/mapper/system/SysDictDataMapper.xml b/ruoyi-system/src/main/resources/mapper/system/SysDictDataMapper.xml new file mode 100644 index 0000000..8da9030 --- /dev/null +++ b/ruoyi-system/src/main/resources/mapper/system/SysDictDataMapper.xml @@ -0,0 +1,124 @@ + + + + + + + + + + + + + + + + + + + + + + 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/ruoyi-system/src/main/resources/mapper/system/SysDictTypeMapper.xml b/ruoyi-system/src/main/resources/mapper/system/SysDictTypeMapper.xml new file mode 100644 index 0000000..55b4075 --- /dev/null +++ b/ruoyi-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/ruoyi-system/src/main/resources/mapper/system/SysLogininforMapper.xml b/ruoyi-system/src/main/resources/mapper/system/SysLogininforMapper.xml new file mode 100644 index 0000000..b8178fa --- /dev/null +++ b/ruoyi-system/src/main/resources/mapper/system/SysLogininforMapper.xml @@ -0,0 +1,57 @@ + + + + + + + + + + + + + + + + + + insert into sys_logininfor (user_name, status, ipaddr, login_location, browser, os, msg, login_time) + values (#{userName}, #{status}, #{ipaddr}, #{loginLocation}, #{browser}, #{os}, #{msg}, sysdate()) + + + + + + delete from sys_logininfor where info_id in + + #{infoId} + + + + + truncate table sys_logininfor + + + \ No newline at end of file diff --git a/ruoyi-system/src/main/resources/mapper/system/SysMenuMapper.xml b/ruoyi-system/src/main/resources/mapper/system/SysMenuMapper.xml new file mode 100644 index 0000000..2ad833c --- /dev/null +++ b/ruoyi-system/src/main/resources/mapper/system/SysMenuMapper.xml @@ -0,0 +1,195 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + select menu_id, menu_name, parent_id, order_num, path, component, `query`, 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}, + 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`, + is_frame, + is_cache, + menu_type, + visible, + status, + perms, + icon, + remark, + create_by, + create_time + )values( + #{menuId}, + #{parentId}, + #{menuName}, + #{orderNum}, + #{path}, + #{component}, + #{query}, + #{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/ruoyi-system/src/main/resources/mapper/system/SysNoticeMapper.xml b/ruoyi-system/src/main/resources/mapper/system/SysNoticeMapper.xml new file mode 100644 index 0000000..65d3079 --- /dev/null +++ b/ruoyi-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/ruoyi-system/src/main/resources/mapper/system/SysOperLogMapper.xml b/ruoyi-system/src/main/resources/mapper/system/SysOperLogMapper.xml new file mode 100644 index 0000000..f017ef8 --- /dev/null +++ b/ruoyi-system/src/main/resources/mapper/system/SysOperLogMapper.xml @@ -0,0 +1,83 @@ + + + + + + + + + + + + + + + + + + + + + + + + + select oper_id, title, business_type, method, request_method, operator_type, oper_name, dept_name, oper_url, oper_ip, oper_location, oper_param, json_result, status, error_msg, oper_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_location, oper_param, json_result, status, error_msg, oper_time) + values (#{title}, #{businessType}, #{method}, #{requestMethod}, #{operatorType}, #{operName}, #{deptName}, #{operUrl}, #{operIp}, #{operLocation}, #{operParam}, #{jsonResult}, #{status}, #{errorMsg}, 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/ruoyi-system/src/main/resources/mapper/system/SysPostMapper.xml b/ruoyi-system/src/main/resources/mapper/system/SysPostMapper.xml new file mode 100644 index 0000000..fc37f49 --- /dev/null +++ b/ruoyi-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/ruoyi-system/src/main/resources/mapper/system/SysRoleDeptMapper.xml b/ruoyi-system/src/main/resources/mapper/system/SysRoleDeptMapper.xml new file mode 100644 index 0000000..7c4139b --- /dev/null +++ b/ruoyi-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/ruoyi-system/src/main/resources/mapper/system/SysRoleMapper.xml b/ruoyi-system/src/main/resources/mapper/system/SysRoleMapper.xml new file mode 100644 index 0000000..96e8615 --- /dev/null +++ b/ruoyi-system/src/main/resources/mapper/system/SysRoleMapper.xml @@ -0,0 +1,152 @@ + + + + + + + + + + + + + + + + + + + + + + + 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/ruoyi-system/src/main/resources/mapper/system/SysRoleMenuMapper.xml b/ruoyi-system/src/main/resources/mapper/system/SysRoleMenuMapper.xml new file mode 100644 index 0000000..cb60a85 --- /dev/null +++ b/ruoyi-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/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml b/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml new file mode 100644 index 0000000..02f3a7b --- /dev/null +++ b/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml @@ -0,0 +1,221 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 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/ruoyi-system/src/main/resources/mapper/system/SysUserPostMapper.xml b/ruoyi-system/src/main/resources/mapper/system/SysUserPostMapper.xml new file mode 100644 index 0000000..2b90bc4 --- /dev/null +++ b/ruoyi-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/ruoyi-system/src/main/resources/mapper/system/SysUserRoleMapper.xml b/ruoyi-system/src/main/resources/mapper/system/SysUserRoleMapper.xml new file mode 100644 index 0000000..dd72689 --- /dev/null +++ b/ruoyi-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/ry.bat b/ry.bat new file mode 100644 index 0000000..ac1e437 --- /dev/null +++ b/ry.bat @@ -0,0 +1,67 @@ +@echo off + +rem jarƽĿ¼ +set AppName=ruoyi-admin.jar + +rem JVM +set JVM_OPTS="-Dname=%AppName% -Duser.timezone=Asia/Shanghai -Xms512m -Xmx1024m -XX:MetaspaceSize=128m -XX:MaxMetaspaceSize=512m -XX:+HeapDumpOnOutOfMemoryError -XX:+PrintGCDateStamps -XX:+PrintGCDetails -XX:NewRatio=1 -XX:SurvivorRatio=30 -XX:+UseParallelGC -XX:+UseParallelOldGC" + + +ECHO. + ECHO. [1] %AppName% + ECHO. [2] ر%AppName% + ECHO. [3] %AppName% + ECHO. [4] ״̬ %AppName% + ECHO. [5] +ECHO. + +ECHO.ѡĿ: +set /p ID= + IF "%id%"=="1" GOTO start + IF "%id%"=="2" GOTO stop + IF "%id%"=="3" GOTO restart + IF "%id%"=="4" GOTO status + IF "%id%"=="5" EXIT +PAUSE +:start + for /f "usebackq tokens=1-2" %%a in (`jps -l ^| findstr %AppName%`) do ( + set pid=%%a + set image_name=%%b + ) + if defined pid ( + echo %%is running + PAUSE + ) + +start javaw %JVM_OPTS% -jar %AppName% + +echo starting +echo Start %AppName% success... +goto:eof + +rem stopͨjpspid +:stop + for /f "usebackq tokens=1-2" %%a in (`jps -l ^| findstr %AppName%`) do ( + set pid=%%a + set image_name=%%b + ) + if not defined pid (echo process %AppName% does not exists) else ( + echo prepare to kill %image_name% + echo start kill %pid% ... + rem ݽIDkill + taskkill /f /pid %pid% + ) +goto:eof +:restart + call :stop + call :start +goto:eof +:status + for /f "usebackq tokens=1-2" %%a in (`jps -l ^| findstr %AppName%`) do ( + set pid=%%a + set image_name=%%b + ) + if not defined pid (echo process %AppName% is dead ) else ( + echo %image_name% is running + ) +goto:eof diff --git a/ry.sh b/ry.sh new file mode 100644 index 0000000..d6a9cf3 --- /dev/null +++ b/ry.sh @@ -0,0 +1,86 @@ +#!/bin/sh +# ./ry.sh start 启动 stop 停止 restart 重启 status 状态 +AppName=ruoyi-admin.jar + +# JVM参数 +JVM_OPTS="-Dname=$AppName -Duser.timezone=Asia/Shanghai -Xms512m -Xmx1024m -XX:MetaspaceSize=128m -XX:MaxMetaspaceSize=512m -XX:+HeapDumpOnOutOfMemoryError -XX:+PrintGCDateStamps -XX:+PrintGCDetails -XX:NewRatio=1 -XX:SurvivorRatio=30 -XX:+UseParallelGC -XX:+UseParallelOldGC" +APP_HOME=`pwd` +LOG_PATH=$APP_HOME/logs/$AppName.log + +if [ "$1" = "" ]; +then + echo -e "\033[0;31m 未输入操作名 \033[0m \033[0;34m {start|stop|restart|status} \033[0m" + exit 1 +fi + +if [ "$AppName" = "" ]; +then + echo -e "\033[0;31m 未输入应用名 \033[0m" + exit 1 +fi + +function start() +{ + PID=`ps -ef |grep java|grep $AppName|grep -v grep|awk '{print $2}'` + + if [ x"$PID" != x"" ]; then + echo "$AppName is running..." + else + nohup java $JVM_OPTS -jar $AppName > /dev/null 2>&1 & + echo "Start $AppName success..." + fi +} + +function stop() +{ + echo "Stop $AppName" + + PID="" + query(){ + PID=`ps -ef |grep java|grep $AppName|grep -v grep|awk '{print $2}'` + } + + query + if [ x"$PID" != x"" ]; then + kill -TERM $PID + echo "$AppName (pid:$PID) exiting..." + while [ x"$PID" != x"" ] + do + sleep 1 + query + done + echo "$AppName exited." + else + echo "$AppName already stopped." + fi +} + +function restart() +{ + stop + sleep 2 + start +} + +function status() +{ + PID=`ps -ef |grep java|grep $AppName|grep -v grep|wc -l` + if [ $PID != 0 ];then + echo "$AppName is running..." + else + echo "$AppName is not running..." + fi +} + +case $1 in + start) + start;; + stop) + stop;; + restart) + restart;; + status) + status;; + *) + +esac 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_20210908.sql b/sql/ry_20210908.sql new file mode 100644 index 0000000..650238a --- /dev/null +++ b/sql/ry_20210908.sql @@ -0,0 +1,688 @@ +-- ---------------------------- +-- 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 '路由参数', + 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', '数据监控', '2', '3', 'druid', 'monitor/druid/index', '', 1, 0, 'C', '0', '0', 'monitor:druid:list', 'druid', 'admin', sysdate(), '', null, '数据监控菜单'); +insert into sys_menu values('112', '服务监控', '2', '4', 'server', 'monitor/server/index', '', 1, 0, 'C', '0', '0', 'monitor:server:list', 'server', 'admin', sysdate(), '', null, '服务监控菜单'); +insert into sys_menu values('113', '缓存监控', '2', '5', 'cache', 'monitor/cache/index', '', 1, 0, 'C', '0', '0', 'monitor:cache:list', 'redis', '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', 'swagger', 'tool/swagger/index', '', 1, 0, 'C', '0', '0', 'tool:swagger:list', 'swagger', 'admin', sysdate(), '', null, '系统接口菜单'); +-- 三级菜单 +insert into sys_menu values('500', '操作日志', '108', '1', 'operlog', 'monitor/operlog/index', '', 1, 0, 'C', '0', '0', 'monitor:operlog:list', 'form', 'admin', sysdate(), '', null, '操作日志菜单'); +insert into sys_menu values('501', '登录日志', '108', '2', 'logininfor', 'monitor/logininfor/index', '', 1, 0, 'C', '0', '0', 'monitor:logininfor:list', 'logininfor', 'admin', sysdate(), '', null, '登录日志菜单'); +-- 用户管理按钮 +insert into sys_menu values('1001', '用户查询', '100', '1', '', '', '', 1, 0, 'F', '0', '0', 'system:user:query', '#', 'admin', sysdate(), '', null, ''); +insert into sys_menu values('1002', '用户新增', '100', '2', '', '', '', 1, 0, 'F', '0', '0', 'system:user:add', '#', 'admin', sysdate(), '', null, ''); +insert into sys_menu values('1003', '用户修改', '100', '3', '', '', '', 1, 0, 'F', '0', '0', 'system:user:edit', '#', 'admin', sysdate(), '', null, ''); +insert into sys_menu values('1004', '用户删除', '100', '4', '', '', '', 1, 0, 'F', '0', '0', 'system:user:remove', '#', 'admin', sysdate(), '', null, ''); +insert into sys_menu values('1005', '用户导出', '100', '5', '', '', '', 1, 0, 'F', '0', '0', 'system:user:export', '#', 'admin', sysdate(), '', null, ''); +insert into sys_menu values('1006', '用户导入', '100', '6', '', '', '', 1, 0, 'F', '0', '0', 'system:user:import', '#', 'admin', sysdate(), '', null, ''); +insert into sys_menu values('1007', '重置密码', '100', '7', '', '', '', 1, 0, 'F', '0', '0', 'system:user:resetPwd', '#', 'admin', sysdate(), '', null, ''); +-- 角色管理按钮 +insert into sys_menu values('1008', '角色查询', '101', '1', '', '', '', 1, 0, 'F', '0', '0', 'system:role:query', '#', 'admin', sysdate(), '', null, ''); +insert into sys_menu values('1009', '角色新增', '101', '2', '', '', '', 1, 0, 'F', '0', '0', 'system:role:add', '#', 'admin', sysdate(), '', null, ''); +insert into sys_menu values('1010', '角色修改', '101', '3', '', '', '', 1, 0, 'F', '0', '0', 'system:role:edit', '#', 'admin', sysdate(), '', null, ''); +insert into sys_menu values('1011', '角色删除', '101', '4', '', '', '', 1, 0, 'F', '0', '0', 'system:role:remove', '#', 'admin', sysdate(), '', null, ''); +insert into sys_menu values('1012', '角色导出', '101', '5', '', '', '', 1, 0, 'F', '0', '0', 'system:role:export', '#', 'admin', sysdate(), '', null, ''); +-- 菜单管理按钮 +insert into sys_menu values('1013', '菜单查询', '102', '1', '', '', '', 1, 0, 'F', '0', '0', 'system:menu:query', '#', 'admin', sysdate(), '', null, ''); +insert into sys_menu values('1014', '菜单新增', '102', '2', '', '', '', 1, 0, 'F', '0', '0', 'system:menu:add', '#', 'admin', sysdate(), '', null, ''); +insert into sys_menu values('1015', '菜单修改', '102', '3', '', '', '', 1, 0, 'F', '0', '0', 'system:menu:edit', '#', 'admin', sysdate(), '', null, ''); +insert into sys_menu values('1016', '菜单删除', '102', '4', '', '', '', 1, 0, 'F', '0', '0', 'system:menu:remove', '#', 'admin', sysdate(), '', null, ''); +-- 部门管理按钮 +insert into sys_menu values('1017', '部门查询', '103', '1', '', '', '', 1, 0, 'F', '0', '0', 'system:dept:query', '#', 'admin', sysdate(), '', null, ''); +insert into sys_menu values('1018', '部门新增', '103', '2', '', '', '', 1, 0, 'F', '0', '0', 'system:dept:add', '#', 'admin', sysdate(), '', null, ''); +insert into sys_menu values('1019', '部门修改', '103', '3', '', '', '', 1, 0, 'F', '0', '0', 'system:dept:edit', '#', 'admin', sysdate(), '', null, ''); +insert into sys_menu values('1020', '部门删除', '103', '4', '', '', '', 1, 0, 'F', '0', '0', 'system:dept:remove', '#', 'admin', sysdate(), '', null, ''); +-- 岗位管理按钮 +insert into sys_menu values('1021', '岗位查询', '104', '1', '', '', '', 1, 0, 'F', '0', '0', 'system:post:query', '#', 'admin', sysdate(), '', null, ''); +insert into sys_menu values('1022', '岗位新增', '104', '2', '', '', '', 1, 0, 'F', '0', '0', 'system:post:add', '#', 'admin', sysdate(), '', null, ''); +insert into sys_menu values('1023', '岗位修改', '104', '3', '', '', '', 1, 0, 'F', '0', '0', 'system:post:edit', '#', 'admin', sysdate(), '', null, ''); +insert into sys_menu values('1024', '岗位删除', '104', '4', '', '', '', 1, 0, 'F', '0', '0', 'system:post:remove', '#', 'admin', sysdate(), '', null, ''); +insert into sys_menu values('1025', '岗位导出', '104', '5', '', '', '', 1, 0, 'F', '0', '0', 'system:post:export', '#', 'admin', sysdate(), '', null, ''); +-- 字典管理按钮 +insert into sys_menu values('1026', '字典查询', '105', '1', '#', '', '', 1, 0, 'F', '0', '0', 'system:dict:query', '#', 'admin', sysdate(), '', null, ''); +insert into sys_menu values('1027', '字典新增', '105', '2', '#', '', '', 1, 0, 'F', '0', '0', 'system:dict:add', '#', 'admin', sysdate(), '', null, ''); +insert into sys_menu values('1028', '字典修改', '105', '3', '#', '', '', 1, 0, 'F', '0', '0', 'system:dict:edit', '#', 'admin', sysdate(), '', null, ''); +insert into sys_menu values('1029', '字典删除', '105', '4', '#', '', '', 1, 0, 'F', '0', '0', 'system:dict:remove', '#', 'admin', sysdate(), '', null, ''); +insert into sys_menu values('1030', '字典导出', '105', '5', '#', '', '', 1, 0, 'F', '0', '0', 'system:dict:export', '#', 'admin', sysdate(), '', null, ''); +-- 参数设置按钮 +insert into sys_menu values('1031', '参数查询', '106', '1', '#', '', '', 1, 0, 'F', '0', '0', 'system:config:query', '#', 'admin', sysdate(), '', null, ''); +insert into sys_menu values('1032', '参数新增', '106', '2', '#', '', '', 1, 0, 'F', '0', '0', 'system:config:add', '#', 'admin', sysdate(), '', null, ''); +insert into sys_menu values('1033', '参数修改', '106', '3', '#', '', '', 1, 0, 'F', '0', '0', 'system:config:edit', '#', 'admin', sysdate(), '', null, ''); +insert into sys_menu values('1034', '参数删除', '106', '4', '#', '', '', 1, 0, 'F', '0', '0', 'system:config:remove', '#', 'admin', sysdate(), '', null, ''); +insert into sys_menu values('1035', '参数导出', '106', '5', '#', '', '', 1, 0, 'F', '0', '0', 'system:config:export', '#', 'admin', sysdate(), '', null, ''); +-- 通知公告按钮 +insert into sys_menu values('1036', '公告查询', '107', '1', '#', '', '', 1, 0, 'F', '0', '0', 'system:notice:query', '#', 'admin', sysdate(), '', null, ''); +insert into sys_menu values('1037', '公告新增', '107', '2', '#', '', '', 1, 0, 'F', '0', '0', 'system:notice:add', '#', 'admin', sysdate(), '', null, ''); +insert into sys_menu values('1038', '公告修改', '107', '3', '#', '', '', 1, 0, 'F', '0', '0', 'system:notice:edit', '#', 'admin', sysdate(), '', null, ''); +insert into sys_menu values('1039', '公告删除', '107', '4', '#', '', '', 1, 0, 'F', '0', '0', 'system:notice:remove', '#', 'admin', sysdate(), '', null, ''); +-- 操作日志按钮 +insert into sys_menu values('1040', '操作查询', '500', '1', '#', '', '', 1, 0, 'F', '0', '0', 'monitor:operlog:query', '#', 'admin', sysdate(), '', null, ''); +insert into sys_menu values('1041', '操作删除', '500', '2', '#', '', '', 1, 0, 'F', '0', '0', 'monitor:operlog:remove', '#', 'admin', sysdate(), '', null, ''); +insert into sys_menu values('1042', '日志导出', '500', '4', '#', '', '', 1, 0, 'F', '0', '0', 'monitor:operlog:export', '#', 'admin', sysdate(), '', null, ''); +-- 登录日志按钮 +insert into sys_menu values('1043', '登录查询', '501', '1', '#', '', '', 1, 0, 'F', '0', '0', 'monitor:logininfor:query', '#', 'admin', sysdate(), '', null, ''); +insert into sys_menu values('1044', '登录删除', '501', '2', '#', '', '', 1, 0, 'F', '0', '0', 'monitor:logininfor:remove', '#', 'admin', sysdate(), '', null, ''); +insert into sys_menu values('1045', '日志导出', '501', '3', '#', '', '', 1, 0, 'F', '0', '0', 'monitor:logininfor:export', '#', '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', '7', '#', '', '', 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(100) 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 '操作时间', + primary key (oper_id) +) 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, 1, '新增', '1', 'sys_oper_type', '', 'info', 'N', '0', 'admin', sysdate(), '', null, '新增操作'); +insert into sys_dict_data values(19, 2, '修改', '2', 'sys_oper_type', '', 'info', 'N', '0', 'admin', sysdate(), '', null, '修改操作'); +insert into sys_dict_data values(20, 3, '删除', '3', 'sys_oper_type', '', 'danger', 'N', '0', 'admin', sysdate(), '', null, '删除操作'); +insert into sys_dict_data values(21, 4, '授权', '4', 'sys_oper_type', '', 'primary', 'N', '0', 'admin', sysdate(), '', null, '授权操作'); +insert into sys_dict_data values(22, 5, '导出', '5', 'sys_oper_type', '', 'warning', 'N', '0', 'admin', sysdate(), '', null, '导出操作'); +insert into sys_dict_data values(23, 6, '导入', '6', 'sys_oper_type', '', 'warning', 'N', '0', 'admin', sysdate(), '', null, '导入操作'); +insert into sys_dict_data values(24, 7, '强退', '7', 'sys_oper_type', '', 'danger', 'N', '0', 'admin', sysdate(), '', null, '强退操作'); +insert into sys_dict_data values(25, 8, '生成代码', '8', 'sys_oper_type', '', 'warning', 'N', '0', 'admin', sysdate(), '', null, '生成操作'); +insert into sys_dict_data values(26, 9, '清空数据', '9', 'sys_oper_type', '', 'danger', 'N', '0', 'admin', sysdate(), '', null, '清空操作'); +insert into sys_dict_data values(27, 1, '成功', '0', 'sys_common_status', '', 'primary', 'N', '0', 'admin', sysdate(), '', null, '正常状态'); +insert into sys_dict_data values(28, 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.captchaOnOff', 'true', 'Y', 'admin', sysdate(), '', null, '是否开启验证码功能（true开启，false关闭）'); +insert into sys_config values(5, '账号自助-是否开启用户注册功能', 'sys.account.registerUser', 'false', 'Y', 'admin', sysdate(), '', null, '是否开启注册用户功能（true开启，false关闭）'); + + +-- ---------------------------- +-- 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地址', + login_location varchar(255) default '' comment '登录地点', + browser varchar(50) default '' comment '浏览器类型', + os varchar(50) default '' comment '操作系统', + status char(1) default '0' comment '登录状态（0成功 1失败）', + msg varchar(255) default '' comment '提示消息', + login_time datetime comment '访问时间', + primary key (info_id) +) 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树表操作）', + 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 varchar(64) 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 = '代码生成业务表字段'; \ No newline at end of file diff --git a/swlscx/pom.xml b/swlscx/pom.xml new file mode 100644 index 0000000..3e61d3a --- /dev/null +++ b/swlscx/pom.xml @@ -0,0 +1,33 @@ + + + 4.0.0 + + com.ruoyi + ruoyi + 3.8.1 + + + swlscx + + + 11 + 11 + UTF-8 + + + + + + com.ruoyi + ruoyi-common + + + + org.springframework.boot + spring-boot-test + + org.apache.maven.pluginsmaven-compiler-plugin88 + + \ No newline at end of file diff --git a/swlscx/src/main/java/com/ruoyi/swlscx/basic/controller/BaseExportController.java b/swlscx/src/main/java/com/ruoyi/swlscx/basic/controller/BaseExportController.java new file mode 100644 index 0000000..ad11c6b --- /dev/null +++ b/swlscx/src/main/java/com/ruoyi/swlscx/basic/controller/BaseExportController.java @@ -0,0 +1,37 @@ +package com.ruoyi.swlscx.basic.controller; + +import com.ruoyi.common.core.page.R; +import com.ruoyi.swlscx.basic.service.HyStscAService; +import lombok.RequiredArgsConstructor; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestParam; +import org.springframework.web.bind.annotation.RestController; + +import javax.servlet.http.HttpServletResponse; + +/** + * @Author al + * @Date 2024/9/27 15:16 + * @Description: TODO + * @Version + */ +@RestController +@RequestMapping("/report") +@RequiredArgsConstructor +public class BaseExportController { + + private final HyStscAService hyStscAService; + + + /** + * 导出测站一览表 + */ + @RequestMapping("/station") + public R exportStation(HttpServletResponse response, + @RequestParam String startTime, + @RequestParam String endTime, + @RequestParam String stcd, + @RequestParam String stnm) { + return hyStscAService.exportStation(response,startTime,endTime,stcd,stnm); + } +} diff --git a/swlscx/src/main/java/com/ruoyi/swlscx/basic/controller/BaseInfoController.java b/swlscx/src/main/java/com/ruoyi/swlscx/basic/controller/BaseInfoController.java new file mode 100644 index 0000000..06ab7aa --- /dev/null +++ b/swlscx/src/main/java/com/ruoyi/swlscx/basic/controller/BaseInfoController.java @@ -0,0 +1,68 @@ +package com.ruoyi.swlscx.basic.controller; + +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.ruoyi.common.core.page.R; +import com.ruoyi.swlscx.basic.domain.po.YcExportTask; +import com.ruoyi.swlscx.basic.domain.vo.HyStscAVo; +import com.ruoyi.swlscx.basic.service.YcExportTaskService; +import com.ruoyi.swlscx.common.PageParams; +import com.ruoyi.swlscx.basic.service.HyStscAService; +import lombok.RequiredArgsConstructor; +import org.springframework.security.access.prepost.PreAuthorize; +import org.springframework.web.bind.annotation.*; + +import javax.servlet.http.HttpServletResponse; +import java.util.Map; + +/** + * @Author al + * @Date 2024/8/4 14:36 + * @Description: TODO + * @Version + */ +@RestController +@RequestMapping("/basic") +@RequiredArgsConstructor +public class BaseInfoController { + + private final HyStscAService hyStscAService; + + private final YcExportTaskService ycExportTaskService; + + /** + * 查询站点信息 + */ + @GetMapping("/getStationPageByInfo") + public R getStationPageByInfo(Integer pageNum,Integer pageSize, String stnm,String stcd, String startTime, String endTime) { + PageParams pageParams = new PageParams(pageNum.longValue(), pageSize.longValue()); + IPage stationPageByInfo = hyStscAService.getStationPageByInfo(pageParams, stnm, stcd, startTime, endTime); + return R.ok().put("data", stationPageByInfo.getRecords()).put("count", stationPageByInfo.getTotal()); + } + + /** + * 查询列表 + */ + @RequestMapping("/cgtask/list") + public R list(@RequestParam Map params){ + return ycExportTaskService.queryPage(params); + } + + @RequestMapping("/downloadExcel/{id}") + public void batchDownload(HttpServletResponse response, @PathVariable("id") Long id){ + YcExportTask t = ycExportTaskService.getById(id); + ycExportTaskService.downloadExcel(response,t); + } + + @DeleteMapping("/cgtask/delete/{id}") + public R delete(@PathVariable("id")Integer id){ + return ycExportTaskService.removeTask(id); + } + + + + @PostMapping("/importDateToSoft") + public R importDateToSoft(String startTime, String endTime){ + return hyStscAService.importDateTosoft(startTime,endTime); + } + +} diff --git a/swlscx/src/main/java/com/ruoyi/swlscx/basic/domain/bo/HyStscABo.java b/swlscx/src/main/java/com/ruoyi/swlscx/basic/domain/bo/HyStscABo.java new file mode 100644 index 0000000..aabc759 --- /dev/null +++ b/swlscx/src/main/java/com/ruoyi/swlscx/basic/domain/bo/HyStscABo.java @@ -0,0 +1,107 @@ +package com.ruoyi.swlscx.basic.domain.bo; + +import com.alibaba.excel.annotation.ExcelProperty; +import lombok.Data; + +import java.io.Serializable; +import java.math.BigDecimal; + +/** + * 测站一览表 + * @Author al + * @Date 2024/7/30 13:52 + * @Description: TODO + * @Version + */ + +@Data +public class HyStscABo implements Serializable { + + @ExcelProperty(value = "站码",index = 1) + private String stcd; + + @ExcelProperty(value = "站名",index = 2) + private String stnm; + + + private String stct; + + @ExcelProperty(value = "流域名称",index = 3) + private String bshncd; + + @ExcelProperty(value = "水系名称",index = 4) + private String hnnm; + + + @ExcelProperty(value = "河流名称",index = 5) + private String rvnm; + + @ExcelProperty(value = "施测项目码",index = 6) + private String obitmcd; + + @ExcelProperty(value = "行政区划码",index = 7) + private String addvcd; + + @ExcelProperty(value = "水资源分区码",index = 8) + private String wrrgcd; + + @ExcelProperty(value = "设站年份",index = 9) + private String esstyr; + + + @ExcelProperty(value = "设站月份",index = 10) + private String esstmth; + + @ExcelProperty(value = "撤站年份",index = 11) + private String wdstyr; + + @ExcelProperty(value = "撤站月份",index = 12) + private String wdstmth; + + @ExcelProperty(value = "集水面积",index = 13) + private String drar; + + + @ExcelProperty(value = "流入何处",index = 14) + private String flto; + + + @ExcelProperty(value = "至河口距离",index = 15) + private String dstrvm; + + + @ExcelProperty(value = "基准基面名称",index = 16) + private String fdtmnm; + + + @ExcelProperty(value = "领导机关",index = 17) + private String admag; + + + @ExcelProperty(value = "管理单位",index = 18) + private String admnst; + + + @ExcelProperty(value = "站址",index = 19) + private String stlc; + + + @ExcelProperty(value = "东经",index = 20) + private String lgtd; + + + @ExcelProperty(value = "北纬",index = 21) + private String lttd; + + @ExcelProperty(value = "测站等级",index = 22) + private String stgrd; + + @ExcelProperty(value = "报汛等级",index = 23) + private String frgrd; + + @ExcelProperty(value = "备注",index = 24) + private String nt; + + private static final long serialVersionUID = 1L; + +} diff --git a/swlscx/src/main/java/com/ruoyi/swlscx/basic/domain/po/HyStscA.java b/swlscx/src/main/java/com/ruoyi/swlscx/basic/domain/po/HyStscA.java new file mode 100644 index 0000000..3cd620f --- /dev/null +++ b/swlscx/src/main/java/com/ruoyi/swlscx/basic/domain/po/HyStscA.java @@ -0,0 +1,68 @@ +package com.ruoyi.swlscx.basic.domain.po; + +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 java.io.Serializable; +import java.math.BigDecimal; +import lombok.Data; + +/** + * @TableName 测站一览表 + */ +@TableName(value ="hy_stsc_a") +@Data +public class HyStscA implements Serializable { + private String stcd; + + private String stnm; + + private String stct; + + private String bshncd; + + private String hnnm; + + private String rvnm; + + private String obitmcd; + + private String addvcd; + + private String wrrgcd; + + private Integer esstyr; + + private Integer esstmth; + + private Integer wdstyr; + + private Integer wdstmth; + + private BigDecimal drar; + + private String flto; + + private BigDecimal dstrvm; + + private String fdtmnm; + + private String admag; + + private String admnst; + + private String stlc; + + private BigDecimal lgtd; + + private BigDecimal lttd; + + private String stgrd; + + private String frgrd; + + private String nt; + + private static final long serialVersionUID = 1L; +} \ No newline at end of file diff --git a/swlscx/src/main/java/com/ruoyi/swlscx/basic/domain/po/YcExportTask.java b/swlscx/src/main/java/com/ruoyi/swlscx/basic/domain/po/YcExportTask.java new file mode 100644 index 0000000..2825490 --- /dev/null +++ b/swlscx/src/main/java/com/ruoyi/swlscx/basic/domain/po/YcExportTask.java @@ -0,0 +1,54 @@ +package com.ruoyi.swlscx.basic.domain.po; + +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 java.io.Serializable; +import java.util.Date; +import lombok.Data; + +/** + * 导出任务 + * @TableName yc_export_task + */ +@TableName(value ="yc_export_task") +@Data +public class YcExportTask implements Serializable { + /** + * + */ + @TableId(value = "id", type = IdType.AUTO) + private Long id; + + /** + * 开始时间 + */ + private Date startTime; + + /** + * 结束时间 + */ + private Date endTime; + + /** + * 状态 0 进行中 1 完成 + */ + private Integer status; + + + /** + * 文件名称 + */ + private String filename; + + /** + * + */ + private Long userId; + + private String filepath; + + @TableField(exist = false) + private static final long serialVersionUID = 1L; +} \ No newline at end of file diff --git a/swlscx/src/main/java/com/ruoyi/swlscx/basic/domain/vo/HyStscAVo.java b/swlscx/src/main/java/com/ruoyi/swlscx/basic/domain/vo/HyStscAVo.java new file mode 100644 index 0000000..808b014 --- /dev/null +++ b/swlscx/src/main/java/com/ruoyi/swlscx/basic/domain/vo/HyStscAVo.java @@ -0,0 +1,105 @@ +package com.ruoyi.swlscx.basic.domain.vo; + +import com.alibaba.excel.annotation.ExcelProperty; +import lombok.Data; + +import java.io.Serializable; +import java.math.BigDecimal; + +/** + * 测站一览表 + * @Author al + * @Date 2024/7/30 13:52 + * @Description: TODO + * @Version + */ + +@Data +public class HyStscAVo implements Serializable { + + /** 站码 */ + private String stcd; + + /**站名**/ + private String stnm; + + + /**流域名称**/ + private String bshncd; + + /**水系名称**/ + private String hnnm; + + + /**河流名称**/ + private String rvnm; + + /**施测项目码**/ + private String obitmcd; + + /**行政区划码**/ + private String addvcd; + + /**水资源分区码 **/ + private String wrrgcd; + + /**设站年份**/ + private String esstyr; + + + /**设站月份**/ + private String esstmth; + + /**撤站年份**/ + private String wdstyr; + + /**撤站月份**/ + private String wdstmth; + + /**集水面积**/ + private String drar; + + + /**流入何处**/ + private String flto; + + + /**至河口距离**/ + private String dstrvm; + + + /**基准基面名称**/ + private String fdtmnm; + + + /**领导机关**/ + private String admag; + + + /**管理单位**/ + private String admnst; + + + /**站址**/ + private String stlc; + + + /**东经**/ + private BigDecimal lgtd; + + + /**北纬**/ + private BigDecimal lttd; + + /**测站等级**/ + private String stgrd; + + /**报汛等级**/ + private String frgrd; + + /**备注**/ + private String nt; + + private static final long serialVersionUID = 1L; + +} diff --git a/swlscx/src/main/java/com/ruoyi/swlscx/basic/mapper/HyStscAMapper.java b/swlscx/src/main/java/com/ruoyi/swlscx/basic/mapper/HyStscAMapper.java new file mode 100644 index 0000000..b656999 --- /dev/null +++ b/swlscx/src/main/java/com/ruoyi/swlscx/basic/mapper/HyStscAMapper.java @@ -0,0 +1,40 @@ +package com.ruoyi.swlscx.basic.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.ruoyi.swlscx.basic.domain.po.HyStscA; +import com.ruoyi.swlscx.basic.domain.vo.HyStscAVo; +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; + +import java.util.List; +import java.util.Map; + +/** +* @author 12974 +* @description 针对表【hy_stsc_a】的数据库操作Mapper +* @createDate 2024-07-30 13:37:07 +* @Entity com.ruoyi.swlscx.domain.po.po.HyStscA +*/ + +@Mapper +public interface HyStscAMapper extends BaseMapper { + + /** + * 查询站点信息 + */ + IPage selectHyStscAPageByInfo(Page page, @Param("map") Map map); + + + + void deleteTempData(); + + void mergeToData(); + + void insertTempData(@Param("list") List records); +} + + + + diff --git a/swlscx/src/main/java/com/ruoyi/swlscx/basic/mapper/YcExportTaskMapper.java b/swlscx/src/main/java/com/ruoyi/swlscx/basic/mapper/YcExportTaskMapper.java new file mode 100644 index 0000000..4769bac --- /dev/null +++ b/swlscx/src/main/java/com/ruoyi/swlscx/basic/mapper/YcExportTaskMapper.java @@ -0,0 +1,27 @@ +package com.ruoyi.swlscx.basic.mapper; + +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.ruoyi.swlscx.basic.domain.po.YcExportTask; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import org.apache.ibatis.annotations.Param; + +import java.util.List; +import java.util.Map; + +/** +* @author 12974 +* @description 针对表【yc_export_task(导出任务)】的数据库操作Mapper +* @createDate 2024-10-23 13:57:23 +* @Entity com.ruoyi.swlscx.basic.domain.po.YcExportTask +*/ +public interface YcExportTaskMapper extends BaseMapper { + + IPage queryPage(Page page,@Param("map") Map params); + + List> test(); +} + + + + diff --git a/swlscx/src/main/java/com/ruoyi/swlscx/basic/service/HyStscAService.java b/swlscx/src/main/java/com/ruoyi/swlscx/basic/service/HyStscAService.java new file mode 100644 index 0000000..05f11bd --- /dev/null +++ b/swlscx/src/main/java/com/ruoyi/swlscx/basic/service/HyStscAService.java @@ -0,0 +1,42 @@ +package com.ruoyi.swlscx.basic.service; + +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.service.IService; +import com.ruoyi.common.core.page.R; +import com.ruoyi.swlscx.basic.domain.vo.HyStscAVo; +import com.ruoyi.swlscx.common.PageParams; +import com.ruoyi.swlscx.basic.domain.po.HyStscA; +import org.springframework.web.multipart.MultipartFile; + +import javax.servlet.http.HttpServletResponse; + +/** +* @author 12974 +* @description 针对表【hy_stsc_a】的数据库操作Service +* @createDate 2024-07-30 13:37:07 +*/ +public interface HyStscAService extends IService { + + /** + * 导入站点信息数据 + */ + void importHyStsc(MultipartFile file); + + /** + * 查询站点信息 + */ + IPage getStationPageByInfo(PageParams pageParams, String stnm, String stcd, String startTime, String endTime); + + /** + * 导出测站一览表 + */ + R exportStation(HttpServletResponse response, String startTime, String endTime, String stcd, String stnm); + + R importDateTosoft(String startTime, String endTime); + + + /** + * 导出测站一览表 + */ + R testSqlServer(); +} diff --git a/swlscx/src/main/java/com/ruoyi/swlscx/basic/service/YcExportTaskService.java b/swlscx/src/main/java/com/ruoyi/swlscx/basic/service/YcExportTaskService.java new file mode 100644 index 0000000..79318ac --- /dev/null +++ b/swlscx/src/main/java/com/ruoyi/swlscx/basic/service/YcExportTaskService.java @@ -0,0 +1,26 @@ +package com.ruoyi.swlscx.basic.service; + +import com.ruoyi.common.core.page.R; +import com.ruoyi.swlscx.basic.domain.po.YcExportTask; +import com.baomidou.mybatisplus.extension.service.IService; + +import javax.servlet.http.HttpServletResponse; +import java.util.Map; + +/** +* @author 12974 +* @description 针对表【yc_export_task(导出任务)】的数据库操作Service +* @createDate 2024-10-23 13:57:23 +*/ +public interface YcExportTaskService extends IService { + + void addTask(HttpServletResponse response, String startTime, String endTime, String stcd, String stnm); + + R queryPage(Map params); + + void downloadExcel(HttpServletResponse response, YcExportTask t); + + R removeTask(Integer id); + + R getTest(); +} diff --git a/swlscx/src/main/java/com/ruoyi/swlscx/basic/service/impl/HyStscAServiceImpl.java b/swlscx/src/main/java/com/ruoyi/swlscx/basic/service/impl/HyStscAServiceImpl.java new file mode 100644 index 0000000..1b984f7 --- /dev/null +++ b/swlscx/src/main/java/com/ruoyi/swlscx/basic/service/impl/HyStscAServiceImpl.java @@ -0,0 +1,349 @@ +package com.ruoyi.swlscx.basic.service.impl; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.ruoyi.common.annotation.DataSource; +import com.ruoyi.common.config.RuoYiConfig; +import com.ruoyi.common.core.page.R; +import com.ruoyi.common.core.text.Convert; +import com.ruoyi.common.enums.DataSourceType; +import com.ruoyi.common.utils.DateUtils; +import com.ruoyi.common.utils.SecurityUtils; +import com.ruoyi.common.utils.bean.BeanUtils; +import com.ruoyi.swlscx.basic.domain.po.YcExportTask; +import com.ruoyi.swlscx.basic.service.YcExportTaskService; +import com.ruoyi.swlscx.common.PageParams; +import com.ruoyi.swlscx.basic.domain.bo.HyStscABo; +import com.ruoyi.swlscx.basic.domain.po.HyStscA; +import com.ruoyi.swlscx.basic.domain.vo.HyStscAVo; +import com.ruoyi.swlscx.basic.mapper.HyStscAMapper; +import com.ruoyi.swlscx.basic.service.HyStscAService; +import com.ruoyi.swlscx.common.utils.CommonUtils; +import com.ruoyi.swlscx.common.utils.ExcelUtils; +import com.ruoyi.swlscx.common.utils.Query; +import org.apache.commons.lang3.ObjectUtils; +import org.apache.poi.ss.usermodel.CellStyle; +import org.apache.poi.ss.usermodel.Row; +import org.apache.poi.ss.usermodel.Sheet; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.context.ApplicationContext; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; +import org.springframework.web.multipart.MultipartFile; + +import javax.annotation.Resource; +import javax.servlet.http.HttpServletResponse; +import java.io.File; +import java.util.*; +import java.util.concurrent.CompletableFuture; +import java.util.concurrent.ThreadPoolExecutor; +import java.util.stream.Collectors; + +/** +* @author 12974 +* @description 针对表【hy_stsc_a】的数据库操作Service实现 +* @createDate 2024-07-30 13:37:07 +*/ +@Service +public class HyStscAServiceImpl extends ServiceImpl + implements HyStscAService { + + @Resource + private ThreadPoolExecutor labelThreadPool; + + @Resource + private YcExportTaskService ycExportTaskService; + + @Resource + private ThreadPoolExecutor importThreadPool; + + @Autowired + private ApplicationContext context; + + + + + + + @Override + @Transactional(rollbackFor = Exception.class) + public void importHyStsc(MultipartFile file) { + try { + List hyStationBoList = ExcelUtils.readExcel(file.getInputStream(), HyStscABo.class, 2); + + List hyStationList = hyStationBoList.stream().map(i -> { + HyStscA hyStscA = new HyStscA(); + BeanUtils.copyProperties(i, hyStscA); + hyStscA.setDstrvm(Convert.toBigDecimal(i.getDstrvm())); + hyStscA.setDrar(Convert.toBigDecimal(i.getDrar())); + hyStscA.setLgtd(Convert.toBigDecimal(i.getLgtd())); + hyStscA.setLttd(Convert.toBigDecimal(i.getLttd())); + hyStscA.setEsstmth(Convert.toInt(i.getEsstmth())); + hyStscA.setEsstyr(Convert.toInt(i.getEsstyr())); + hyStscA.setWdstmth(Convert.toInt(i.getWdstmth())); + hyStscA.setEsstmth(Convert.toInt(i.getEsstmth())); + return hyStscA; + }).collect(Collectors.toList()); + this.saveBatch(hyStationList, 10000); + } catch (Exception e) { + e.printStackTrace(); + } + } + + /** + * 查询站点信息 + */ + @Override + @DataSource(DataSourceType.MASTER) + public IPage getStationPageByInfo(PageParams pageParams, String stnm,String stcd , String startTime, String endTime) { + Map map = CommonUtils.getMonthDataMap(pageParams, startTime, endTime, stcd, stnm); + return this.baseMapper.selectHyStscAPageByInfo(new Query().getPage(map), map); + } + + /** + * 导出测站一览表 + */ + @Override + public R exportStation(HttpServletResponse response, String startTime, String endTime, String stcd, String stnm) { + Long userId = SecurityUtils.getUserId(); + String tableName = "测站一览表"; + return taskAndExport(tableName,startTime, endTime, stcd, stnm, userId); + } + + /** + * 从mysql导入到sqlserver中 + */ + @Transactional(rollbackFor = Exception.class) + @DataSource(DataSourceType.SHARDING) + public void importMysqlToSqlserver(List hyStscAVoList) { + List records = hyStscAVoList.stream().map(i->{ + HyStscA hyStscA = new HyStscA(); + BeanUtils.copyProperties(i, hyStscA); + hyStscA.setDstrvm(Convert.toBigDecimal(i.getDstrvm())); + hyStscA.setDrar(Convert.toBigDecimal(i.getDrar())); + hyStscA.setLgtd(Convert.toBigDecimal(i.getLgtd())); + hyStscA.setLttd(Convert.toBigDecimal(i.getLttd())); + hyStscA.setEsstmth(Convert.toInt(i.getEsstmth())); + hyStscA.setEsstyr(Convert.toInt(i.getEsstyr())); + hyStscA.setWdstmth(Convert.toInt(i.getWdstmth())); + hyStscA.setEsstmth(Convert.toInt(i.getEsstmth())); + return hyStscA; + }).collect(Collectors.toList()); + //先清空临时表的数据 + this.baseMapper.deleteTempData(); + //插入临时表数据 + int batchSize = 50; + for (int i = 0; i < records.size(); i += batchSize) { + int end = Math.min(i + batchSize, records.size()); + List batch = records.subList(i, end); + // 执行批量插入 + this.baseMapper.insertTempData(batch); + } + //从临时表增或修改主表 + this.baseMapper.mergeToData(); + } + + @Override + public R importDateTosoft(String startTime, String endTime) { + Long userId = SecurityUtils.getUserId(); + String filename = "测站一览表" + startTime + "-" + endTime+"导入到南方片"; + // 查询是否已存在相同条件且未完成的任务 + List ongoingTasks = ycExportTaskService.list( + new QueryWrapper() + .eq("user_id", userId) + .eq("status", 0) // 状态为0表示任务未完成 + .like("filename", "测站一览表")); + if (!ongoingTasks.isEmpty()) { + return R.error("当前任务正在下载中，请稍后重试"); + } + YcExportTask ycExportTask = new YcExportTask(); + ycExportTask.setFilename(filename); + ycExportTask.setUserId(userId); + ycExportTask.setStartTime(new Date()); + ycExportTask.setStatus(0); + ycExportTaskService.save(ycExportTask); + CompletableFuture.runAsync(() -> { + try { + IPage stationPageByInfo = this.getStationPageByInfo(new PageParams(0L, 1000000000L), null, null, startTime, endTime); + HyStscAServiceImpl hyStscAServiceImpl = context.getBean(HyStscAServiceImpl.class); + hyStscAServiceImpl.importMysqlToSqlserver(stationPageByInfo.getRecords()); + ycExportTask.setStatus(2); + } catch (Exception e) { + ycExportTask.setStatus(4); + log.error(e.getMessage()); + R.error("任务下载失败"); + }finally { + ycExportTask.setEndTime(new Date()); + ycExportTaskService.updateById(ycExportTask); + } + }, importThreadPool); + return R.ok("任务已提交"); + } + + @Override + @DataSource(DataSourceType.SHARDING) + public R testSqlServer() { + List list = this.list().subList(0,100); + return R.ok().put("data",list); + } + + + private R taskAndExport(String tableName,String startTime, String endTime, String stcd, String stnm, Long userId) { + String startNewTime=""; + String endNewTime=""; + if (ObjectUtils.isNotEmpty(startTime) ){ + startNewTime=startTime.substring(0,10); + } + if (ObjectUtils.isNotEmpty(endTime)){ + endNewTime=endTime.substring(0,10); + } + String filename = tableName + startNewTime + "-" + endNewTime; + // 查询是否已存在相同条件且未完成的任务 + List ongoingTasks = ycExportTaskService.list( + new QueryWrapper() + .eq("user_id", userId) + .eq("filename", filename) + .eq("status", 0) // 状态为0表示任务未完成 + ); + + if (!ongoingTasks.isEmpty()) { + return R.error("当前任务正在下载中，请稍后重试"); + } + YcExportTask ycExportTask = new YcExportTask(); + String pathPeffix = RuoYiConfig.getExportPath() + + File.separator + userId + File.separator+ + DateUtils.parseDateToStr("yyyy-MM-dd",DateUtils.getNowDate()) + File.separator + + DateUtils.parseDateToStr("HH_mm",DateUtils.getNowDate())+File.separator; + ycExportTask.setFilename(filename); + ycExportTask.setUserId(userId); + ycExportTask.setStartTime(new Date()); + ycExportTask.setStatus(0); + ycExportTask.setFilepath(pathPeffix); + ycExportTaskService.save(ycExportTask); + CompletableFuture.runAsync(() -> { + try { + File dest = new File(pathPeffix); + if (!dest.exists()) { + dest.mkdirs(); + } + String fullPath = pathPeffix + filename; + exportBlackData(fullPath, startTime, endTime, stcd, stnm); + + ycExportTask.setStatus(1); + ycExportTask.setEndTime(new Date()); + ycExportTaskService.updateById(ycExportTask); + } catch (Exception e) { + log.error(e.getMessage(), e); + R.error("任务下载失败"); + } + }, labelThreadPool); + return R.ok("任务已提交，请稍后下载"); + } + + + private void exportBlackData(String tableName, String startTime, String endTime, String stcd, String stnm) { + Map rainMap = CommonUtils.getYearAndDayDataMap(new PageParams(0L, 1000000000L), startTime, endTime, stcd, stnm); + ExcelUtils.excelBackExport2("station.xls", tableName, (Sheet sheet, CellStyle style) -> + dataModel1(rainMap, sheet, style)); + } + + + public int dataModel1(Map map, Sheet sheet, CellStyle style) { + // 批量查询数据 + IPage hyStscAVoIPage = this.baseMapper.selectHyStscAPageByInfo(new Query().getPage(map), map); + List records = hyStscAVoIPage.getRecords(); + + // 定义当前sheet的行号 + int rowIndex = 2; // 从第二行开始写入数据 + // 定义全局序号 + int globalIndex = 1; // 从1开始 + + // 定义当前sheet的编号 + int sheetIndex = 1; + + // 最大行数限制 + int maxRowsPerSheet = 65536; // 对于 .xls 文件，最大行数为 65536 + int batchSize = 1000; // 每次批量处理1000行，减少逐行写入的开销 + + // 复制表头到新sheet的逻辑 + ExcelUtils.copyHeader(sheet, style); + + // 批量处理数据 + for (int i = 0; i < records.size(); i += batchSize) { + // 处理一批数据 + int toIndex = Math.min(i + batchSize, records.size()); + List batchList = records.subList(i, toIndex); + + // 批量写入数据 + for (HyStscAVo vo : batchList) { + // 如果当前行数达到最大行数，创建新sheet + if (rowIndex >= maxRowsPerSheet) { + sheetIndex++; + sheet = sheet.getWorkbook().createSheet("测站一览表" + sheetIndex); + rowIndex = 2; // 重置行号 + // 复制表头到新sheet + ExcelUtils.copyHeader(sheet, style); + } + + // 创建新行并写入数据 + Row row = ExcelUtils.createRow(sheet, rowIndex); + + // 使用 globalIndex 作为序号 + ExcelUtils.formatCell(row, 0, String.valueOf(globalIndex), style); + ExcelUtils.formatCell(row, 1, vo.getStcd() != null ? vo.getStcd() : "", style); + ExcelUtils.formatCell(row, 2, vo.getStnm() != null ? vo.getStnm() : "", style); + ExcelUtils.formatCell(row, 3, vo.getBshncd() != null ? vo.getBshncd() : "", style); + ExcelUtils.formatCell(row, 4, vo.getHnnm() != null ? vo.getHnnm() : "", style); + ExcelUtils.formatCell(row, 5, vo.getRvnm() != null ? vo.getRvnm() : "", style); + ExcelUtils.formatCell(row, 6, vo.getObitmcd() != null ? vo.getObitmcd() : "", style); + ExcelUtils.formatCell(row, 7, vo.getAddvcd() != null ? vo.getAddvcd() : "", style); + ExcelUtils.formatCell(row, 8, vo.getWrrgcd() != null ? vo.getWrrgcd() : "", style); + ExcelUtils.formatCell(row, 9, vo.getEsstyr() != null ? vo.getEsstyr() : "", style); + ExcelUtils.formatCell(row, 10, vo.getEsstmth() != null ? vo.getEsstmth() : "", style); + ExcelUtils.formatCell(row, 11, vo.getWdstyr() != null ? vo.getWdstyr() : "", style); + ExcelUtils.formatCell(row, 12, vo.getWdstmth() != null ? vo.getWdstmth() : "", style); + ExcelUtils.formatCell(row, 13, vo.getDrar() != null ? vo.getDrar() : "", style); + ExcelUtils.formatCell(row, 14, vo.getFlto() != null ? vo.getFlto() : "", style); + ExcelUtils.formatCell(row, 15, vo.getDstrvm() != null ? vo.getDstrvm() : "", style); + ExcelUtils.formatCell(row, 16, vo.getAdmag() != null ? vo.getAdmag() : "", style); + ExcelUtils.formatCell(row, 17, vo.getAdmnst() != null ? vo.getAdmnst() : "", style); + ExcelUtils.formatCell(row, 18, vo.getStlc() != null ? vo.getStlc() : "", style); + ExcelUtils.formatCell(row, 19, vo.getLgtd() != null ? CommonUtils.formatNum(vo.getLgtd()) : "", style); + ExcelUtils.formatCell(row, 20, vo.getLttd() != null ? CommonUtils.formatNum(vo.getLttd()) : "", style); + ExcelUtils.formatCell(row, 21, vo.getStgrd() != null ? vo.getStgrd() : "", style); + ExcelUtils.formatCell(row, 22, vo.getFrgrd() != null ? vo.getFrgrd() : "", style); + ExcelUtils.formatCell(row, 23, vo.getNt() != null ? vo.getNt() : "", style); + ExcelUtils.formatCell(row, 24, "", style); + ExcelUtils.formatCell(row, 25, "", style); + ExcelUtils.formatCell(row, 26, "", style); + ExcelUtils.formatCell(row, 27, "", style); + ExcelUtils.formatCell(row, 28, "", style); + ExcelUtils.formatCell(row, 29, "", style); + ExcelUtils.formatCell(row, 30, "", style); + ExcelUtils.formatCell(row, 31, "", style); + ExcelUtils.formatCell(row, 32, "", style); + ExcelUtils.formatCell(row, 33, "", style); + ExcelUtils.formatCell(row, 34, "", style); + ExcelUtils.formatCell(row, 35, "", style); + ExcelUtils.formatCell(row, 36, "", style); + + // 增加行号和全局序号 + rowIndex++; + globalIndex++; + } + } + return 0; + } + + + + + + + +} + + + + diff --git a/swlscx/src/main/java/com/ruoyi/swlscx/basic/service/impl/YcExportTaskServiceImpl.java b/swlscx/src/main/java/com/ruoyi/swlscx/basic/service/impl/YcExportTaskServiceImpl.java new file mode 100644 index 0000000..c6ba524 --- /dev/null +++ b/swlscx/src/main/java/com/ruoyi/swlscx/basic/service/impl/YcExportTaskServiceImpl.java @@ -0,0 +1,99 @@ +package com.ruoyi.swlscx.basic.service.impl; + +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.ruoyi.common.annotation.DataSource; +import com.ruoyi.common.core.page.R; +import com.ruoyi.common.enums.DataSourceType; +import com.ruoyi.common.utils.Query; +import com.ruoyi.common.utils.SecurityUtils; +import com.ruoyi.swlscx.basic.domain.po.YcExportTask; +import com.ruoyi.swlscx.basic.mapper.YcExportTaskMapper; +import com.ruoyi.swlscx.basic.service.YcExportTaskService; +import com.ruoyi.swlscx.common.utils.ExcelUtils; +import lombok.extern.slf4j.Slf4j; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import javax.servlet.http.HttpServletResponse; +import java.io.File; +import java.util.List; +import java.util.Map; + +/** + * @author 12974 + * @description 针对表【yc_export_task(导出任务)】的数据库操作Service实现 + * @createDate 2024-10-23 13:57:23 + */ +@Service +@Slf4j +public class YcExportTaskServiceImpl extends ServiceImpl + implements YcExportTaskService { + + + @Override + public void addTask(HttpServletResponse response, String startTime, String endTime, String stcd, String stnm) { + + } + + @Override + public R queryPage(Map params) { + Long userId = SecurityUtils.getUserId(); + params.put("userId", userId); + IPage page = this.baseMapper.queryPage( + new Query().getPage(params), + params + ); + + return R.ok().put("count", page.getTotal()).put("data", page.getRecords()); + } + + @Override + public void downloadExcel(HttpServletResponse response, YcExportTask t) { + ExcelUtils.downLoadExcel(response, t); + } + + @Override + @Transactional(rollbackFor = Exception.class) + public R removeTask(Integer id) { + + //先删除路径下的文件 + YcExportTask task = this.getById(id); + String fullPath = task.getFilepath()+task.getFilename() + ".xls"; + log.info("fullPath{}",fullPath); + File file = new File(fullPath); + if (!file.exists()) { + throw new RuntimeException("该文件不存在"); + } + if (file.delete()){ + this.removeById(id); + return R.ok(); + } + return R.error("删除失败"); + } + + @Override + @DataSource(DataSourceType.SHARDING) + public R getTest() { + List> list=this.baseMapper.test(); + return R.ok().put("data",list); + } + + + // 删除文件的方法 + private boolean deleteFile(String fullPath) { + File file = new File(fullPath); + if (file.exists() && file.isFile()) { + boolean isDeleted = file.delete(); + log.info("文件删除状态: {}", isDeleted ? "成功" : "失败"); + return isDeleted; + } + log.warn("文件不存在或不是文件: {}", fullPath); + return false; + } + +} + + + + diff --git a/swlscx/src/main/java/com/ruoyi/swlscx/common/PageParams.java b/swlscx/src/main/java/com/ruoyi/swlscx/common/PageParams.java new file mode 100644 index 0000000..7f6db86 --- /dev/null +++ b/swlscx/src/main/java/com/ruoyi/swlscx/common/PageParams.java @@ -0,0 +1,29 @@ +package com.ruoyi.swlscx.common; + +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; + +/** + * @Author al + * @Date 2023/12/18 9:55 + * @Description: TODO + * @Version + */ +@Data +@AllArgsConstructor +@NoArgsConstructor +public class PageParams { + + /** + * 当前页码 + */ + private Long pageNum; + + /** + * 每页记录数默认值 + */ + private Long pageSize; + + +} diff --git a/swlscx/src/main/java/com/ruoyi/swlscx/common/RequestVo.java b/swlscx/src/main/java/com/ruoyi/swlscx/common/RequestVo.java new file mode 100644 index 0000000..7efccb2 --- /dev/null +++ b/swlscx/src/main/java/com/ruoyi/swlscx/common/RequestVo.java @@ -0,0 +1,27 @@ +package com.ruoyi.swlscx.common; + +import lombok.Data; + +/** + * @Author al + * @Date 2024/9/19 13:40 + * @Description: TODO + * @Version + */ + +@Data +public class RequestVo { + + private Long pageNum; + + private Long pageSize; + + private String stcd; + + private String stnm; + + private String startTime; + + private String endTime; + +} diff --git a/swlscx/src/main/java/com/ruoyi/swlscx/common/constants/SystemConstants.java b/swlscx/src/main/java/com/ruoyi/swlscx/common/constants/SystemConstants.java new file mode 100644 index 0000000..0287402 --- /dev/null +++ b/swlscx/src/main/java/com/ruoyi/swlscx/common/constants/SystemConstants.java @@ -0,0 +1,12 @@ +package com.ruoyi.swlscx.common.constants; + +/** + * @Author al + * @Date 2024/10/18 14:14 + * @Description: TODO + * @Version + */ +public class SystemConstants { + + public static final String TIME_FORMAT="yyyy-MM-dd HH:mm:ss"; +} diff --git a/swlscx/src/main/java/com/ruoyi/swlscx/common/functions/ExcelGenerator.java b/swlscx/src/main/java/com/ruoyi/swlscx/common/functions/ExcelGenerator.java new file mode 100644 index 0000000..7eea9fb --- /dev/null +++ b/swlscx/src/main/java/com/ruoyi/swlscx/common/functions/ExcelGenerator.java @@ -0,0 +1,16 @@ +package com.ruoyi.swlscx.common.functions; + +import org.apache.poi.ss.usermodel.CellStyle; +import org.apache.poi.ss.usermodel.Sheet; + +import java.io.IOException; +import java.util.concurrent.ExecutionException; + +/*@Author: tongw + *@CreateDate: 2019/7/26 16:01 + *@Description: + **/ +@FunctionalInterface +public interface ExcelGenerator { + void doSheet(Sheet sheet, CellStyle style) throws IOException, ExecutionException, InterruptedException; +} diff --git a/swlscx/src/main/java/com/ruoyi/swlscx/common/functions/ExcelGenerator2_1.java b/swlscx/src/main/java/com/ruoyi/swlscx/common/functions/ExcelGenerator2_1.java new file mode 100644 index 0000000..936d4f1 --- /dev/null +++ b/swlscx/src/main/java/com/ruoyi/swlscx/common/functions/ExcelGenerator2_1.java @@ -0,0 +1,13 @@ +package com.ruoyi.swlscx.common.functions; + +import org.apache.poi.ss.usermodel.CellStyle; +import org.apache.poi.ss.usermodel.Sheet; + +/*@Author: tongw + *@CreateDate: 2019/7/26 16:01 + *@Description: + **/ +@FunctionalInterface +public interface ExcelGenerator2_1 { + void doSheet(Sheet sheet, CellStyle style, CellStyle style1, CellStyle style2, CellStyle style3); +} diff --git a/swlscx/src/main/java/com/ruoyi/swlscx/common/functions/ExcelGenerator2_2.java b/swlscx/src/main/java/com/ruoyi/swlscx/common/functions/ExcelGenerator2_2.java new file mode 100644 index 0000000..5bcc83b --- /dev/null +++ b/swlscx/src/main/java/com/ruoyi/swlscx/common/functions/ExcelGenerator2_2.java @@ -0,0 +1,13 @@ +package com.ruoyi.swlscx.common.functions; + +import org.apache.poi.ss.usermodel.CellStyle; +import org.apache.poi.ss.usermodel.Sheet; + +/*@Author: tongw + *@CreateDate: 2019/7/26 16:01 + *@Description: + **/ +@FunctionalInterface +public interface ExcelGenerator2_2 { + int doSheet(Sheet sheet, CellStyle style, CellStyle style1, CellStyle style2, CellStyle style3); +} diff --git a/swlscx/src/main/java/com/ruoyi/swlscx/common/functions/ExcelGenerator3.java b/swlscx/src/main/java/com/ruoyi/swlscx/common/functions/ExcelGenerator3.java new file mode 100644 index 0000000..199cab4 --- /dev/null +++ b/swlscx/src/main/java/com/ruoyi/swlscx/common/functions/ExcelGenerator3.java @@ -0,0 +1,15 @@ +package com.ruoyi.swlscx.common.functions; + +import org.apache.poi.ss.usermodel.CellStyle; +import org.apache.poi.ss.usermodel.Sheet; + +import java.io.IOException; + +/*@Author: tongw + *@CreateDate: 2019/7/26 16:01 + *@Description: + **/ +@FunctionalInterface +public interface ExcelGenerator3 { + int doSheet(Sheet sheet, CellStyle style) throws IOException; +} diff --git a/swlscx/src/main/java/com/ruoyi/swlscx/common/listener/ExcelListener.java b/swlscx/src/main/java/com/ruoyi/swlscx/common/listener/ExcelListener.java new file mode 100644 index 0000000..1a51153 --- /dev/null +++ b/swlscx/src/main/java/com/ruoyi/swlscx/common/listener/ExcelListener.java @@ -0,0 +1,52 @@ +package com.ruoyi.swlscx.common.listener; + +import com.alibaba.excel.context.AnalysisContext; +import com.alibaba.excel.event.AnalysisEventListener; +import lombok.extern.slf4j.Slf4j; + +import java.util.ArrayList; +import java.util.List; + +/** + * @Author al + * @Date 2024/7/23 14:49 + * @Description: TODO + * @Version + */ +@Slf4j +public class ExcelListener extends AnalysisEventListener { + + // 可以通过实例获取该值 + private List data = new ArrayList<>(); + + /** + * 读取excel内容 + * 从excel中的第二行开始读取，把每行数据数据都读出来然后封装到T对象中 + * 每解析一行数据就会调用一次该方法 + * + * @param t + * @param analysisContext + */ + @Override + public void invoke(T t, AnalysisContext analysisContext) { +// log.info("data:{}", t); + // 数据存储到list，供批量处理，或后续自己业务逻辑处理。 + data.add(t); + } + + /** + * 所有操作都完成之后才会执行本方法 + * + * @param analysisContext + */ + @Override + public void doAfterAllAnalysed(AnalysisContext analysisContext) { + // excel解析完毕以后需要执行的代码 +// log.info("This is doAfterAllAnalysed!!!!"); + } + + + public List getData() { + return data; + } +} \ No newline at end of file diff --git a/swlscx/src/main/java/com/ruoyi/swlscx/common/thread/CustomNameThreadFactory.java b/swlscx/src/main/java/com/ruoyi/swlscx/common/thread/CustomNameThreadFactory.java new file mode 100644 index 0000000..3224348 --- /dev/null +++ b/swlscx/src/main/java/com/ruoyi/swlscx/common/thread/CustomNameThreadFactory.java @@ -0,0 +1,47 @@ +package com.ruoyi.swlscx.common.thread; + +import org.apache.commons.lang3.StringUtils; + +import java.util.concurrent.ThreadFactory; +import java.util.concurrent.atomic.AtomicInteger; + +/** + * 自定义名称的线程工厂 + * + * @author: ChickenWing + * @date: 2023/11/26 + */ +public class CustomNameThreadFactory implements ThreadFactory { + + private static final AtomicInteger poolNumber = new AtomicInteger(1); + private final ThreadGroup group; + private final AtomicInteger threadNumber = new AtomicInteger(1); + private final String namePrefix; + + CustomNameThreadFactory(String name) { + SecurityManager s = System.getSecurityManager(); + group = (s != null) ? s.getThreadGroup() : + Thread.currentThread().getThreadGroup(); + if (StringUtils.isBlank(name)) { + name = "pool"; + } + namePrefix = name + "-" + + poolNumber.getAndIncrement() + + "-thread-"; + } + + @Override + public Thread newThread(Runnable r) { + Thread t = new Thread(group, r, + namePrefix + threadNumber.getAndIncrement(), + 0); + if (t.isDaemon()){ + t.setDaemon(false); + } + if (t.getPriority() != Thread.NORM_PRIORITY){ + t.setPriority(Thread.NORM_PRIORITY); + } + return t; + } + +} diff --git a/swlscx/src/main/java/com/ruoyi/swlscx/common/thread/ExportThread.java b/swlscx/src/main/java/com/ruoyi/swlscx/common/thread/ExportThread.java new file mode 100644 index 0000000..79a291d --- /dev/null +++ b/swlscx/src/main/java/com/ruoyi/swlscx/common/thread/ExportThread.java @@ -0,0 +1,40 @@ +package com.ruoyi.swlscx.common.thread; + +import com.baomidou.mybatisplus.core.toolkit.Wrappers; +import com.ruoyi.swlscx.basic.domain.po.YcExportTask; +import com.ruoyi.swlscx.basic.service.YcExportTaskService; + +/** + * @Author al + * @Date 2024/10/23 13:54 + * @Description: TODO + * @Version + */ +public class ExportThread implements Runnable { + + private final YcExportTask params; + + private final YcExportTaskService taskService; + + public ExportThread(YcExportTask params, YcExportTaskService taskService) { + this.params = params; + this.taskService = taskService; + } + + @Override + public void run() { + + + + + + // 执行成功后 + taskService.update(Wrappers.lambdaUpdate(YcExportTask.class) + .set(YcExportTask::getStatus, 1) + .eq(YcExportTask::getId, params.getId())); + + + + } +} + diff --git a/swlscx/src/main/java/com/ruoyi/swlscx/common/thread/ExportThreadPoolConfig.java b/swlscx/src/main/java/com/ruoyi/swlscx/common/thread/ExportThreadPoolConfig.java new file mode 100644 index 0000000..116ae6e --- /dev/null +++ b/swlscx/src/main/java/com/ruoyi/swlscx/common/thread/ExportThreadPoolConfig.java @@ -0,0 +1,35 @@ +package com.ruoyi.swlscx.common.thread; + +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; + +import java.util.concurrent.LinkedBlockingDeque; +import java.util.concurrent.ThreadPoolExecutor; +import java.util.concurrent.TimeUnit; + +/** + * 线程池的config管理 + * + * @author: ChickenWing + * @date: 2023/11/26 + */ +@Configuration +public class ExportThreadPoolConfig { + + @Bean(name = "labelThreadPool") + public ThreadPoolExecutor getLabelThreadPool() { + return new ThreadPoolExecutor(20, 100, 5, + TimeUnit.SECONDS, new LinkedBlockingDeque<>(40), + new CustomNameThreadFactory("label"), + new ThreadPoolExecutor.CallerRunsPolicy()); + } + + @Bean(name = "importThreadPool") + public ThreadPoolExecutor getImportThreadPool() { + return new ThreadPoolExecutor(20, 100, 5, + TimeUnit.SECONDS, new LinkedBlockingDeque<>(40), + new CustomNameThreadFactory("import"), + new ThreadPoolExecutor.CallerRunsPolicy()); + } + +} diff --git a/swlscx/src/main/java/com/ruoyi/swlscx/common/thread/ThreadConfig.java b/swlscx/src/main/java/com/ruoyi/swlscx/common/thread/ThreadConfig.java new file mode 100644 index 0000000..8da84f3 --- /dev/null +++ b/swlscx/src/main/java/com/ruoyi/swlscx/common/thread/ThreadConfig.java @@ -0,0 +1,29 @@ +package com.ruoyi.swlscx.common.thread; + +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; +import org.springframework.scheduling.annotation.EnableAsync; +import org.springframework.scheduling.concurrent.ThreadPoolTaskExecutor; + +import java.util.concurrent.Executor; + +/** + * @Author al + * @Date 2024/10/23 14:09 + * @Description: TODO + * @Version + */ +@Configuration +@EnableAsync // 启用异步执行支持 +public class ThreadConfig { + + @Bean(name = "taskExecutor") + public Executor taskExecutor() { + ThreadPoolTaskExecutor executor = new ThreadPoolTaskExecutor(); + executor.setCorePoolSize(5); // 核心线程数 + executor.setMaxPoolSize(10); // 最大线程数 + executor.setQueueCapacity(25); // 队列容量 + executor.initialize(); + return executor; + } +} diff --git a/swlscx/src/main/java/com/ruoyi/swlscx/common/utils/CommonUtils.java b/swlscx/src/main/java/com/ruoyi/swlscx/common/utils/CommonUtils.java new file mode 100644 index 0000000..7a4100e --- /dev/null +++ b/swlscx/src/main/java/com/ruoyi/swlscx/common/utils/CommonUtils.java @@ -0,0 +1,67 @@ +package com.ruoyi.swlscx.common.utils; + +import com.ruoyi.common.core.text.Convert; +import com.ruoyi.swlscx.common.PageParams; +import org.apache.commons.lang3.StringUtils; + +import java.math.BigDecimal; +import java.util.HashMap; +import java.util.Map; + +/** + * @Author al + * @Date 2024/9/21 14:54 + * @Description: TODO + * @Version + */ +public class CommonUtils { + + public static Map getYearAndDayDataMap(PageParams pageParams, String startTime, String endTime, String stcd, String stnm) { + Map map = new HashMap<>(); + map.put("startTime", startTime); + map.put("endTime", endTime); + map.put("stnm", stnm); + map.put("stcd", stcd); + map.put("page", Convert.toStr(pageParams.getPageNum())); + map.put("limit", Convert.toStr(pageParams.getPageSize())); + return map; + } + + public static Map getMonthDataMap(PageParams pageParams, String startTime, String endTime, String stcd, String stnm) { + String startYear = ""; + String endYear = ""; + if (StringUtils.isNotBlank(startTime)) { + startYear = startTime.length() > 4 ? startTime.substring(0, 4) : startTime; + } + if (StringUtils.isNotBlank(endTime)) { + endYear = endTime.length() > 4 ? endTime.substring(0, 4) : endTime; + } + Map map = new HashMap<>(); + map.put("startYear", Convert.toInt(startYear)); + map.put("startTime", startTime); + map.put("endYear", Convert.toInt(endYear)); + map.put("endTme", endTime); + map.put("stnm", stnm); + map.put("stcd", stcd); + map.put("page", Convert.toStr(pageParams.getPageNum())); + map.put("limit", Convert.toStr(pageParams.getPageSize())); + return map; + } + + + + public static String formatNum(BigDecimal number) { + if (number == null) { + return ""; + } + return String.format("%.2f", number).replaceAll("0*$", "").replaceAll("\\.$", ""); + } + + public static String formatNum(Double number) { + if (number == null) { + return ""; + } + return String.format("%.2f", number).replaceAll("0*$", "").replaceAll("\\.$", ""); + } + +} diff --git a/swlscx/src/main/java/com/ruoyi/swlscx/common/utils/ExcelUtils.java b/swlscx/src/main/java/com/ruoyi/swlscx/common/utils/ExcelUtils.java new file mode 100644 index 0000000..8433c94 --- /dev/null +++ b/swlscx/src/main/java/com/ruoyi/swlscx/common/utils/ExcelUtils.java @@ -0,0 +1,412 @@ +package com.ruoyi.swlscx.common.utils; + +import com.alibaba.excel.EasyExcel; +import com.alibaba.excel.ExcelReader; +import com.alibaba.excel.analysis.ExcelReadExecutor; +import com.alibaba.excel.read.metadata.ReadSheet; +import com.ruoyi.common.config.RuoYiConfig; +import com.ruoyi.common.utils.SecurityUtils; +import com.ruoyi.swlscx.basic.domain.po.YcExportTask; +import com.ruoyi.swlscx.common.functions.ExcelGenerator; +import com.ruoyi.swlscx.common.functions.ExcelGenerator2_1; +import com.ruoyi.swlscx.common.functions.ExcelGenerator2_2; +import com.ruoyi.swlscx.common.functions.ExcelGenerator3; +import com.ruoyi.swlscx.common.listener.ExcelListener; +import lombok.extern.slf4j.Slf4j; +import org.apache.poi.hssf.usermodel.HSSFWorkbook; +import org.apache.poi.ss.usermodel.*; +import org.apache.poi.ss.util.CellRangeAddress; +import org.apache.poi.xssf.usermodel.XSSFWorkbook; +import org.springframework.core.io.ClassPathResource; + +import javax.servlet.http.HttpServletResponse; +import java.io.*; +import java.net.URLEncoder; +import java.nio.file.Files; +import java.util.ArrayList; +import java.util.List; +import java.util.Map; + +@Slf4j +public class ExcelUtils { + + /** + * 从指定行开始读取Excel数据 + * + * @param inputStream 文件输入流 + * @param clazz 映射的实体类 + * @param headRowNumber 从第几行开始读取（从0开始计数） + * @param 实体类类型 + * @return 实体类对象的列表 + */ + public static List readExcel(InputStream inputStream, Class clazz, int headRowNumber) { + // 读取Excel文件 + ExcelReader excelReader = EasyExcel.read(inputStream).build(); + ExcelReadExecutor excelReadExecutor = excelReader.excelExecutor(); + List sheets = excelReadExecutor.sheetList(); + List sheetData = new ArrayList<>(); + //读取到的数据 + for (ReadSheet sheet : sheets) { + ExcelListener listener = new ExcelListener<>(); + ReadSheet readSheet1 = EasyExcel.readSheet(sheet.getSheetNo()).head(clazz).headRowNumber(headRowNumber).registerReadListener(listener).build(); + excelReader.read(readSheet1); + // 得到sheet名称和其对应的数据 + sheetData.addAll(listener.getData()); + } + return sheetData; + } + + + + /** + * 导出 + * + * @param fileName + * @param response + * @param workbook + */ + public static void downLoadExcel(String fileName, HttpServletResponse response, Workbook workbook) { + try { + response.setCharacterEncoding("UTF-8"); + response.setHeader("content-Type", "application/vnd.ms-excel"); + response.setHeader("Content-Disposition", + "attachment;filename=\"" + URLEncoder.encode(fileName, "UTF-8") + "\""); + workbook.write(response.getOutputStream()); + } catch (IOException e) { + e.printStackTrace(); + } + } + + public static void downLoadTxt(String fileName, HttpServletResponse response) throws IOException { + response.setCharacterEncoding("UTF-8"); + response.setHeader("content-Type", "text/plain"); + response.setHeader("Content-Disposition", + "attachment;filename=\"" + URLEncoder.encode(fileName, "UTF-8") + "\""); + OutputStream outputStream = response.getOutputStream(); + byte[] buff = new byte[1024]; + BufferedInputStream bis ; + ClassPathResource cpr = new ClassPathResource("/excel/" + fileName); + bis = new BufferedInputStream(cpr.getInputStream()); + int i = bis.read(buff); + while (i != -1) { + outputStream.write(buff, 0, buff.length); + outputStream.flush(); + i = bis.read(buff); + } + } + + public static void excelExport(HttpServletResponse response, String templateName, String excelName, ExcelGenerator excelGenerator) { + try { + ClassPathResource cpr = new ClassPathResource("/excel/" + templateName); + InputStream is = cpr.getInputStream(); + Workbook workbook = null; + if ("xlsx".equals(templateName.split("\\.")[1])) { + workbook = new XSSFWorkbook(is); + } else { + workbook = new HSSFWorkbook(is); + } + + CellStyle style = workbook.createCellStyle(); + Font font = workbook.createFont(); + font.setFontHeightInPoints((short)9); + font.setFontName("宋体"); + style.setFont(font); + + Sheet sheet0 = workbook.getSheetAt(0); + excelGenerator.doSheet(sheet0, style); + + ExcelUtils.downLoadExcel(excelName + "." + templateName.split("\\.")[1], response, workbook); + }catch (Exception e) { + e.printStackTrace(); + } + } + + public static void excelExport2(HttpServletResponse response, String templateName, String excelName, ExcelGenerator2_1 excelGenerator) { + try { + ClassPathResource cpr = new ClassPathResource("/excel/" + templateName); + InputStream is = cpr.getInputStream(); + Workbook workbook = null; + if ("xlsx".equals(templateName.split("\\.")[1])) { + workbook = new XSSFWorkbook(is); + } else { + workbook = new HSSFWorkbook(is); + } + + CellStyle style = workbook.createCellStyle(); + Font font = workbook.createFont(); + font.setFontHeightInPoints((short)10); + font.setFontName("宋体"); + style.setFont(font); + + Font font2 = workbook.createFont(); + font2.setFontHeightInPoints((short)12); + font2.setFontName("宋体"); + + CellStyle style1 = workbook.createCellStyle(); + style1.setFont(font2); + + CellStyle style2 = workbook.createCellStyle(); + style2.setAlignment(HorizontalAlignment.LEFT); + style2.setFont(font); + + CellStyle style3 = workbook.createCellStyle(); + style3.setAlignment(HorizontalAlignment.RIGHT); + style3.setFont(font); + + + Sheet sheet0 = workbook.getSheetAt(0); + excelGenerator.doSheet(sheet0, style,style1,style2,style3); + + ExcelUtils.downLoadExcel(excelName + "." + templateName.split("\\.")[1], response, workbook); + }catch (IOException e) { + e.printStackTrace(); + } + } + + public static void listToExport(HttpServletResponse response, String excelName, List> dataMap, Integer columnNum){ + try { + ClassPathResource cpr = new ClassPathResource("/excel/" + "list2excel.xls"); + InputStream is = cpr.getInputStream(); + Workbook workbook = new HSSFWorkbook(is); + Sheet sheet0 = workbook.getSheetAt(0); + Row row; + for(int i=0; i< dataMap.size(); i++){ + row=sheet0.createRow(i); + int j=0; + for (Map.Entry entry : dataMap.get(i).entrySet()) { + Cell cell = row.createCell(j); + cell.setCellValue(entry.getValue() == null ? "" : entry.getValue().toString()); + cell.getCellStyle().setAlignment(HorizontalAlignment.CENTER); + j++; + } + } + for(int i=0; i" + res); + if (res == 0){ + ExcelUtils.downLoadBackExcel(excelName + "." + templateName.split("\\.")[1], workbook); + } + }catch (IOException e) { + e.printStackTrace(); + } + } + + /** + * 逐潮高低潮表专用 + */ + public static void excelExportTide1Back(String templateName, String excelName, ExcelGenerator2_2 excelGenerator) { + try { + ClassPathResource cpr = new ClassPathResource("/excel/" + templateName); + InputStream is = cpr.getInputStream(); + Workbook workbook = null; + if ("xlsx".equals(templateName.split("\\.")[1])) { + workbook = new XSSFWorkbook(is); + } else { + workbook = new HSSFWorkbook(is); + } + + CellStyle style = workbook.createCellStyle(); + Font font = workbook.createFont(); + font.setFontHeightInPoints((short)10); + font.setFontName("宋体"); + style.setFont(font); + + Font font2 = workbook.createFont(); + font2.setFontHeightInPoints((short)12); + font2.setFontName("宋体"); + + CellStyle style1 = workbook.createCellStyle(); + style1.setFont(font2); + + CellStyle style2 = workbook.createCellStyle(); + style2.setAlignment(HorizontalAlignment.LEFT); + style2.setFont(font); + + CellStyle style3 = workbook.createCellStyle(); + style3.setAlignment(HorizontalAlignment.RIGHT); + style3.setFont(font); + + + Sheet sheet0 = workbook.getSheetAt(0); + int res = excelGenerator.doSheet(sheet0, style,style1,style2,style3); + if (res == 0) { + ExcelUtils.downLoadBackExcel(excelName + "." + templateName.split("\\.")[1], workbook); + } + }catch (IOException e) { + e.printStackTrace(); + } + } + + public static void downLoadBackExcel(String fileName, Workbook workbook) { + try { + FileOutputStream fileOut = new FileOutputStream(fileName); + workbook.write(fileOut); + fileOut.close(); + workbook.close(); + } catch (IOException e) { + e.printStackTrace(); + } + } + + public static void formatCell(Row row, int index, String value, CellStyle style) { + Cell cell = row.createCell(index); + cell.setCellValue(value); + // 对齐方式 + style.setAlignment(HorizontalAlignment.CENTER); + style.setVerticalAlignment(VerticalAlignment.CENTER); + // 设置上下左右边框 + style.setBorderLeft(BorderStyle.THIN); + style.setBorderRight(BorderStyle.THIN); + style.setBorderTop(BorderStyle.THIN); // 添加顶部边框 + style.setBorderBottom(BorderStyle.THIN); // 添加底部边框 + // 应用样式 + cell.setCellStyle(style); + } + + + public static Row createRow(Sheet sheet, int index) { + if (sheet.getRow(index) == null) { + return sheet.createRow(index); + } else { + return sheet.getRow(index); + } + } + + + public static void downLoadExcel(HttpServletResponse response, YcExportTask t) { + Long userId = SecurityUtils.getUserId(); + String fullPath = t.getFilepath()+t.getFilename() + ".xls"; + log.info("fullPath{}",fullPath); + File file = new File(fullPath); + if (!file.exists()) { + throw new RuntimeException("该文件不存在"); + } + + try (InputStream in = Files.newInputStream(file.toPath()); + OutputStream out = response.getOutputStream()) { + // 设置响应头，通知浏览器以附件形式下载 + response.setCharacterEncoding("UTF-8"); + response.setHeader("content-Type", "application/vnd.ms-excel"); + response.setHeader("Content-Disposition", + "attachment;filename=\"" + URLEncoder.encode(t.getFilename(), "UTF-8") + "\""); + byte[] buffer = new byte[1024]; + int len; + while ((len = in.read(buffer)) != -1) { + out.write(buffer, 0, len); + } + out.flush(); // 确保所有数据写入响应 + } catch (IOException e) { + throw new RuntimeException("文件下载失败", e); + } + } + + + + public static void copyHeader(Sheet targetSheet, CellStyle style) { + // 获取第一个 sheet + Sheet sourceSheet = targetSheet.getWorkbook().getSheetAt(0); // 假设源 sheet 是第一个 + + // 复制第一行（表头） + Row headerRow1 = sourceSheet.getRow(0); // 第1行 + Row newHeaderRow1 = targetSheet.createRow(0); // 在新sheet中创建第一行 + copyRow(headerRow1, newHeaderRow1); + + // 复制第二行 + Row headerRow2 = sourceSheet.getRow(1); // 第2行 + Row newHeaderRow2 = targetSheet.createRow(1); // 在新sheet中创建第二行 + copyRow(headerRow2, newHeaderRow2); + + // 复制合并单元格 + int mergedRegionsCount = sourceSheet.getNumMergedRegions(); + for (int i = 0; i < mergedRegionsCount; i++) { + CellRangeAddress mergedRegion = sourceSheet.getMergedRegion(i); + // 检查合并区域是否在需要复制的行范围内 + if (mergedRegion.getFirstRow() <= 1 && mergedRegion.getLastRow() >= 0) { + // 检查目标 sheet 中是否已存在相同的合并区域 + boolean exists = false; + for (int j = 0; j < targetSheet.getNumMergedRegions(); j++) { + CellRangeAddress existingRegion = targetSheet.getMergedRegion(j); + if (existingRegion.equals(mergedRegion)) { + exists = true; + break; + } + } + + // 如果不存在，则添加合并区域 + if (!exists) { + targetSheet.addMergedRegion(new CellRangeAddress( + mergedRegion.getFirstRow(), mergedRegion.getLastRow(), + mergedRegion.getFirstColumn(), mergedRegion.getLastColumn() + )); + } + } + } + } + + // 假设 copyRow 方法是已定义的方法，用于复制行的内容和样式 + public static void copyRow(Row sourceRow, Row targetRow) { + for (int i = 0; i < sourceRow.getPhysicalNumberOfCells(); i++) { + Cell sourceCell = sourceRow.getCell(i); + Cell targetCell = targetRow.createCell(i); + if (sourceCell != null) { + // 复制单元格内容和样式 + targetCell.setCellValue(sourceCell.getStringCellValue()); + targetCell.setCellStyle(sourceCell.getCellStyle()); + } + } + } + + +} diff --git a/swlscx/src/main/java/com/ruoyi/swlscx/common/utils/FileUtil.java b/swlscx/src/main/java/com/ruoyi/swlscx/common/utils/FileUtil.java new file mode 100644 index 0000000..e676188 --- /dev/null +++ b/swlscx/src/main/java/com/ruoyi/swlscx/common/utils/FileUtil.java @@ -0,0 +1,80 @@ +package com.ruoyi.swlscx.common.utils; + +import org.springframework.util.CollectionUtils; + +import java.io.File; +import java.io.InputStream; +import java.util.ArrayList; +import java.util.List; + +/** + * @Author al + * @Date 2024/8/7 15:16 + * @Description: TODO + * @Version + */ +public class FileUtil { + public static InputStream getResourcesFileInputStream(String fileName) { + return Thread.currentThread().getContextClassLoader().getResourceAsStream("" + fileName); + } + + public static String getPath() { + return FileUtil.class.getResource("/").getPath(); + } + + public static PathBuild pathBuild() { + return new PathBuild(); + } + + public static File createNewFile(String pathName) { + File file = new File(getPath() + pathName); + if (file.exists()) { + file.delete(); + } else { + if (!file.getParentFile().exists()) { + file.getParentFile().mkdirs(); + } + } + return file; + } + + public static File readFile(String pathName) { + return new File(getPath() + pathName); + } + + public static File readUserHomeFile(String pathName) { + return new File(System.getProperty("user.home") + File.separator + pathName); + } + + /** + * build to test file path + **/ + public static class PathBuild { + private PathBuild() { + subPath = new ArrayList<>(); + } + + private final List subPath; + + public PathBuild sub(String dirOrFile) { + subPath.add(dirOrFile); + return this; + } + + public String getPath() { + if (CollectionUtils.isEmpty(subPath)) { + return FileUtil.class.getResource("/").getPath(); + } + if (subPath.size() == 1) { + return FileUtil.class.getResource("/").getPath() + subPath.get(0); + } + StringBuilder path = new StringBuilder(FileUtil.class.getResource("/").getPath()); + path.append(subPath.get(0)); + for (int i = 1; i < subPath.size(); i++) { + path.append(File.separator).append(subPath.get(i)); + } + return path.toString(); + } + + } +} diff --git a/swlscx/src/main/java/com/ruoyi/swlscx/common/utils/ImportDateToSqlserverDto.java b/swlscx/src/main/java/com/ruoyi/swlscx/common/utils/ImportDateToSqlserverDto.java new file mode 100644 index 0000000..18d91cd --- /dev/null +++ b/swlscx/src/main/java/com/ruoyi/swlscx/common/utils/ImportDateToSqlserverDto.java @@ -0,0 +1,30 @@ +package com.ruoyi.swlscx.common.utils; + +import lombok.Data; +import org.apache.poi.ss.formula.functions.T; + +import java.util.List; + +/** + * @Author al + * @Date 2025/1/9 16:04 + * @Description: TODO + * @Version + */ +@Data +public class ImportDateToSqlserverDto { + + private String startTime; + + private String endTime; + + private String filename; + + private List dataList; + + private Class classBean; + + + + +} diff --git a/swlscx/src/main/java/com/ruoyi/swlscx/common/utils/Query.java b/swlscx/src/main/java/com/ruoyi/swlscx/common/utils/Query.java new file mode 100644 index 0000000..56cfd44 --- /dev/null +++ b/swlscx/src/main/java/com/ruoyi/swlscx/common/utils/Query.java @@ -0,0 +1,76 @@ +/** + * Copyright (c) 2016-2019 人人开源 All rights reserved. + * + * https://www.renren.io + * + * 版权所有，侵权必究！ + */ + +package com.ruoyi.swlscx.common.utils; + +import com.baomidou.mybatisplus.core.metadata.OrderItem; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.ruoyi.common.constant.Constants; +import com.ruoyi.common.xss.SQLFilter; +import org.apache.commons.lang3.StringUtils; + +import java.util.Map; + +/** + * 查询参数 + * + * @author Mark sunlightcs@gmail.com + */ +public class Query { + + public Page getPage(Map params) { + return this.getPage(params, null, false); + } + + public Page getPage(Map params, String defaultOrderField, boolean isAsc) { + //分页参数 + long curPage = 1; + long limit = 10; + + if(params.get(Constants.PAGE) != null){ + curPage = Long.parseLong((String)params.get(Constants.PAGE)); + } + if(params.get(Constants.LIMIT) != null){ + limit = Long.parseLong((String)params.get(Constants.LIMIT)); + } + + //分页对象 + Page page = new Page<>(curPage, limit); + + //分页参数 + params.put(Constants.PAGE, page); + + //排序字段 + //防止SQL注入（因为sidx、order是通过拼接SQL实现排序的，会有SQL注入风险） + String orderField = SQLFilter.sqlInject((String)params.get(Constants.ORDER_FIELD)); + String order = (String)params.get(Constants.ORDER); + + //前端字段排序 + if(StringUtils.isNotEmpty(orderField) && StringUtils.isNotEmpty(order)){ + if(Constants.ASC.equalsIgnoreCase(order)) { + return page.addOrder(OrderItem.asc(orderField)); + }else { + return page.addOrder(OrderItem.desc(orderField)); + } + } + + //没有排序字段，则不排序 + if(StringUtils.isBlank(defaultOrderField)){ + return page; + } + + //默认排序 + if(isAsc) { + page.addOrder(OrderItem.asc(defaultOrderField)); + }else { + page.addOrder(OrderItem.desc(defaultOrderField)); + } + + return page; + } +} diff --git a/swlscx/src/main/java/com/ruoyi/swlscx/day/controller/DayExportController.java b/swlscx/src/main/java/com/ruoyi/swlscx/day/controller/DayExportController.java new file mode 100644 index 0000000..fdc3471 --- /dev/null +++ b/swlscx/src/main/java/com/ruoyi/swlscx/day/controller/DayExportController.java @@ -0,0 +1,112 @@ +package com.ruoyi.swlscx.day.controller; + +import com.ruoyi.common.core.page.R; +import com.ruoyi.swlscx.day.service.*; +import lombok.RequiredArgsConstructor; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestParam; +import org.springframework.web.bind.annotation.RestController; + +import javax.servlet.http.HttpServletResponse; + +/** + * @Author al + * @Date 2024/10/18 13:47 + * @Description: TODO + * @Version + */ +@RequestMapping("/report") +@RequiredArgsConstructor +@RestController +public class DayExportController { + + private final HyDpCService hyDpCService; + + private final HyDweCService hyDweCService; + + private final HyDqCService hyDqCService; + + private final HyDzCService hyDzCService; + + private final HyDcsFService hyDcsFService; + + private final HyDwtCService hyDwtCService; + + + + /** + * 导出日降雨量表数据 + */ + @PostMapping("/dayRain") + public R exportRainList(HttpServletResponse response, + @RequestParam String startTime, + @RequestParam String endTime, + @RequestParam String stcd, + @RequestParam String stnm) { + return hyDpCService.exportHyDpCData(response, startTime, endTime, stcd, stnm); + } + + + /** + * 导出日水面蒸发表数据 + */ + @PostMapping("/evaporationWater") + public R exportEvaporationWater(HttpServletResponse response, + @RequestParam String startTime, + @RequestParam String endTime, + @RequestParam String stcd, + @RequestParam String stnm) { + return hyDweCService.exportHyDweCData(response, startTime, endTime, stcd, stnm); + } + + /** + * 导出日流量表数据 + */ + @PostMapping("/dayFlow") + public R exportDayFlow(HttpServletResponse response, + @RequestParam String startTime, + @RequestParam String endTime, + @RequestParam String stcd, + @RequestParam String stnm) { + return hyDqCService.exportDayFlow(response, startTime, endTime, stcd, stnm); + } + + /** + * 导出日平均水位表数据 + */ + @PostMapping("/dayWaterLever") + public R exportDayWaterLever(HttpServletResponse response, + @RequestParam String startTime, + @RequestParam String endTime, + @RequestParam String stcd, + @RequestParam String stnm) { + return hyDzCService.exportDayWaterLever(response, startTime, endTime, stcd, stnm); + } + + /** + * 导出日平均含沙量表表数据 + */ + @PostMapping("/daySedimentConcentration") + public R exportDaySedimentConcentration(HttpServletResponse response, + @RequestParam String startTime, + @RequestParam String endTime, + @RequestParam String stcd, + @RequestParam String stnm) { + return hyDcsFService.exportDaySedimentConcentration(response, startTime, endTime, stcd, stnm); + } + + /** + * 导出日水温表 + */ + @PostMapping("/dayWaterTemperature") + public R exportDayWaterTemperature(HttpServletResponse response, + @RequestParam String startTime, + @RequestParam String endTime, + @RequestParam String stcd, + @RequestParam String stnm) { + return hyDwtCService.exportDayWaterTemperature(response, startTime, endTime, stcd, stnm); + } + + +} diff --git a/swlscx/src/main/java/com/ruoyi/swlscx/day/controller/DayImportToSoftController.java b/swlscx/src/main/java/com/ruoyi/swlscx/day/controller/DayImportToSoftController.java new file mode 100644 index 0000000..defb10b --- /dev/null +++ b/swlscx/src/main/java/com/ruoyi/swlscx/day/controller/DayImportToSoftController.java @@ -0,0 +1,93 @@ +package com.ruoyi.swlscx.day.controller; + +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.ruoyi.common.core.page.R; +import com.ruoyi.swlscx.common.PageParams; +import com.ruoyi.swlscx.day.domain.vo.HyDcsFVo; +import com.ruoyi.swlscx.day.domain.vo.HyDpCVo; +import com.ruoyi.swlscx.day.domain.vo.HyDqCVo; +import com.ruoyi.swlscx.day.domain.vo.HyDzCVo; +import com.ruoyi.swlscx.day.service.*; +import lombok.RequiredArgsConstructor; +import lombok.extern.slf4j.Slf4j; +import org.springframework.web.bind.annotation.*; + +/** + * @Author al + * @Date 2025/1/5 16:11 + * @Description: TODO + * @Version + */ +@RestController +@RequestMapping("/day/import") +@RequiredArgsConstructor +@Slf4j +public class DayImportToSoftController { + + + + private final HyDpCService hyDpCService; + + private final HyDweCService hyDweCService; + + private final HyDqCService hyDqCService; + + private final HyDzCService hyDzCService; + + private final HyDcsFService hyDcsFService; + + private final HyDwtCService hyDwtCService; + + + /** + * 导入日水面蒸发表数据 + */ + @PostMapping("/importHyDweCDateToSoft") + public R importHyDweCDateToSoft(@RequestParam("startTime") String startTime, + @RequestParam("endTime") String endTime){ + return hyDweCService.importDateTosoft(startTime,endTime); + } + + + /** + * 导入日水温表数据 + */ + @PostMapping("/importHyDwtCDateToSoft") + public R importHyDwtCDateToSoft(@RequestParam("startTime") String startTime, + @RequestParam("endTime") String endTime){ + return hyDwtCService.importDateTosoft(startTime,endTime); + } + + + /** + * 导入日降雨量表数据 + */ + @PostMapping("/importRainListDateToSoft") + public R getRainList(@RequestParam("startTime") String startTime, + @RequestParam("endTime") String endTime) { + return hyDpCService.importDateTosoft(startTime, endTime); + } + + /** + * 导入日流量表数据 + */ + @PostMapping("/importDayFlowDateToSoft") + public R importDayFlowDateToSoft(@RequestParam("startTime") String startTime, + @RequestParam("endTime") String endTime) { + return hyDqCService.importDateTosoft(startTime, endTime); + } + + /**导入日水位表数据**/ + @PostMapping("/importWaterLeverDateToSoft") + public R importWaterLeverDateToSoft( String startTime, String endTime) { + return hyDzCService.importDateTosoft(startTime, endTime); + } + + + /**导入日平均含沙量表表数据**/ + @PostMapping("/importDaySedimentConcentrationDateToSoft") + public R importDaySedimentConcentrationDateToSoft( String startTime, String endTime) { + return hyDcsFService.importDateTosoft(startTime, endTime); + } + +} diff --git a/swlscx/src/main/java/com/ruoyi/swlscx/day/controller/DayTableController.java b/swlscx/src/main/java/com/ruoyi/swlscx/day/controller/DayTableController.java new file mode 100644 index 0000000..ff693ac --- /dev/null +++ b/swlscx/src/main/java/com/ruoyi/swlscx/day/controller/DayTableController.java @@ -0,0 +1,127 @@ +package com.ruoyi.swlscx.day.controller; + +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.ruoyi.common.core.page.R; +import com.ruoyi.swlscx.common.PageParams; +import com.ruoyi.swlscx.day.domain.vo.*; +import com.ruoyi.swlscx.day.service.*; +import lombok.RequiredArgsConstructor; +import lombok.extern.slf4j.Slf4j; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestParam; +import org.springframework.web.bind.annotation.RestController; + +import javax.servlet.http.HttpServletResponse; + +/** + * @Author al + * @Date 2024/10/17 15:16 + * @Description: TODO + * @Version + */ +@RestController +@RequestMapping("/day") +@RequiredArgsConstructor +@Slf4j +public class DayTableController { + + private final HyDpCService hyDpCService; + + private final HyDweCService hyDweCService; + + private final HyDqCService hyDqCService; + + private final HyDzCService hyDzCService; + + private final HyDcsFService hyDcsFService; + + private final HyDwtCService hyDwtCService; + + /** + * 获取日降雨量表数据 + */ + @GetMapping("/getDayRainList") + public R getRainList(@RequestParam("pageNum") Integer pageNum, + @RequestParam("pageSize") Integer pageSize, + @RequestParam("startTime") String startTime, + @RequestParam("endTime") String endTime, + @RequestParam("stcd") String stcd, + @RequestParam("stnm") String stnm){ + PageParams pageParams = new PageParams(pageNum.longValue(), pageSize.longValue()); + IPage hyDpCVoIPage = hyDpCService.selectHyDpCDataByPageAndInfo(pageParams, startTime, endTime, stcd, stnm); + return R.ok().put("data", hyDpCVoIPage.getRecords()).put("count", hyDpCVoIPage.getTotal()); + } + + /** + * 查询日水面蒸发表数据 + */ + @GetMapping("/getEvaporationWaterList") + public R getEvaporationWaterList(@RequestParam("pageNum") Integer pageNum, + @RequestParam("pageSize") Integer pageSize, + @RequestParam("startTime") String startTime, + @RequestParam("endTime") String endTime, + @RequestParam("stcd") String stcd, + @RequestParam("stnm") String stnm){ + PageParams pageParams = new PageParams(pageNum.longValue(), pageSize.longValue()); + IPage hyDweCVoIPage = hyDweCService.selectHyDweCDataByPageAndInfo(pageParams, startTime, endTime, stcd, stnm); + return R.ok().put("data", hyDweCVoIPage.getRecords()).put("count", hyDweCVoIPage.getTotal()); + } + + /** + * 查询日流量表数据 + */ + @GetMapping("/getDayFlowList") + public R getDayFlowList(@RequestParam("pageNum") Integer pageNum, + @RequestParam("pageSize") Integer pageSize, + @RequestParam("startTime") String startTime, + @RequestParam("endTime") String endTime, + @RequestParam("stcd") String stcd, + @RequestParam("stnm") String stnm) { + PageParams pageParams = new PageParams(pageNum.longValue(), pageSize.longValue()); + IPage hyDqCVoIPage = hyDqCService.selectHyDqCDataByPageAndInfo(pageParams, startTime, endTime, stcd, stnm); + return R.ok().put("data", hyDqCVoIPage.getRecords()).put("count", hyDqCVoIPage.getTotal()); + } + + /**查询日水位表数据**/ + @GetMapping("/getDayWaterLeverList") + public R getWaterLeverList(@RequestParam("pageNum") Integer pageNum, + @RequestParam("pageSize") Integer pageSize, + @RequestParam("startTime") String startTime, + @RequestParam("endTime") String endTime, + @RequestParam("stcd") String stcd, + @RequestParam("stnm") String stnm) { + PageParams pageParams = new PageParams(pageNum.longValue(), pageSize.longValue()); + IPage hyDzCVoIPage = hyDzCService.selectHyDzCPageByInfo(pageParams, startTime, endTime, stnm, stcd); + return R.ok().put("data", hyDzCVoIPage.getRecords()).put("count", hyDzCVoIPage.getTotal()); + } + + + /**查询日平均含沙量表表数据**/ + @GetMapping("/getDaySedimentConcentrationList") + public R getDaySedimentConcentrationList(@RequestParam("pageNum") Integer pageNum, + @RequestParam("pageSize") Integer pageSize, + @RequestParam("startTime") String startTime, + @RequestParam("endTime") String endTime, + @RequestParam("stcd") String stcd, + @RequestParam("stnm") String stnm) { + PageParams pageParams = new PageParams(pageNum.longValue(), pageSize.longValue()); + IPage hyDcsFVoIPage = hyDcsFService.selectHyDcsFPageByInfo(pageParams, startTime, endTime, stnm, stcd); + return R.ok().put("data", hyDcsFVoIPage.getRecords()).put("count", hyDcsFVoIPage.getTotal()); + } + + + /**查询日水温表数据**/ + @GetMapping("/getDayWaterTemperatureList") + public R getDayWaterTemperatureList(@RequestParam("pageNum") Integer pageNum, + @RequestParam("pageSize") Integer pageSize, + @RequestParam("startTime") String startTime, + @RequestParam("endTime") String endTime, + @RequestParam("stcd") String stcd, + @RequestParam("stnm") String stnm) { + PageParams pageParams = new PageParams(pageNum.longValue(), pageSize.longValue()); + IPage hyDwtCVoIPage = hyDwtCService.selectHyDwtCPageByInfo(pageParams, startTime, endTime, stnm, stcd); + return R.ok().put("data", hyDwtCVoIPage.getRecords()).put("count", hyDwtCVoIPage.getTotal()); + } + +} diff --git a/swlscx/src/main/java/com/ruoyi/swlscx/day/domain/bo/HyDcsFBo.java b/swlscx/src/main/java/com/ruoyi/swlscx/day/domain/bo/HyDcsFBo.java new file mode 100644 index 0000000..ffa9a53 --- /dev/null +++ b/swlscx/src/main/java/com/ruoyi/swlscx/day/domain/bo/HyDcsFBo.java @@ -0,0 +1,43 @@ +package com.ruoyi.swlscx.day.domain.bo; + +import com.alibaba.excel.annotation.ExcelProperty; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + +import java.io.Serializable; +import java.math.BigDecimal; +import java.util.Date; + +/** + * 日平均含沙量表 + * @TableName hy_dcs_f + */ +@Data +public class HyDcsFBo implements Serializable { + /** + * 站码 + */ + @ExcelProperty(value = "站码",index = 1) + private String stcd; + + /** + * 日期 + */ + @ExcelProperty(value = "日期",index = 3) + private String dt; + + /** + * 平均含沙量(千克每立方米) + */ + @ExcelProperty(value = "平均含沙量",index = 4) + private String avcs; + + /** + * 平均含沙量注解码 + */ + @ExcelProperty(value = "平均含沙量注解码",index = 5) + private String avcsrcd; + + private static final long serialVersionUID = 1L; +} \ No newline at end of file diff --git a/swlscx/src/main/java/com/ruoyi/swlscx/day/domain/bo/HyDpCBo.java b/swlscx/src/main/java/com/ruoyi/swlscx/day/domain/bo/HyDpCBo.java new file mode 100644 index 0000000..ddc17da --- /dev/null +++ b/swlscx/src/main/java/com/ruoyi/swlscx/day/domain/bo/HyDpCBo.java @@ -0,0 +1,45 @@ +package com.ruoyi.swlscx.day.domain.bo; + +import com.alibaba.excel.annotation.ExcelProperty; +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.math.BigDecimal; +import java.util.Date; + +/** + * 日降水表 + * @TableName hy_dp_c + */ +@Data +public class HyDpCBo implements Serializable { + /** + * 站码 + */ + @ExcelProperty(value = "站码",index = 1) + private String stcd; + + /** + * 日期 + */ + @ExcelProperty(value = "日期",index = 3) + private String dt; + + /** + * 降水量(毫米) + */ + @ExcelProperty(value = "降水量",index = 4) + private String p; + + /** + * 降水量注解码 + */ + @ExcelProperty(value = "站码",index = 5) + private String prcd; + + @TableField(exist = false) + private static final long serialVersionUID = 1L; +} \ No newline at end of file diff --git a/swlscx/src/main/java/com/ruoyi/swlscx/day/domain/bo/HyDqCBo.java b/swlscx/src/main/java/com/ruoyi/swlscx/day/domain/bo/HyDqCBo.java new file mode 100644 index 0000000..fc74d98 --- /dev/null +++ b/swlscx/src/main/java/com/ruoyi/swlscx/day/domain/bo/HyDqCBo.java @@ -0,0 +1,44 @@ +package com.ruoyi.swlscx.day.domain.bo; + +import com.alibaba.excel.annotation.ExcelProperty; +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.math.BigDecimal; +import java.util.Date; + +/** + * 日平均流量表 + * @TableName hy_dq_c + */ +@Data +public class HyDqCBo implements Serializable { + /** + * 站码 + */ + @ExcelProperty(value = "站码",index = 1) + private String stcd; + + /** + * 日期 + */ + @ExcelProperty(value = "日期",index = 3) + private String dt; + + /** + * 平均流量 + */ + @ExcelProperty(value = "平均流量",index = 4) + private String avq; + + /** + * 平均流量注解码 + */ + @ExcelProperty(value = "平均流量注解码",index = 5) + private String avqrcd; + + private static final long serialVersionUID = 1L; +} \ No newline at end of file diff --git a/swlscx/src/main/java/com/ruoyi/swlscx/day/domain/bo/HyDqsCBo.java b/swlscx/src/main/java/com/ruoyi/swlscx/day/domain/bo/HyDqsCBo.java new file mode 100644 index 0000000..921fb79 --- /dev/null +++ b/swlscx/src/main/java/com/ruoyi/swlscx/day/domain/bo/HyDqsCBo.java @@ -0,0 +1,46 @@ +package com.ruoyi.swlscx.day.domain.bo; + +import com.alibaba.excel.annotation.ExcelProperty; +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.math.BigDecimal; +import java.util.Date; + +/** + * 日平均输沙率表 + * @TableName hy_dqs_c + */ +@Data +public class HyDqsCBo implements Serializable { + /** + * 站码 + */ + @ExcelProperty(value = "站码",index = 1) + private String stcd; + + /** + * 泥沙类型 + */@ExcelProperty(value = "泥沙类型",index = 3) + private String sdtp; + + /** + * 日期 + */@ExcelProperty(value = "日期",index = 4) + private String dt; + + /** + * 平均输沙率(千克每秒) + */@ExcelProperty(value = "平均输沙率",index = 5) + private String avqs; + + /** + * 平均输沙率注解码 + */@ExcelProperty(value = "平均输沙率注解码",index = 6) + private String avqsrcd; + + private static final long serialVersionUID = 1L; +} \ No newline at end of file diff --git a/swlscx/src/main/java/com/ruoyi/swlscx/day/domain/bo/HyDweCBo.java b/swlscx/src/main/java/com/ruoyi/swlscx/day/domain/bo/HyDweCBo.java new file mode 100644 index 0000000..72c967e --- /dev/null +++ b/swlscx/src/main/java/com/ruoyi/swlscx/day/domain/bo/HyDweCBo.java @@ -0,0 +1,46 @@ +package com.ruoyi.swlscx.day.domain.bo; + +import com.alibaba.excel.annotation.ExcelProperty; +import lombok.Data; + +import java.io.Serializable; + +/** + * 日水面蒸发量表 + * + * @TableName hy_dwe_c + */ +@Data +public class HyDweCBo implements Serializable { + /** + * 站码 + */ + @ExcelProperty(value = "站码", index = 1) + private String stcd; + + /** + * 日期 + */ + @ExcelProperty(value = "日期", index = 3) + private String dt; + + /** + * 蒸发器型式 + */ + @ExcelProperty(value = "蒸发器型式", index = 4) + private String eetp; + + /** + * 水面蒸发量(毫米) + */ + @ExcelProperty(value = "水面蒸发量", index = 5) + private String wsfe; + + /** + * 水面蒸发量注解码 + */ + @ExcelProperty(value = "水面蒸发量注解码", index = 6) + private String wsfercd; + + private static final long serialVersionUID = 1L; +} \ No newline at end of file diff --git a/swlscx/src/main/java/com/ruoyi/swlscx/day/domain/bo/HyDwtCBo.java b/swlscx/src/main/java/com/ruoyi/swlscx/day/domain/bo/HyDwtCBo.java new file mode 100644 index 0000000..9dbfb57 --- /dev/null +++ b/swlscx/src/main/java/com/ruoyi/swlscx/day/domain/bo/HyDwtCBo.java @@ -0,0 +1,42 @@ +package com.ruoyi.swlscx.day.domain.bo; + +import com.alibaba.excel.annotation.ExcelProperty; +import com.baomidou.mybatisplus.annotation.TableField; +import lombok.Data; + +import java.io.Serializable; + +/** + * 日水温表 + * + * @TableName hy_dwt_c + */ +@Data +public class HyDwtCBo implements Serializable { + /** + * 站码 + */ + @ExcelProperty(value = "站码", index = 1) + private String stcd; + + /** + * 日期 + */ + @ExcelProperty(value = "日期", index = 3) + private String dt; + + /** + * 水温 + */ + @ExcelProperty(value = "水温", index = 4) + private String wtmp; + + /** + * 水温注解码 + */ + @ExcelProperty(value = "水温注解码", index = 5) + private String wtmprcd; + + @TableField(exist = false) + private static final long serialVersionUID = 1L; +} \ No newline at end of file diff --git a/swlscx/src/main/java/com/ruoyi/swlscx/day/domain/bo/HyDzCBo.java b/swlscx/src/main/java/com/ruoyi/swlscx/day/domain/bo/HyDzCBo.java new file mode 100644 index 0000000..ea476df --- /dev/null +++ b/swlscx/src/main/java/com/ruoyi/swlscx/day/domain/bo/HyDzCBo.java @@ -0,0 +1,44 @@ +package com.ruoyi.swlscx.day.domain.bo; + +import com.alibaba.excel.annotation.ExcelProperty; +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.math.BigDecimal; +import java.util.Date; + +/** + * 日平均水位表 + * @TableName hy_dz_c + */ +@Data +public class HyDzCBo implements Serializable { + /** + * 站码 + */ + @ExcelProperty(value = "站码",index = 1) + private String stcd; + + /** + * 日期 + */ + @ExcelProperty(value = "日期",index = 3) + private String dt; + + /** + * 平均水位(米) + */ + @ExcelProperty(value = "平均水位",index = 4) + private String avz; + + /** + * 平均水位注解码 + */ + @ExcelProperty(value = "平均水位注解码",index = 5) + private String avzrcd; + + private static final long serialVersionUID = 1L; +} \ No newline at end of file diff --git a/swlscx/src/main/java/com/ruoyi/swlscx/day/domain/po/HyDcsF.java b/swlscx/src/main/java/com/ruoyi/swlscx/day/domain/po/HyDcsF.java new file mode 100644 index 0000000..802811a --- /dev/null +++ b/swlscx/src/main/java/com/ruoyi/swlscx/day/domain/po/HyDcsF.java @@ -0,0 +1,41 @@ +package com.ruoyi.swlscx.day.domain.po; + +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 java.io.Serializable; +import java.math.BigDecimal; +import java.util.Date; +import lombok.Data; + +/** + * 日平均含沙量表 + * @TableName hy_dcs_f + */ +@TableName(value ="hy_dcs_f") +@Data +public class HyDcsF implements Serializable { + /** + * 站码 + */ + private String stcd; + + /** + * 日期 + */ + private Date dt; + + /** + * 平均含沙量(千克每立方米) + */ + private BigDecimal avcs; + + /** + * 平均含沙量注解码 + */ + private String avcsrcd; + + @TableField(exist = false) + private static final long serialVersionUID = 1L; +} \ No newline at end of file diff --git a/swlscx/src/main/java/com/ruoyi/swlscx/day/domain/po/HyDpC.java b/swlscx/src/main/java/com/ruoyi/swlscx/day/domain/po/HyDpC.java new file mode 100644 index 0000000..d6108fc --- /dev/null +++ b/swlscx/src/main/java/com/ruoyi/swlscx/day/domain/po/HyDpC.java @@ -0,0 +1,42 @@ +package com.ruoyi.swlscx.day.domain.po; + +import com.alibaba.excel.annotation.ExcelProperty; +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 java.io.Serializable; +import java.math.BigDecimal; +import java.util.Date; +import lombok.Data; + +/** + * 日降水表 + * @TableName hy_dp_c + */ +@TableName(value ="hy_dp_c") +@Data +public class HyDpC implements Serializable { + /** + * 站码 + */ + private String stcd; + + /** + * 日期 + */ + private Date dt; + + /** + * 降水量(毫米) + */ + private BigDecimal p; + + /** + * 降水量注解码 + */ + private String prcd; + + @TableField(exist = false) + private static final long serialVersionUID = 1L; +} \ No newline at end of file diff --git a/swlscx/src/main/java/com/ruoyi/swlscx/day/domain/po/HyDqC.java b/swlscx/src/main/java/com/ruoyi/swlscx/day/domain/po/HyDqC.java new file mode 100644 index 0000000..5058aeb --- /dev/null +++ b/swlscx/src/main/java/com/ruoyi/swlscx/day/domain/po/HyDqC.java @@ -0,0 +1,41 @@ +package com.ruoyi.swlscx.day.domain.po; + +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 java.io.Serializable; +import java.math.BigDecimal; +import java.util.Date; +import lombok.Data; + +/** + * 日平均流量表 + * @TableName hy_dq_c + */ +@TableName(value ="hy_dq_c") +@Data +public class HyDqC implements Serializable { + /** + * 站码 + */ + private String stcd; + + /** + * 日期 + */ + private Date dt; + + /** + * 平均流量 + */ + private BigDecimal avq; + + /** + * 平均流量注解码 + */ + private String avqrcd; + + @TableField(exist = false) + private static final long serialVersionUID = 1L; +} \ No newline at end of file diff --git a/swlscx/src/main/java/com/ruoyi/swlscx/day/domain/po/HyDqsC.java b/swlscx/src/main/java/com/ruoyi/swlscx/day/domain/po/HyDqsC.java new file mode 100644 index 0000000..56f18c7 --- /dev/null +++ b/swlscx/src/main/java/com/ruoyi/swlscx/day/domain/po/HyDqsC.java @@ -0,0 +1,46 @@ +package com.ruoyi.swlscx.day.domain.po; + +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 java.io.Serializable; +import java.math.BigDecimal; +import java.util.Date; +import lombok.Data; + +/** + * 日平均输沙率表 + * @TableName hy_dqs_c + */ +@TableName(value ="hy_dqs_c") +@Data +public class HyDqsC implements Serializable { + /** + * 站码 + */ + private String stcd; + + /** + * 泥沙类型 + */ + private String sdtp; + + /** + * 日期 + */ + private Date dt; + + /** + * 平均输沙率(千克每秒) + */ + private BigDecimal avqs; + + /** + * 平均输沙率注解码 + */ + private String avqsrcd; + + @TableField(exist = false) + private static final long serialVersionUID = 1L; +} \ No newline at end of file diff --git a/swlscx/src/main/java/com/ruoyi/swlscx/day/domain/po/HyDweC.java b/swlscx/src/main/java/com/ruoyi/swlscx/day/domain/po/HyDweC.java new file mode 100644 index 0000000..402248d --- /dev/null +++ b/swlscx/src/main/java/com/ruoyi/swlscx/day/domain/po/HyDweC.java @@ -0,0 +1,46 @@ +package com.ruoyi.swlscx.day.domain.po; + +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 java.io.Serializable; +import java.math.BigDecimal; +import java.util.Date; +import lombok.Data; + +/** + * 日水面蒸发量表 + * @TableName hy_dwe_c + */ +@TableName(value ="hy_dwe_c") +@Data +public class HyDweC implements Serializable { + /** + * 站码 + */ + private String stcd; + + /** + * 日期 + */ + private Date dt; + + /** + * 蒸发器型式 + */ + private String eetp; + + /** + * 水面蒸发量(毫米) + */ + private BigDecimal wsfe; + + /** + * 水面蒸发量注解码 + */ + private String wsfercd; + + @TableField(exist = false) + private static final long serialVersionUID = 1L; +} \ No newline at end of file diff --git a/swlscx/src/main/java/com/ruoyi/swlscx/day/domain/po/HyDwtC.java b/swlscx/src/main/java/com/ruoyi/swlscx/day/domain/po/HyDwtC.java new file mode 100644 index 0000000..fa66fd4 --- /dev/null +++ b/swlscx/src/main/java/com/ruoyi/swlscx/day/domain/po/HyDwtC.java @@ -0,0 +1,41 @@ +package com.ruoyi.swlscx.day.domain.po; + +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 java.io.Serializable; +import java.math.BigDecimal; +import java.util.Date; +import lombok.Data; + +/** + * 日水温表 + * @TableName hy_dwt_c + */ +@TableName(value ="hy_dwt_c") +@Data +public class HyDwtC implements Serializable { + /** + * 站码 + */ + private String stcd; + + /** + * 日期 + */ + private Date dt; + + /** + * 水温 + */ + private BigDecimal wtmp; + + /** + * 水温注解码 + */ + private String wtmprcd; + + @TableField(exist = false) + private static final long serialVersionUID = 1L; +} \ No newline at end of file diff --git a/swlscx/src/main/java/com/ruoyi/swlscx/day/domain/po/HyDzC.java b/swlscx/src/main/java/com/ruoyi/swlscx/day/domain/po/HyDzC.java new file mode 100644 index 0000000..c7a7236 --- /dev/null +++ b/swlscx/src/main/java/com/ruoyi/swlscx/day/domain/po/HyDzC.java @@ -0,0 +1,41 @@ +package com.ruoyi.swlscx.day.domain.po; + +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 java.io.Serializable; +import java.math.BigDecimal; +import java.util.Date; +import lombok.Data; + +/** + * 日平均水位表 + * @TableName hy_dz_c + */ +@TableName(value ="hy_dz_c") +@Data +public class HyDzC implements Serializable { + /** + * 站码 + */ + private String stcd; + + /** + * 日期 + */ + private Date dt; + + /** + * 平均水位(米) + */ + private BigDecimal avz; + + /** + * 平均水位注解码 + */ + private String avzrcd; + + @TableField(exist = false) + private static final long serialVersionUID = 1L; +} \ No newline at end of file diff --git a/swlscx/src/main/java/com/ruoyi/swlscx/day/domain/vo/HyDcsFVo.java b/swlscx/src/main/java/com/ruoyi/swlscx/day/domain/vo/HyDcsFVo.java new file mode 100644 index 0000000..eb643dc --- /dev/null +++ b/swlscx/src/main/java/com/ruoyi/swlscx/day/domain/vo/HyDcsFVo.java @@ -0,0 +1,43 @@ +package com.ruoyi.swlscx.day.domain.vo; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + +import java.io.Serializable; +import java.math.BigDecimal; +import java.util.Date; + +/** + * 日平均含沙量表 + * @TableName hy_dcs_f + */ +@Data +public class HyDcsFVo implements Serializable { + /** + * 站码 + */ + private String stcd; + + /** + * 站名 + */ + private String stnm; + + /** + * 日期 + */ + private Date dt; + + /** + * 平均含沙量(千克每立方米) + */ + private BigDecimal avcs; + + /** + * 平均含沙量注解码 + */ + private String avcsrcd; + + private static final long serialVersionUID = 1L; +} \ No newline at end of file diff --git a/swlscx/src/main/java/com/ruoyi/swlscx/day/domain/vo/HyDpCVo.java b/swlscx/src/main/java/com/ruoyi/swlscx/day/domain/vo/HyDpCVo.java new file mode 100644 index 0000000..b5026c5 --- /dev/null +++ b/swlscx/src/main/java/com/ruoyi/swlscx/day/domain/vo/HyDpCVo.java @@ -0,0 +1,45 @@ +package com.ruoyi.swlscx.day.domain.vo; + +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.math.BigDecimal; +import java.util.Date; + +/** + * 日降水表 + * @TableName hy_dp_c + */ +@Data +public class HyDpCVo implements Serializable { + /** + * 站码 + */ + private String stcd; + + + /** + * 站名 + */ + private String stnm; + + /** + * 日期 + */ + private Date dt; + + /** + * 降水量(毫米) + */ + private BigDecimal p; + + /** + * 降水量注解码 + */ + private String prcd; + + private static final long serialVersionUID = 1L; +} \ No newline at end of file diff --git a/swlscx/src/main/java/com/ruoyi/swlscx/day/domain/vo/HyDqCVo.java b/swlscx/src/main/java/com/ruoyi/swlscx/day/domain/vo/HyDqCVo.java new file mode 100644 index 0000000..91f94cb --- /dev/null +++ b/swlscx/src/main/java/com/ruoyi/swlscx/day/domain/vo/HyDqCVo.java @@ -0,0 +1,43 @@ +package com.ruoyi.swlscx.day.domain.vo; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + +import java.io.Serializable; +import java.math.BigDecimal; +import java.util.Date; + +/** + * 日平均流量表 + * @TableName hy_dq_c + */ +@Data +public class HyDqCVo implements Serializable { + /** + * 站码 + */ + private String stcd; + + /** + * 站名 + */ + private String stnm; + + /** + * 日期 + */ + private Date dt; + + /** + * 平均流量 + */ + private BigDecimal avq; + + /** + * 平均流量注解码 + */ + private String avqrcd; + + private static final long serialVersionUID = 1L; +} \ No newline at end of file diff --git a/swlscx/src/main/java/com/ruoyi/swlscx/day/domain/vo/HyDweCVo.java b/swlscx/src/main/java/com/ruoyi/swlscx/day/domain/vo/HyDweCVo.java new file mode 100644 index 0000000..6d3be6f --- /dev/null +++ b/swlscx/src/main/java/com/ruoyi/swlscx/day/domain/vo/HyDweCVo.java @@ -0,0 +1,49 @@ +package com.ruoyi.swlscx.day.domain.vo; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + +import java.io.Serializable; +import java.math.BigDecimal; +import java.util.Date; + +/** + * 日水面蒸发量表 + * @TableName hy_dwe_c + */ +@Data +public class HyDweCVo implements Serializable { + /** + * 站码 + */ + private String stcd; + + + /** + * 站名 + */ + private String stnm; + + /** + * 日期 + */ + private Date dt; + + /** + * 蒸发器型式 + */ + private String eetp; + + /** + * 水面蒸发量(毫米) + */ + private BigDecimal wsfe; + + /** + * 水面蒸发量注解码 + */ + private String wsfercd; + + private static final long serialVersionUID = 1L; +} \ No newline at end of file diff --git a/swlscx/src/main/java/com/ruoyi/swlscx/day/domain/vo/HyDwtCVo.java b/swlscx/src/main/java/com/ruoyi/swlscx/day/domain/vo/HyDwtCVo.java new file mode 100644 index 0000000..e238dfa --- /dev/null +++ b/swlscx/src/main/java/com/ruoyi/swlscx/day/domain/vo/HyDwtCVo.java @@ -0,0 +1,43 @@ +package com.ruoyi.swlscx.day.domain.vo; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + +import java.io.Serializable; +import java.math.BigDecimal; +import java.util.Date; + +/** + * 日水温表 + * @TableName hy_dwt_c + */ +@Data +public class HyDwtCVo implements Serializable { + /** + * 站码 + */ + private String stcd; + + /** + * 站名 + */ + private String stnm; + + /** + * 日期 + */ + private Date dt; + + /** + * 水温 + */ + private BigDecimal wtmp; + + /** + * 水温注解码 + */ + private String wtmprcd; + + private static final long serialVersionUID = 1L; +} \ No newline at end of file diff --git a/swlscx/src/main/java/com/ruoyi/swlscx/day/domain/vo/HyDzCVo.java b/swlscx/src/main/java/com/ruoyi/swlscx/day/domain/vo/HyDzCVo.java new file mode 100644 index 0000000..c2e0a82 --- /dev/null +++ b/swlscx/src/main/java/com/ruoyi/swlscx/day/domain/vo/HyDzCVo.java @@ -0,0 +1,43 @@ +package com.ruoyi.swlscx.day.domain.vo; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + +import java.io.Serializable; +import java.math.BigDecimal; +import java.util.Date; + +/** + * 日平均水位表 + * @TableName hy_dz_c + */ +@Data +public class HyDzCVo implements Serializable { + /** + * 站码 + */ + private String stcd; + + /** + * 站名 + */ + private String stnm; + + /** + * 日期 + */ + private Date dt; + + /** + * 平均水位(米) + */ + private BigDecimal avz; + + /** + * 平均水位注解码 + */ + private String avzrcd; + + private static final long serialVersionUID = 1L; +} \ No newline at end of file diff --git a/swlscx/src/main/java/com/ruoyi/swlscx/day/mapper/HyDcsFMapper.java b/swlscx/src/main/java/com/ruoyi/swlscx/day/mapper/HyDcsFMapper.java new file mode 100644 index 0000000..b1edd63 --- /dev/null +++ b/swlscx/src/main/java/com/ruoyi/swlscx/day/mapper/HyDcsFMapper.java @@ -0,0 +1,38 @@ +package com.ruoyi.swlscx.day.mapper; + +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.ruoyi.swlscx.day.domain.po.HyDcsF; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.ruoyi.swlscx.day.domain.vo.HyDcsFVo; +import org.apache.ibatis.annotations.Param; + +import java.util.List; +import java.util.Map; + +/** +* @author 12974 +* @description 针对表【hy_dcs_f(日平均含沙量表)】的数据库操作Mapper +* @createDate 2024-10-16 16:12:22 +* @Entity com.ruoyi.swlscx.day.domain.po.HyDcsF +*/ +public interface HyDcsFMapper extends BaseMapper { + + void deleteAll(); + + void batchInsert(@Param("list") List collect); + + void batchInsertOrUpdate(); + + IPage selectHyDcsFPageByInfo(Page page,@Param("map") Map map); + + void mergeToData(); + + void deleteTempData(); + + void insertTempData(@Param("list") List batch); +} + + + + diff --git a/swlscx/src/main/java/com/ruoyi/swlscx/day/mapper/HyDpCMapper.java b/swlscx/src/main/java/com/ruoyi/swlscx/day/mapper/HyDpCMapper.java new file mode 100644 index 0000000..246bda7 --- /dev/null +++ b/swlscx/src/main/java/com/ruoyi/swlscx/day/mapper/HyDpCMapper.java @@ -0,0 +1,37 @@ +package com.ruoyi.swlscx.day.mapper; + +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.ruoyi.swlscx.day.domain.po.HyDpC; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.ruoyi.swlscx.day.domain.vo.HyDpCVo; +import com.ruoyi.swlscx.month.domain.vo.HyMptEVo; +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; + +import java.util.List; +import java.util.Map; + +/** +* @author 12974 +* @description 针对表【hy_dp_c(日降水表)】的数据库操作Mapper +* @createDate 2024-10-15 17:40:46 +* @Entity com.ruoyi.swlscx.day.domain.po.HyDpC +*/ +@Mapper +public interface HyDpCMapper extends BaseMapper { + + void deleteAll(); + + void batchInsert(@Param("list") List batchList); + + void batchInsertOrUpdate(); + + IPage selectHyDpCDataByPageAndInfo(Page page,@Param("map") Map map); + + void mergeToData(); +} + + + + diff --git a/swlscx/src/main/java/com/ruoyi/swlscx/day/mapper/HyDqCMapper.java b/swlscx/src/main/java/com/ruoyi/swlscx/day/mapper/HyDqCMapper.java new file mode 100644 index 0000000..29273a9 --- /dev/null +++ b/swlscx/src/main/java/com/ruoyi/swlscx/day/mapper/HyDqCMapper.java @@ -0,0 +1,36 @@ +package com.ruoyi.swlscx.day.mapper; + +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.ruoyi.swlscx.day.domain.po.HyDqC; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.ruoyi.swlscx.day.domain.vo.HyDqCVo; +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; + +import java.util.List; +import java.util.Map; + +/** +* @author 12974 +* @description 针对表【hy_dq_c(日平均流量表)】的数据库操作Mapper +* @createDate 2024-10-16 15:40:17 +* @Entity com.ruoyi.swlscx.day.domain.po.HyDqC +*/ +@Mapper +public interface HyDqCMapper extends BaseMapper { + + void deleteAll(); + + void batchInsert(@Param("list") List collect); + + void batchInsertOrUpdate(); + + IPage selectHyMtqEPageByInfo(Page page,@Param("map") Map map); + + void mergeToData(); +} + + + + diff --git a/swlscx/src/main/java/com/ruoyi/swlscx/day/mapper/HyDqsCMapper.java b/swlscx/src/main/java/com/ruoyi/swlscx/day/mapper/HyDqsCMapper.java new file mode 100644 index 0000000..4710c62 --- /dev/null +++ b/swlscx/src/main/java/com/ruoyi/swlscx/day/mapper/HyDqsCMapper.java @@ -0,0 +1,18 @@ +package com.ruoyi.swlscx.day.mapper; + +import com.ruoyi.swlscx.day.domain.po.HyDqsC; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; + +/** +* @author 12974 +* @description 针对表【hy_dqs_c(日平均输沙率表)】的数据库操作Mapper +* @createDate 2024-10-16 16:29:38 +* @Entity com.ruoyi.swlscx.day.domain.po.HyDqsC +*/ +public interface HyDqsCMapper extends BaseMapper { + +} + + + + diff --git a/swlscx/src/main/java/com/ruoyi/swlscx/day/mapper/HyDweCMapper.java b/swlscx/src/main/java/com/ruoyi/swlscx/day/mapper/HyDweCMapper.java new file mode 100644 index 0000000..8418b22 --- /dev/null +++ b/swlscx/src/main/java/com/ruoyi/swlscx/day/mapper/HyDweCMapper.java @@ -0,0 +1,36 @@ +package com.ruoyi.swlscx.day.mapper; + +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.ruoyi.swlscx.day.domain.po.HyDweC; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.ruoyi.swlscx.day.domain.vo.HyDweCVo; +import com.ruoyi.swlscx.year.domain.vo.HyYrweFVo; +import org.apache.ibatis.annotations.Param; + +import java.util.List; +import java.util.Map; + +/** +* @author 12974 +* @description 针对表【hy_dwe_c(日水面蒸发量表)】的数据库操作Mapper +* @createDate 2024-10-16 17:24:19 +* @Entity com.ruoyi.swlscx.day.domain.po.HyDweC +*/ +public interface HyDweCMapper extends BaseMapper { + + void deleteAll(); + + void batchInsert(@Param("list") List collect); + + void batchInsertOrUpdate(); + + /** + * 查询日水面蒸发表数据 + */ + IPage selectHyDweCDataByPageAndInfo(Page page,@Param("map") Map map); +} + + + + diff --git a/swlscx/src/main/java/com/ruoyi/swlscx/day/mapper/HyDwtCMapper.java b/swlscx/src/main/java/com/ruoyi/swlscx/day/mapper/HyDwtCMapper.java new file mode 100644 index 0000000..652f542 --- /dev/null +++ b/swlscx/src/main/java/com/ruoyi/swlscx/day/mapper/HyDwtCMapper.java @@ -0,0 +1,26 @@ +package com.ruoyi.swlscx.day.mapper; + +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.ruoyi.swlscx.day.domain.po.HyDwtC; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.ruoyi.swlscx.day.domain.vo.HyDweCVo; +import com.ruoyi.swlscx.day.domain.vo.HyDwtCVo; +import org.apache.ibatis.annotations.Param; + +import java.util.Map; + +/** +* @author 12974 +* @description 针对表【hy_dwt_c(日水温表)】的数据库操作Mapper +* @createDate 2024-10-17 15:07:12 +* @Entity com.ruoyi.swlscx.day.domain.po.HyDwtC +*/ +public interface HyDwtCMapper extends BaseMapper { + + IPage selectHyDwtCPageByInfo(Page page, @Param("map") Map map); +} + + + + diff --git a/swlscx/src/main/java/com/ruoyi/swlscx/day/mapper/HyDzCMapper.java b/swlscx/src/main/java/com/ruoyi/swlscx/day/mapper/HyDzCMapper.java new file mode 100644 index 0000000..0c1dd7c --- /dev/null +++ b/swlscx/src/main/java/com/ruoyi/swlscx/day/mapper/HyDzCMapper.java @@ -0,0 +1,34 @@ +package com.ruoyi.swlscx.day.mapper; + +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.ruoyi.swlscx.day.domain.po.HyDzC; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.ruoyi.swlscx.day.domain.vo.HyDzCVo; +import org.apache.ibatis.annotations.Param; + +import java.util.List; +import java.util.Map; + +/** +* @author 12974 +* @description 针对表【hy_dz_c(日平均水位表)】的数据库操作Mapper +* @createDate 2024-10-16 16:46:04 +* @Entity com.ruoyi.swlscx.day.domain.po.HyDzC +*/ +public interface HyDzCMapper extends BaseMapper { + + void deleteAll(); + + void batchInsert(@Param("list") List collect); + + void batchInsertOrUpdate(); + + IPage selectHyDzCPageByInfo(Page page,@Param("map") Map map); + + void mergeToData(); +} + + + + diff --git a/swlscx/src/main/java/com/ruoyi/swlscx/day/service/HyDcsFService.java b/swlscx/src/main/java/com/ruoyi/swlscx/day/service/HyDcsFService.java new file mode 100644 index 0000000..d954f91 --- /dev/null +++ b/swlscx/src/main/java/com/ruoyi/swlscx/day/service/HyDcsFService.java @@ -0,0 +1,36 @@ +package com.ruoyi.swlscx.day.service; + +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.ruoyi.common.core.page.R; +import com.ruoyi.swlscx.common.PageParams; +import com.ruoyi.swlscx.day.domain.po.HyDcsF; +import com.baomidou.mybatisplus.extension.service.IService; +import com.ruoyi.swlscx.day.domain.vo.HyDcsFVo; +import org.springframework.web.multipart.MultipartFile; + +import javax.servlet.http.HttpServletResponse; + +/** +* @author 12974 +* @description 针对表【hy_dcs_f(日平均含沙量表)】的数据库操作Service +* @createDate 2024-10-16 16:12:22 +*/ +public interface HyDcsFService extends IService { + + /** + * 导入日平均含沙量表数据 + */ + void importHyDcsFData(MultipartFile file); + + /** + * 查询日平均含沙量表表数据 + */ + IPage selectHyDcsFPageByInfo(PageParams pageParams, String startTime, String endTime, String stnm, String stcd); + + /** + * 导出日平均含沙量表表数据 + */ + R exportDaySedimentConcentration(HttpServletResponse response, String startTime, String endTime, String stcd, String stnm); + + R importDateTosoft(String startTime, String endTime); +} diff --git a/swlscx/src/main/java/com/ruoyi/swlscx/day/service/HyDpCService.java b/swlscx/src/main/java/com/ruoyi/swlscx/day/service/HyDpCService.java new file mode 100644 index 0000000..a3384ed --- /dev/null +++ b/swlscx/src/main/java/com/ruoyi/swlscx/day/service/HyDpCService.java @@ -0,0 +1,37 @@ +package com.ruoyi.swlscx.day.service; + +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.ruoyi.common.core.page.R; +import com.ruoyi.swlscx.common.PageParams; +import com.ruoyi.swlscx.day.domain.po.HyDpC; +import com.baomidou.mybatisplus.extension.service.IService; +import com.ruoyi.swlscx.day.domain.vo.HyDpCVo; +import org.springframework.web.multipart.MultipartFile; + +import javax.servlet.http.HttpServletResponse; + +/** +* @author 12974 +* @description 针对表【hy_dp_c(日降水表)】的数据库操作Service +* @createDate 2024-10-15 17:40:46 +*/ +public interface HyDpCService extends IService { + + + /** + * 导入日降水表数据 + */ + void importHyDpCData(MultipartFile file); + + /** + * 查询日降水表数据 + */ + IPage selectHyDpCDataByPageAndInfo(PageParams pageParams, String startTime, String endTime, String stcd, String stnm); + + /** + * 导出日降雨量表数据 + */ + R exportHyDpCData(HttpServletResponse response,String startTime, String endTime, String stcd, String stnm); + + R importDateTosoft(String startTime, String endTime); +} diff --git a/swlscx/src/main/java/com/ruoyi/swlscx/day/service/HyDqCService.java b/swlscx/src/main/java/com/ruoyi/swlscx/day/service/HyDqCService.java new file mode 100644 index 0000000..3563203 --- /dev/null +++ b/swlscx/src/main/java/com/ruoyi/swlscx/day/service/HyDqCService.java @@ -0,0 +1,35 @@ +package com.ruoyi.swlscx.day.service; + +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.ruoyi.common.core.page.R; +import com.ruoyi.swlscx.common.PageParams; +import com.ruoyi.swlscx.day.domain.po.HyDqC; +import com.baomidou.mybatisplus.extension.service.IService; +import com.ruoyi.swlscx.day.domain.vo.HyDqCVo; +import org.springframework.web.multipart.MultipartFile; + +import javax.servlet.http.HttpServletResponse; + +/** +* @author 12974 +* @description 针对表【hy_dq_c(日平均流量表)】的数据库操作Service +* @createDate 2024-10-16 15:40:17 +*/ +public interface HyDqCService extends IService { + /** + * 导入日平均流量表数据 + */ + void importHyDqCData(MultipartFile file); + + /** + * 查询日流量表数据 + */ + IPage selectHyDqCDataByPageAndInfo(PageParams pageParams, String startTime, String endTime, String stcd, String stnm); + + /** + * 导出查询日流量表数据 + */ + R exportDayFlow(HttpServletResponse response, String startTime, String endTime, String stcd, String stnm); + + R importDateTosoft(String startTime, String endTime); +} diff --git a/swlscx/src/main/java/com/ruoyi/swlscx/day/service/HyDqsCService.java b/swlscx/src/main/java/com/ruoyi/swlscx/day/service/HyDqsCService.java new file mode 100644 index 0000000..28abad9 --- /dev/null +++ b/swlscx/src/main/java/com/ruoyi/swlscx/day/service/HyDqsCService.java @@ -0,0 +1,19 @@ +package com.ruoyi.swlscx.day.service; + +import com.ruoyi.swlscx.day.domain.po.HyDqsC; +import com.baomidou.mybatisplus.extension.service.IService; +import org.springframework.web.multipart.MultipartFile; + +/** +* @author 12974 +* @description 针对表【hy_dqs_c(日平均输沙率表)】的数据库操作Service +* @createDate 2024-10-16 16:29:38 +*/ +public interface HyDqsCService extends IService { + + /** + * 导入日平均输沙率表数据 + */ + void importHyDqsCData(MultipartFile file); + +} diff --git a/swlscx/src/main/java/com/ruoyi/swlscx/day/service/HyDweCService.java b/swlscx/src/main/java/com/ruoyi/swlscx/day/service/HyDweCService.java new file mode 100644 index 0000000..e8ee184 --- /dev/null +++ b/swlscx/src/main/java/com/ruoyi/swlscx/day/service/HyDweCService.java @@ -0,0 +1,35 @@ +package com.ruoyi.swlscx.day.service; + +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.ruoyi.common.core.page.R; +import com.ruoyi.swlscx.common.PageParams; +import com.ruoyi.swlscx.day.domain.po.HyDweC; +import com.baomidou.mybatisplus.extension.service.IService; +import com.ruoyi.swlscx.day.domain.vo.HyDweCVo; +import org.springframework.web.multipart.MultipartFile; + +import javax.servlet.http.HttpServletResponse; + +/** +* @author 12974 +* @description 针对表【hy_dwe_c(日水面蒸发量表)】的数据库操作Service +* @createDate 2024-10-16 17:24:19 +*/ +public interface HyDweCService extends IService { + /** + * 导入日水面蒸发量表数据 + */ + void importHyDweCData(MultipartFile file); + + /** + * 查询日水面蒸发表数据 + */ + IPage selectHyDweCDataByPageAndInfo(PageParams pageParams, String startTime, String endTime, String stcd, String stnm); + + /** + * 导出日水面蒸发表数据 + */ + R exportHyDweCData(HttpServletResponse response, String startTime, String endTime, String stcd, String stnm); + + R importDateTosoft(String startTime, String endTime); +} diff --git a/swlscx/src/main/java/com/ruoyi/swlscx/day/service/HyDwtCService.java b/swlscx/src/main/java/com/ruoyi/swlscx/day/service/HyDwtCService.java new file mode 100644 index 0000000..e0f7a97 --- /dev/null +++ b/swlscx/src/main/java/com/ruoyi/swlscx/day/service/HyDwtCService.java @@ -0,0 +1,37 @@ +package com.ruoyi.swlscx.day.service; + +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.ruoyi.common.core.page.R; +import com.ruoyi.swlscx.common.PageParams; +import com.ruoyi.swlscx.day.domain.po.HyDwtC; +import com.baomidou.mybatisplus.extension.service.IService; +import com.ruoyi.swlscx.day.domain.vo.HyDwtCVo; +import org.springframework.web.multipart.MultipartFile; + +import javax.servlet.http.HttpServletResponse; + +/** +* @author 12974 +* @description 针对表【hy_dwt_c(日水温表)】的数据库操作Service +* @createDate 2024-10-17 15:07:12 +*/ +public interface HyDwtCService extends IService { + + + /** + * 导入日水温表数据 + */ + void importHyDwtCData(MultipartFile file); + + /** + * 查询日水温表数据 + */ + IPage selectHyDwtCPageByInfo(PageParams pageParams, String startTime, String endTime, String stnm, String stcd); + + /** + * 导出日平均水位表数据 + */ + R exportDayWaterTemperature(HttpServletResponse response, String startTime, String endTime, String stcd, String stnm); + + R importDateTosoft(String startTime, String endTime); +} diff --git a/swlscx/src/main/java/com/ruoyi/swlscx/day/service/HyDzCService.java b/swlscx/src/main/java/com/ruoyi/swlscx/day/service/HyDzCService.java new file mode 100644 index 0000000..436d907 --- /dev/null +++ b/swlscx/src/main/java/com/ruoyi/swlscx/day/service/HyDzCService.java @@ -0,0 +1,38 @@ +package com.ruoyi.swlscx.day.service; + +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.ruoyi.common.core.page.R; +import com.ruoyi.swlscx.common.PageParams; +import com.ruoyi.swlscx.day.domain.po.HyDzC; +import com.baomidou.mybatisplus.extension.service.IService; +import com.ruoyi.swlscx.day.domain.vo.HyDzCVo; +import org.springframework.web.multipart.MultipartFile; + +import javax.servlet.http.HttpServletResponse; + +/** +* @author 12974 +* @description 针对表【hy_dz_c(日平均水位表)】的数据库操作Service +* @createDate 2024-10-16 16:46:04 +*/ +public interface HyDzCService extends IService { + + + /** + * 导入日平均水位表数据 + */ + void importHyDzCData(MultipartFile file); + + + /** + * 分页查询日平均水位表数据 + */ + IPage selectHyDzCPageByInfo(PageParams pageParams, String startTime, String endTime, String stnm, String stcd); + + /** + * 导出日平均水位表数据 + */ + R exportDayWaterLever(HttpServletResponse response, String startTime, String endTime, String stcd, String stnm); + + R importDateTosoft(String startTime, String endTime); +} diff --git a/swlscx/src/main/java/com/ruoyi/swlscx/day/service/impl/HyDcsFServiceImpl.java b/swlscx/src/main/java/com/ruoyi/swlscx/day/service/impl/HyDcsFServiceImpl.java new file mode 100644 index 0000000..34fcd1b --- /dev/null +++ b/swlscx/src/main/java/com/ruoyi/swlscx/day/service/impl/HyDcsFServiceImpl.java @@ -0,0 +1,345 @@ +package com.ruoyi.swlscx.day.service.impl; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.ruoyi.common.annotation.DataSource; +import com.ruoyi.common.config.RuoYiConfig; +import com.ruoyi.common.core.page.R; +import com.ruoyi.common.core.text.Convert; +import com.ruoyi.common.enums.DataSourceType; +import com.ruoyi.common.utils.DateUtils; +import com.ruoyi.common.utils.SecurityUtils; +import com.ruoyi.swlscx.basic.domain.po.YcExportTask; +import com.ruoyi.swlscx.basic.service.YcExportTaskService; +import com.ruoyi.swlscx.common.PageParams; +import com.ruoyi.swlscx.common.constants.SystemConstants; +import com.ruoyi.swlscx.common.utils.CommonUtils; +import com.ruoyi.swlscx.common.utils.ExcelUtils; +import com.ruoyi.swlscx.common.utils.Query; +import com.ruoyi.swlscx.day.domain.bo.HyDcsFBo; +import com.ruoyi.swlscx.day.domain.po.HyDcsF; +import com.ruoyi.swlscx.day.domain.vo.HyDcsFVo; +import com.ruoyi.swlscx.day.service.HyDcsFService; +import com.ruoyi.swlscx.day.mapper.HyDcsFMapper; +import org.apache.commons.lang3.ObjectUtils; +import org.apache.poi.ss.usermodel.CellStyle; +import org.apache.poi.ss.usermodel.Row; +import org.apache.poi.ss.usermodel.Sheet; +import org.springframework.beans.BeanUtils; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.context.ApplicationContext; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; +import org.springframework.web.multipart.MultipartFile; + +import javax.annotation.Resource; +import javax.servlet.http.HttpServletResponse; +import java.io.File; +import java.util.Date; +import java.util.List; +import java.util.Map; +import java.util.concurrent.CompletableFuture; +import java.util.concurrent.ThreadPoolExecutor; +import java.util.stream.Collectors; + +/** +* @author 12974 +* @description 针对表【hy_dcs_f(日平均含沙量表)】的数据库操作Service实现 +* @createDate 2024-10-16 16:12:22 +*/ +@Service +public class HyDcsFServiceImpl extends ServiceImpl + implements HyDcsFService{ + + @Resource + private ThreadPoolExecutor labelThreadPool; + + @Resource + private YcExportTaskService ycExportTaskService; + + /** + * 导入日平均含沙量表数据 + */ + @Override + @Transactional(rollbackFor = Exception.class) + public void importHyDcsFData(MultipartFile file) { + try { + List hyDcsFBos = ExcelUtils.readExcel(file.getInputStream(), + HyDcsFBo.class, 2); + List hyDcsFS = hyDcsFBos.stream().map(i -> { + HyDcsF hyDcsF = new HyDcsF(); + BeanUtils.copyProperties(i, hyDcsF); + hyDcsF.setDt(DateUtils.parseDate(i.getDt())); + hyDcsF.setAvcs(Convert.toBigDecimal(i.getAvcs())); + return hyDcsF; + }).collect(Collectors.toList()); + //先清空临时表的数据 + this.baseMapper.deleteAll(); + //先插入到临时表中 从临时表中更新过去 + for (int i = 0; i < hyDcsFS.size(); i += 1000) { + int end = Math.min(i + 1000, hyDcsFS.size()); + List batchList = hyDcsFS.subList(i, end); + List collect = batchList.stream().distinct().collect(Collectors.toList()); + this.baseMapper.batchInsert(collect); + } + //重临时表中把数据刷过去 + this.baseMapper.batchInsertOrUpdate(); + + } catch (Exception e) { + e.printStackTrace(); + } + } + + /** + * 查询日平均含沙量表表数据 + */ + @Override + public IPage selectHyDcsFPageByInfo(PageParams pageParams, String startTime, String endTime, String stnm, String stcd) { + Map map = CommonUtils.getYearAndDayDataMap(pageParams, startTime, endTime, stcd, stnm); + return this.baseMapper.selectHyDcsFPageByInfo(new Query().getPage(map), map); + + } + + @Override + public R exportDaySedimentConcentration(HttpServletResponse response, String startTime, String endTime, String stcd, String stnm) { + + Long userId = SecurityUtils.getUserId(); + String tableName = "日平均含沙量表"; + return taskAndExport(tableName,startTime, endTime, stcd, stnm, userId); + + // Map dataMap = CommonUtils.getYearAndDayDataMap(new PageParams(0L, 100000L), startTime, endTime, stcd, stnm); +// ExcelUtils.excelExport(response, "daySedimentConcentration.xls", "日平均含沙量表", (Sheet sheet, CellStyle style) -> { +// dataModel(dataMap, sheet, style); +// }); + } + + @Resource + private ThreadPoolExecutor importThreadPool; + + @Autowired + private ApplicationContext context; + + /** + * 从mysql导入到sqlserver中 + */ + @Transactional(rollbackFor = Exception.class) + @DataSource(DataSourceType.SHARDING) + public void importMysqlToSqlserver(List hyDcsFVoList) { + List records = hyDcsFVoList.stream().map(i->{ + HyDcsF hyDcsF = new HyDcsF(); + BeanUtils.copyProperties(i, hyDcsF); + hyDcsF.setDt(i.getDt()); + hyDcsF.setAvcs(Convert.toBigDecimal(i.getAvcs())); + return hyDcsF; + }).collect(Collectors.toList()); + //先清空临时表的数据 + this.baseMapper.deleteTempData(); + //插入临时表数据 + int batchSize = 50; + for (int i = 0; i < records.size(); i += batchSize) { + int end = Math.min(i + batchSize, records.size()); + List batch = records.subList(i, end); + // 执行批量插入 + this.baseMapper.insertTempData(batch); + } + //从临时表增或修改主表 + this.baseMapper.mergeToData(); + } + + + @Override + public R importDateTosoft(String startTime, String endTime) { + Long userId = SecurityUtils.getUserId(); + String filename = "日平均含沙量表" + startTime + "-" + endTime+"导入到南方片"; + // 查询是否已存在相同条件且未完成的任务 + List ongoingTasks = ycExportTaskService.list( + new QueryWrapper() + .eq("user_id", userId) + .eq("status", 0) // 状态为0表示任务未完成 + .like("filename", "日平均含沙量表")); + if (!ongoingTasks.isEmpty()) { + return R.error("当前任务正在下载中，请稍后重试"); + } + YcExportTask ycExportTask = new YcExportTask(); + ycExportTask.setFilename(filename); + ycExportTask.setUserId(userId); + ycExportTask.setStartTime(new Date()); + ycExportTask.setStatus(0); + ycExportTaskService.save(ycExportTask); + CompletableFuture.runAsync(() -> { + try { + IPage pageByInfo = this.selectHyDcsFPageByInfo(new PageParams(0L, 1000000000L), startTime, endTime, null, null); +// IPage pageByInfo = this.selectMaxHRainListPageByInfo(new PageParams(0L, 1000000000L), null, null, startTime, endTime); + HyDcsFServiceImpl hyDcsFService = context.getBean(HyDcsFServiceImpl.class); + hyDcsFService.importMysqlToSqlserver(pageByInfo.getRecords()); + ycExportTask.setStatus(2); + } catch (Exception e) { + ycExportTask.setStatus(4); + log.error(e.getMessage()); + R.error("任务下载失败"); + }finally { + ycExportTask.setEndTime(new Date()); + ycExportTaskService.updateById(ycExportTask); + } + }, importThreadPool); + return R.ok("任务已提交"); + } + + private R taskAndExport(String tableName,String startTime, String endTime, String stcd, String stnm, Long userId) { + String startNewTime=""; + String endNewTime=""; + if (ObjectUtils.isNotEmpty(startTime) ){ + startNewTime=startTime.substring(0,10); + } + if (ObjectUtils.isNotEmpty(endTime)){ + endNewTime=endTime.substring(0,10); + } + String filename = tableName + startNewTime + "-" + endNewTime; + // 查询是否已存在相同条件且未完成的任务 + List ongoingTasks = ycExportTaskService.list( + new QueryWrapper() + .eq("user_id", userId) + .eq("filename", filename) + .eq("status", 0) // 状态为0表示任务未完成 + ); + + if (!ongoingTasks.isEmpty()) { + return R.error("当前任务正在下载中，请稍后重试"); + } + + YcExportTask ycExportTask = new YcExportTask(); + String pathPeffix = RuoYiConfig.getExportPath() + + File.separator + userId + File.separator+ + DateUtils.parseDateToStr("yyyy-MM-dd",DateUtils.getNowDate()) + File.separator + + DateUtils.parseDateToStr("HH_mm",DateUtils.getNowDate())+File.separator; + ycExportTask.setFilename(filename); + ycExportTask.setUserId(userId); + ycExportTask.setStartTime(new Date()); + ycExportTask.setStatus(0); + ycExportTask.setFilepath(pathPeffix); + ycExportTaskService.save(ycExportTask); + CompletableFuture.runAsync(() -> { + try { + File dest = new File(pathPeffix); + if (!dest.exists()) { + dest.mkdirs(); + } + String fullPath = pathPeffix + filename; + exportBlackData(fullPath, startTime, endTime, stcd, stnm); + + ycExportTask.setStatus(1); + ycExportTask.setEndTime(new Date()); + ycExportTaskService.updateById(ycExportTask); + } catch (Exception e) { + log.error(e.getMessage(), e); + R.error("任务下载失败"); + } + }, labelThreadPool); + return R.ok("任务已提交，请稍后下载"); + } + + private void exportBlackData(String tableName, String startTime, String endTime, String stcd, String stnm) { + Map rainMap = CommonUtils.getYearAndDayDataMap(new PageParams(0L, 1000000000L), startTime, endTime, stcd, stnm); + ExcelUtils.excelBackExport2("daySedimentConcentration.xls", tableName, (Sheet sheet, CellStyle style) -> + dataModel1(rainMap, sheet, style)); + } + + public int dataModel1(Map map, Sheet sheet, CellStyle style) { + // 批量查询数据 + IPage hyDcsFVoIPage = this.baseMapper.selectHyDcsFPageByInfo(new Query().getPage(map), map); + List records = hyDcsFVoIPage.getRecords(); + // 定义当前sheet的行号 + int rowIndex = 2; // 从第二行开始写入数据 + // 定义全局序号 + int globalIndex = 1; // 从1开始 + + // 定义当前sheet的编号 + int sheetIndex = 1; + + // 最大行数限制 + int maxRowsPerSheet = 65536; // 对于 .xls 文件，最大行数为 65536 + int batchSize = 1000; // 每次批量处理1000行，减少逐行写入的开销 + + // 复制表头到新sheet的逻辑 + ExcelUtils.copyHeader(sheet, style); + + // 批量处理数据 + for (int i = 0; i < records.size(); i += batchSize) { + // 处理一批数据 + int toIndex = Math.min(i + batchSize, records.size()); + List batchList = records.subList(i, toIndex); + + // 批量写入数据 + for (HyDcsFVo vo : batchList) { + // 如果当前行数达到最大行数，创建新sheet + if (rowIndex >= maxRowsPerSheet) { + sheetIndex++; + sheet = sheet.getWorkbook().createSheet("日平均含沙量表" + sheetIndex); + rowIndex = 2; // 重置行号 + // 复制表头到新sheet + ExcelUtils.copyHeader(sheet, style); + } + + // 创建新行并写入数据 + Row row = ExcelUtils.createRow(sheet, rowIndex); + + // 使用 globalIndex 作为序号 + ExcelUtils.formatCell(row, 0, String.valueOf(globalIndex), style); + ExcelUtils.formatCell(row, 1, vo.getStcd() != null ? vo.getStcd() : "", style); + ExcelUtils.formatCell(row, 2, vo.getStnm() != null ? vo.getStnm() : "", style); + ExcelUtils.formatCell(row, 3, vo.getDt() != null ? DateUtils.parseDateToStr(SystemConstants.TIME_FORMAT,vo.getDt()) : "", style); + ExcelUtils.formatCell(row, 4, vo.getAvcs() != null ? CommonUtils.formatNum(vo.getAvcs()) : "", style); + ExcelUtils.formatCell(row, 5, vo.getAvcsrcd() != null ? vo.getAvcsrcd() : "", style); + // 增加行号和全局序号 + rowIndex++; + globalIndex++; + } + } + return 0; + } + + public void dataModel(Map map, Sheet sheet, CellStyle style) { + // 批量查询数据 + IPage hyDcsFVoIPage = this.baseMapper.selectHyDcsFPageByInfo(new Query().getPage(map), map); + List records = hyDcsFVoIPage.getRecords(); + // 定义当前sheet的行号 + int rowIndex = 2; + // 定义当前sheet的编号 + int sheetIndex = 1; + Row row; + // 最大行数限制 + int maxRowsPerSheet = 65536; // 对于 .xls 文件，最大行数为 65536 + int batchSize = 1000; // 每次批量处理1000行，减少逐行写入的开销 + // 批量处理数据 + for (int i = 0; i < records.size(); i += batchSize) { + // 处理一批数据 + int toIndex = Math.min(i + batchSize, records.size()); + List batchList = records.subList(i, toIndex); + // 批量写入数据 + for (HyDcsFVo vo : batchList) { + // 如果当前行数达到最大行数，创建新sheet + if (rowIndex >= maxRowsPerSheet) { + sheetIndex++; + sheet = sheet.getWorkbook().createSheet("日平均含沙量表_" + sheetIndex); + rowIndex = 2; // 重置行号 + } + // 创建新行并写入数据 + row = ExcelUtils.createRow(sheet, rowIndex); + //序号 + ExcelUtils.formatCell(row, 0, String.valueOf(rowIndex - 1), style); + ExcelUtils.formatCell(row, 1, vo.getStcd() != null ? vo.getStcd() : "", style); + ExcelUtils.formatCell(row, 2, vo.getStnm() != null ? vo.getStnm() : "", style); + ExcelUtils.formatCell(row, 3, vo.getDt() != null ? DateUtils.parseDateToStr(SystemConstants.TIME_FORMAT,vo.getDt()) : "", style); + ExcelUtils.formatCell(row, 4, vo.getAvcs() != null ? CommonUtils.formatNum(vo.getAvcs()) : "", style); + ExcelUtils.formatCell(row, 5, vo.getAvcsrcd() != null ? vo.getAvcsrcd() : "", style); + rowIndex++; + } + } + } + +} + + + + diff --git a/swlscx/src/main/java/com/ruoyi/swlscx/day/service/impl/HyDpCServiceImpl.java b/swlscx/src/main/java/com/ruoyi/swlscx/day/service/impl/HyDpCServiceImpl.java new file mode 100644 index 0000000..57dff22 --- /dev/null +++ b/swlscx/src/main/java/com/ruoyi/swlscx/day/service/impl/HyDpCServiceImpl.java @@ -0,0 +1,359 @@ +package com.ruoyi.swlscx.day.service.impl; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.core.toolkit.Wrappers; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.ruoyi.common.annotation.DataSource; +import com.ruoyi.common.config.RuoYiConfig; +import com.ruoyi.common.core.page.R; +import com.ruoyi.common.core.text.Convert; +import com.ruoyi.common.enums.DataSourceType; +import com.ruoyi.common.utils.DateUtils; +import com.ruoyi.common.utils.SecurityUtils; +import com.ruoyi.swlscx.basic.domain.po.HyStscA; +import com.ruoyi.swlscx.basic.domain.po.YcExportTask; +import com.ruoyi.swlscx.basic.service.HyStscAService; +import com.ruoyi.swlscx.basic.service.YcExportTaskService; +import com.ruoyi.swlscx.common.PageParams; +import com.ruoyi.swlscx.common.constants.SystemConstants; +import com.ruoyi.swlscx.common.utils.CommonUtils; +import com.ruoyi.swlscx.common.utils.ExcelUtils; +import com.ruoyi.swlscx.common.utils.Query; +import com.ruoyi.swlscx.day.domain.bo.HyDpCBo; +import com.ruoyi.swlscx.day.domain.po.HyDpC; +import com.ruoyi.swlscx.day.domain.vo.HyDpCVo; +import com.ruoyi.swlscx.day.service.HyDpCService; +import com.ruoyi.swlscx.day.mapper.HyDpCMapper; +import com.ruoyi.swlscx.month.domain.po.HyMtweE; +import com.ruoyi.swlscx.month.domain.vo.HyMptEVo; +import com.ruoyi.swlscx.month.domain.vo.HyMtweEVo; +import com.ruoyi.swlscx.month.service.impl.HyMtweEServiceImpl; +import com.ruoyi.swlscx.year.domain.vo.HyHmxpFVo; +import com.ruoyi.swlscx.year.domain.vo.HyYrpFVo; +import org.apache.commons.lang3.ObjectUtils; +import org.apache.poi.ss.usermodel.CellStyle; +import org.apache.poi.ss.usermodel.Row; +import org.apache.poi.ss.usermodel.Sheet; +import org.springframework.beans.BeanUtils; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.context.ApplicationContext; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; +import org.springframework.web.multipart.MultipartFile; + +import javax.annotation.Resource; +import javax.servlet.http.HttpServletResponse; +import java.io.File; +import java.util.Date; +import java.util.List; +import java.util.Map; +import java.util.concurrent.CompletableFuture; +import java.util.concurrent.ThreadPoolExecutor; +import java.util.stream.Collectors; + +/** +* @author 12974 +* @description 针对表【hy_dp_c(日降水表)】的数据库操作Service实现 +* @createDate 2024-10-15 17:40:46 +*/ +@Service +public class HyDpCServiceImpl extends ServiceImpl + implements HyDpCService{ + + @Autowired + private HyStscAService hyStscAService; + + @Resource + private ThreadPoolExecutor labelThreadPool; + + @Resource + private YcExportTaskService ycExportTaskService; + + /** + * 导入日降水表数据 + * @param file + */ + @Override + @Transactional(rollbackFor = Exception.class) + public void importHyDpCData(MultipartFile file) { + try { + List hyDpCBos = ExcelUtils.readExcel(file.getInputStream(), HyDpCBo.class, 2); + List hyDpCList = hyDpCBos.stream().map(i -> { + HyDpC hyDpC = new HyDpC(); + BeanUtils.copyProperties(i, hyDpC); + hyDpC.setDt(DateUtils.parseDate(i.getDt())); + hyDpC.setP(Convert.toBigDecimal(i.getP())); + return hyDpC; + }).collect(Collectors.toList()); + //先清空临时表的数据 + this.baseMapper.deleteAll(); + //先插入到临时表中 从临时表中更新过去 + for (int i = 0; i < hyDpCList.size(); i += 1000) { + int end = Math.min(i + 1000, hyDpCList.size()); + List batchList = hyDpCList.subList(i, end); + List collect = batchList.stream().distinct().collect(Collectors.toList()); + this.baseMapper.batchInsert(collect); + } + //重临时表中把数据刷过去 + this.baseMapper.batchInsertOrUpdate(); + + } catch (Exception e) { + e.printStackTrace(); + } + } + + /** + * 查询日降水表数据 + */ + @Override + public IPage selectHyDpCDataByPageAndInfo(PageParams pageParams, String startTime, String endTime, String stcd, String stnm) { + Map map = CommonUtils.getYearAndDayDataMap(pageParams, startTime, endTime, stcd, stnm); + return this.baseMapper.selectHyDpCDataByPageAndInfo(new Query().getPage(map), map); + } + + @Override + public R exportHyDpCData(HttpServletResponse response,String startTime, String endTime, String stcd, String stnm) { + + Long userId = SecurityUtils.getUserId(); + String tableName = "日降水表"; + return taskAndExport(tableName,startTime, endTime, stcd, stnm, userId); + } + + @Resource + private ThreadPoolExecutor importThreadPool; + + @Autowired + private ApplicationContext context; + + + /** + * 从mysql导入到sqlserver中 + */ + @Transactional(rollbackFor = Exception.class) + @DataSource(DataSourceType.SHARDING) + public void importMysqlToSqlserver(List hyDpCVoList) { + List records = hyDpCVoList.stream().map(i->{ + HyDpC hyDpC = new HyDpC(); + BeanUtils.copyProperties(i, hyDpC); + hyDpC.setDt((i.getDt())); + hyDpC.setP(Convert.toBigDecimal(i.getP())); + return hyDpC; + }).collect(Collectors.toList()); + //先清空临时表的数据 + this.baseMapper.deleteAll(); + //插入临时表数据 + int batchSize = 50; + for (int i = 0; i < records.size(); i += batchSize) { + int end = Math.min(i + batchSize, records.size()); + List batch = records.subList(i, end); + // 执行批量插入 + this.baseMapper.batchInsert(batch); + } + //从临时表增或修改主表 + this.baseMapper.mergeToData(); + } + + @Override + public R importDateTosoft(String startTime, String endTime) { + Long userId = SecurityUtils.getUserId(); + String filename = "日降雨量表" + startTime + "-" + endTime+"导入到南方片"; + // 查询是否已存在相同条件且未完成的任务 + List ongoingTasks = ycExportTaskService.list( + new QueryWrapper() + .eq("user_id", userId) + .eq("status", 0) // 状态为0表示任务未完成 + .like("filename", "日降雨量表")); + if (!ongoingTasks.isEmpty()) { + return R.error("当前任务正在下载中，请稍后重试"); + } + YcExportTask ycExportTask = new YcExportTask(); + ycExportTask.setFilename(filename); + ycExportTask.setUserId(userId); + ycExportTask.setStartTime(new Date()); + ycExportTask.setStatus(0); + ycExportTaskService.save(ycExportTask); + CompletableFuture.runAsync(() -> { + try { + IPage pageByInfo = this.selectHyDpCDataByPageAndInfo(new PageParams(0L, 100L), startTime, endTime, null, null); +// IPage pageByInfo = this.selectMaxHRainListPageByInfo(new PageParams(0L, 1000000000L), null, null, startTime, endTime); + HyDpCServiceImpl hyDpCService = context.getBean(HyDpCServiceImpl.class); + hyDpCService.importMysqlToSqlserver(pageByInfo.getRecords()); + ycExportTask.setStatus(2); + } catch (Exception e) { + ycExportTask.setStatus(4); + log.error(e.getMessage()); + R.error("任务下载失败"); + }finally { + ycExportTask.setEndTime(new Date()); + ycExportTaskService.updateById(ycExportTask); + } + }, importThreadPool); + return R.ok("任务已提交"); + } + + private R taskAndExport(String tableName,String startTime, String endTime, String stcd, String stnm, Long userId) { + String startNewTime=""; + String endNewTime=""; + if (ObjectUtils.isNotEmpty(startTime) ){ + startNewTime=startTime.substring(0,10); + } + if (ObjectUtils.isNotEmpty(endTime)){ + endNewTime=endTime.substring(0,10); + } + String filename = tableName + startNewTime + "-" + endNewTime; + // 查询是否已存在相同条件且未完成的任务 + List ongoingTasks = ycExportTaskService.list( + new QueryWrapper() + .eq("user_id", userId) + .eq("filename", filename) + .eq("status", 0) // 状态为0表示任务未完成 + ); + + if (!ongoingTasks.isEmpty()) { + return R.error("当前任务正在下载中，请稍后重试"); + } + + YcExportTask ycExportTask = new YcExportTask(); + String pathPeffix = RuoYiConfig.getExportPath() + + File.separator + userId + File.separator+ + DateUtils.parseDateToStr("yyyy-MM-dd",DateUtils.getNowDate()) + File.separator + + DateUtils.parseDateToStr("HH_mm",DateUtils.getNowDate())+File.separator; + ycExportTask.setFilename(filename); + ycExportTask.setUserId(userId); + ycExportTask.setStartTime(new Date()); + ycExportTask.setStatus(0); + ycExportTask.setFilepath(pathPeffix); + ycExportTaskService.save(ycExportTask); + CompletableFuture.runAsync(() -> { + try { + File dest = new File(pathPeffix); + if (!dest.exists()) { + dest.mkdirs(); + } + String fullPath = pathPeffix + filename; + exportBlackData(fullPath, startTime, endTime, stcd, stnm); + + ycExportTask.setStatus(1); + ycExportTask.setEndTime(new Date()); + ycExportTaskService.updateById(ycExportTask); + } catch (Exception e) { + log.error(e.getMessage(), e); + R.error("任务下载失败"); + } + }, labelThreadPool); + return R.ok("任务已提交，请稍后下载"); + } + + private void exportBlackData(String tableName, String startTime, String endTime, String stcd, String stnm) { + Map rainMap = CommonUtils.getYearAndDayDataMap(new PageParams(0L, 1000000000L), startTime, endTime, stcd, stnm); + ExcelUtils.excelBackExport2("dayRain.xls", tableName, (Sheet sheet, CellStyle style) -> + dataModel1(rainMap, sheet, style)); + } + + public int dataModel1(Map map, Sheet sheet, CellStyle style) { + // 批量查询数据 + IPage hyDpCVoIPage = this.baseMapper.selectHyDpCDataByPageAndInfo(new Query().getPage(map), map); + List list = hyStscAService.list(); + List records = hyDpCVoIPage.getRecords().stream().map(i -> { + list.stream().filter(j -> j.getStcd().equals(i.getStcd())).findFirst().ifPresent(j -> { + i.setStnm(j.getStnm()); + }); + return i; + }).collect(Collectors.toList()); + // 定义当前sheet的行号 + int rowIndex = 2; // 从第二行开始写入数据 + // 定义全局序号 + int globalIndex = 1; // 从1开始 + + // 定义当前sheet的编号 + int sheetIndex = 1; + + // 最大行数限制 + int maxRowsPerSheet = 65536; // 对于 .xls 文件，最大行数为 65536 + int batchSize = 1000; // 每次批量处理1000行，减少逐行写入的开销 + + // 复制表头到新sheet的逻辑 + ExcelUtils.copyHeader(sheet, style); + + // 批量处理数据 + for (int i = 0; i < records.size(); i += batchSize) { + // 处理一批数据 + int toIndex = Math.min(i + batchSize, records.size()); + List batchList = records.subList(i, toIndex); + + // 批量写入数据 + for (HyDpCVo vo : batchList) { + // 如果当前行数达到最大行数，创建新sheet + if (rowIndex >= maxRowsPerSheet) { + sheetIndex++; + sheet = sheet.getWorkbook().createSheet("日降水表" + sheetIndex); + rowIndex = 2; // 重置行号 + // 复制表头到新sheet + ExcelUtils.copyHeader(sheet, style); + } + + // 创建新行并写入数据 + Row row = ExcelUtils.createRow(sheet, rowIndex); + + // 使用 globalIndex 作为序号 + ExcelUtils.formatCell(row, 0, String.valueOf(globalIndex), style); + ExcelUtils.formatCell(row, 1, vo.getStcd() != null ? vo.getStcd() : "", style); + ExcelUtils.formatCell(row, 2, vo.getStnm() != null ? vo.getStnm() : "", style); + ExcelUtils.formatCell(row, 3, vo.getDt() != null ? DateUtils.parseDateToStr(SystemConstants.TIME_FORMAT,vo.getDt()) : "", style); + ExcelUtils.formatCell(row, 4, vo.getP() != null ? vo.getP().toString() : "", style); + ExcelUtils.formatCell(row, 5, vo.getPrcd() != null ? vo.getPrcd() : "", style); + // 增加行号和全局序号 + rowIndex++; + globalIndex++; + } + } + return 0; + } + + + public void dataModel(Map map, Sheet sheet, CellStyle style) { + // 批量查询数据 + IPage hyDpCVoIPage = this.baseMapper.selectHyDpCDataByPageAndInfo(new Query().getPage(map), map); + List records = hyDpCVoIPage.getRecords(); + // 定义当前sheet的行号 + int rowIndex = 2; + // 定义当前sheet的编号 + int sheetIndex = 1; + Row row; + // 最大行数限制 + int maxRowsPerSheet = 65536; // 对于 .xls 文件，最大行数为 65536 + int batchSize = 1000; // 每次批量处理1000行，减少逐行写入的开销 + // 批量处理数据 + for (int i = 0; i < records.size(); i += batchSize) { + // 处理一批数据 + int toIndex = Math.min(i + batchSize, records.size()); + List batchList = records.subList(i, toIndex); + // 批量写入数据 + for (HyDpCVo vo : batchList) { + // 如果当前行数达到最大行数，创建新sheet + if (rowIndex >= maxRowsPerSheet) { + sheetIndex++; + sheet = sheet.getWorkbook().createSheet("日降水表_" + sheetIndex); + rowIndex = 2; // 重置行号 + } + // 创建新行并写入数据 + row = ExcelUtils.createRow(sheet, rowIndex); + //序号 + ExcelUtils.formatCell(row, 0, String.valueOf(rowIndex - 1), style); + ExcelUtils.formatCell(row, 1, vo.getStcd() != null ? vo.getStcd() : "", style); + ExcelUtils.formatCell(row, 2, vo.getStnm() != null ? vo.getStnm() : "", style); + ExcelUtils.formatCell(row, 3, vo.getDt() != null ? DateUtils.parseDateToStr(SystemConstants.TIME_FORMAT,vo.getDt()) : "", style); + ExcelUtils.formatCell(row, 4, vo.getP() != null ? vo.getP().toString() : "", style); + ExcelUtils.formatCell(row, 5, vo.getPrcd() != null ? vo.getPrcd() : "", style); + rowIndex++; + } + } + } + + +} + + + + diff --git a/swlscx/src/main/java/com/ruoyi/swlscx/day/service/impl/HyDqCServiceImpl.java b/swlscx/src/main/java/com/ruoyi/swlscx/day/service/impl/HyDqCServiceImpl.java new file mode 100644 index 0000000..7e3cb7a --- /dev/null +++ b/swlscx/src/main/java/com/ruoyi/swlscx/day/service/impl/HyDqCServiceImpl.java @@ -0,0 +1,343 @@ +package com.ruoyi.swlscx.day.service.impl; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.ruoyi.common.annotation.DataSource; +import com.ruoyi.common.config.RuoYiConfig; +import com.ruoyi.common.core.page.R; +import com.ruoyi.common.core.text.Convert; +import com.ruoyi.common.enums.DataSourceType; +import com.ruoyi.common.utils.DateUtils; +import com.ruoyi.common.utils.SecurityUtils; +import com.ruoyi.swlscx.basic.domain.po.YcExportTask; +import com.ruoyi.swlscx.basic.service.YcExportTaskService; +import com.ruoyi.swlscx.common.PageParams; +import com.ruoyi.swlscx.common.constants.SystemConstants; +import com.ruoyi.swlscx.common.utils.CommonUtils; +import com.ruoyi.swlscx.common.utils.ExcelUtils; +import com.ruoyi.swlscx.common.utils.Query; +import com.ruoyi.swlscx.day.domain.bo.HyDqCBo; +import com.ruoyi.swlscx.day.domain.po.HyDqC; +import com.ruoyi.swlscx.day.domain.vo.HyDqCVo; +import com.ruoyi.swlscx.day.service.HyDqCService; +import com.ruoyi.swlscx.day.mapper.HyDqCMapper; +import org.apache.commons.lang3.ObjectUtils; +import org.apache.poi.ss.usermodel.CellStyle; +import org.apache.poi.ss.usermodel.Row; +import org.apache.poi.ss.usermodel.Sheet; +import org.springframework.beans.BeanUtils; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.context.ApplicationContext; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; +import org.springframework.web.multipart.MultipartFile; + +import javax.annotation.Resource; +import javax.servlet.http.HttpServletResponse; +import java.io.File; +import java.util.Date; +import java.util.List; +import java.util.Map; +import java.util.concurrent.CompletableFuture; +import java.util.concurrent.ThreadPoolExecutor; +import java.util.stream.Collectors; + +/** +* @author 12974 +* @description 针对表【hy_dq_c(日平均流量表)】的数据库操作Service实现 +* @createDate 2024-10-16 15:40:17 +*/ +@Service +public class HyDqCServiceImpl extends ServiceImpl + implements HyDqCService{ + + @Resource + private ThreadPoolExecutor labelThreadPool; + + @Resource + private YcExportTaskService ycExportTaskService; + + /** + * 导入日平均流量表数据 + */ + @Override + @Transactional(rollbackFor = Exception.class) + public void importHyDqCData(MultipartFile file) { + try { + List hyDqCBos = ExcelUtils.readExcel(file.getInputStream(), + HyDqCBo.class, 2); + List hyDqCS = hyDqCBos.stream().map(i -> { + HyDqC hyDqC = new HyDqC(); + BeanUtils.copyProperties(i, hyDqC); + hyDqC.setDt(DateUtils.parseDate(i.getDt())); + hyDqC.setAvq(Convert.toBigDecimal(i.getAvq())); + return hyDqC; + }).collect(Collectors.toList()); + //先清空临时表的数据 + this.baseMapper.deleteAll(); + //先插入到临时表中 从临时表中更新过去 + for (int i = 0; i < hyDqCS.size(); i += 1000) { + int end = Math.min(i + 1000, hyDqCS.size()); + List batchList = hyDqCS.subList(i, end); + List collect = batchList.stream().distinct().collect(Collectors.toList()); + this.baseMapper.batchInsert(collect); + } + //重临时表中把数据刷过去 + this.baseMapper.batchInsertOrUpdate(); + + } catch (Exception e) { + e.printStackTrace(); + } + } + + @Override + public IPage selectHyDqCDataByPageAndInfo(PageParams pageParams, String startTime, String endTime, String stcd, String stnm) { + Map map = CommonUtils.getYearAndDayDataMap(pageParams, startTime, endTime, stcd, stnm); + return this.baseMapper.selectHyMtqEPageByInfo(new Query().getPage(map), map); + } + + @Override + public R exportDayFlow(HttpServletResponse response, String startTime, String endTime, String stcd, String stnm) { + + Long userId = SecurityUtils.getUserId(); + String tableName = "日平均流量表"; + return taskAndExport(tableName,startTime, endTime, stcd, stnm, userId); + +// Map dataMap = CommonUtils.getYearAndDayDataMap(new PageParams(0L, 100000L), startTime, endTime, stcd, stnm); +// ExcelUtils.excelExport(response, "dayFlow.xls", "日平均流量表", (Sheet sheet, CellStyle style) -> { +// dataModel(dataMap, sheet, style); +// }); + } + + @Resource + private ThreadPoolExecutor importThreadPool; + + @Autowired + private ApplicationContext context; + + /** + * 从mysql导入到sqlserver中 + */ + @Transactional(rollbackFor = Exception.class) + @DataSource(DataSourceType.SHARDING) + public void importMysqlToSqlserver(List hyDqCVoList) { + List records = hyDqCVoList.stream().map(i->{ + HyDqC hyDqC = new HyDqC(); + BeanUtils.copyProperties(i, hyDqC); + hyDqC.setDt(i.getDt()); + hyDqC.setAvq(Convert.toBigDecimal(i.getAvq())); + return hyDqC; + }).collect(Collectors.toList()); + //先清空临时表的数据 + this.baseMapper.deleteAll(); + //插入临时表数据 + int batchSize = 50; + for (int i = 0; i < records.size(); i += batchSize) { + int end = Math.min(i + batchSize, records.size()); + List batch = records.subList(i, end); + // 执行批量插入 + this.baseMapper.batchInsert(batch); + } + //从临时表增或修改主表 + this.baseMapper.mergeToData(); + } + + + @Override + public R importDateTosoft(String startTime, String endTime) { + Long userId = SecurityUtils.getUserId(); + String filename = "日平均流量表" + startTime + "-" + endTime+"导入到南方片"; + // 查询是否已存在相同条件且未完成的任务 + List ongoingTasks = ycExportTaskService.list( + new QueryWrapper() + .eq("user_id", userId) + .eq("status", 0) // 状态为0表示任务未完成 + .like("filename", "日平均流量表")); + if (!ongoingTasks.isEmpty()) { + return R.error("当前任务正在下载中，请稍后重试"); + } + YcExportTask ycExportTask = new YcExportTask(); + ycExportTask.setFilename(filename); + ycExportTask.setUserId(userId); + ycExportTask.setStartTime(new Date()); + ycExportTask.setStatus(0); + ycExportTaskService.save(ycExportTask); + CompletableFuture.runAsync(() -> { + try { + IPage pageByInfo = this.selectHyDqCDataByPageAndInfo(new PageParams(0L, 100000000000L), startTime, endTime, null, null); +// IPage pageByInfo = this.selectMaxHRainListPageByInfo(new PageParams(0L, 1000L), null, null, startTime, endTime); + HyDqCServiceImpl hyDqCService = context.getBean(HyDqCServiceImpl.class); + hyDqCService.importMysqlToSqlserver(pageByInfo.getRecords()); + ycExportTask.setStatus(2); + } catch (Exception e) { + ycExportTask.setStatus(4); + log.error(e.getMessage()); + R.error("任务下载失败"); + }finally { + ycExportTask.setEndTime(new Date()); + ycExportTaskService.updateById(ycExportTask); + } + }, importThreadPool); + return R.ok("任务已提交"); + } + + + private R taskAndExport(String tableName,String startTime, String endTime, String stcd, String stnm, Long userId) { + String startNewTime=""; + String endNewTime=""; + if (ObjectUtils.isNotEmpty(startTime) ){ + startNewTime=startTime.substring(0,10); + } + if (ObjectUtils.isNotEmpty(endTime)){ + endNewTime=endTime.substring(0,10); + } + String filename = tableName + startNewTime + "-" + endNewTime; + // 查询是否已存在相同条件且未完成的任务 + List ongoingTasks = ycExportTaskService.list( + new QueryWrapper() + .eq("user_id", userId) + .eq("filename", filename) + .eq("status", 0) // 状态为0表示任务未完成 + ); + + if (!ongoingTasks.isEmpty()) { + return R.error("当前任务正在下载中，请稍后重试"); + } + + YcExportTask ycExportTask = new YcExportTask(); + String pathPeffix = RuoYiConfig.getExportPath() + + File.separator + userId + File.separator+ + DateUtils.parseDateToStr("yyyy-MM-dd",DateUtils.getNowDate()) + File.separator + + DateUtils.parseDateToStr("HH_mm",DateUtils.getNowDate())+File.separator; + ycExportTask.setFilename(filename); + ycExportTask.setUserId(userId); + ycExportTask.setStartTime(new Date()); + ycExportTask.setStatus(0); + ycExportTask.setFilepath(pathPeffix); + ycExportTaskService.save(ycExportTask); + CompletableFuture.runAsync(() -> { + try { + File dest = new File(pathPeffix); + if (!dest.exists()) { + dest.mkdirs(); + } + String fullPath = pathPeffix + filename; + exportBlackData(fullPath, startTime, endTime, stcd, stnm); + + ycExportTask.setStatus(1); + ycExportTask.setEndTime(new Date()); + ycExportTaskService.updateById(ycExportTask); + } catch (Exception e) { + log.error(e.getMessage(), e); + R.error("任务下载失败"); + } + }, labelThreadPool); + return R.ok("任务已提交，请稍后下载"); + } + + private void exportBlackData(String tableName, String startTime, String endTime, String stcd, String stnm) { + Map rainMap = CommonUtils.getYearAndDayDataMap(new PageParams(0L, 1000000000L), startTime, endTime, stcd, stnm); + ExcelUtils.excelBackExport2("dayFlow.xls", tableName, (Sheet sheet, CellStyle style) -> + dataModel1(rainMap, sheet, style)); + } + + public int dataModel1(Map map, Sheet sheet, CellStyle style) { + // 批量查询数据 + IPage hyDqCVoIPage = this.baseMapper.selectHyMtqEPageByInfo(new Query().getPage(map), map); + List records = hyDqCVoIPage.getRecords(); + // 定义当前sheet的行号 + int rowIndex = 2; // 从第二行开始写入数据 + // 定义全局序号 + int globalIndex = 1; // 从1开始 + + // 定义当前sheet的编号 + int sheetIndex = 1; + + // 最大行数限制 + int maxRowsPerSheet = 65536; // 对于 .xls 文件，最大行数为 65536 + int batchSize = 1000; // 每次批量处理1000行，减少逐行写入的开销 + + // 复制表头到新sheet的逻辑 + ExcelUtils.copyHeader(sheet, style); + + // 批量处理数据 + for (int i = 0; i < records.size(); i += batchSize) { + // 处理一批数据 + int toIndex = Math.min(i + batchSize, records.size()); + List batchList = records.subList(i, toIndex); + + // 批量写入数据 + for (HyDqCVo vo : batchList) { + // 如果当前行数达到最大行数，创建新sheet + if (rowIndex >= maxRowsPerSheet) { + sheetIndex++; + sheet = sheet.getWorkbook().createSheet("日平均流量表" + sheetIndex); + rowIndex = 2; // 重置行号 + // 复制表头到新sheet + ExcelUtils.copyHeader(sheet, style); + } + + // 创建新行并写入数据 + Row row = ExcelUtils.createRow(sheet, rowIndex); + + // 使用 globalIndex 作为序号 + ExcelUtils.formatCell(row, 0, String.valueOf(globalIndex), style); + ExcelUtils.formatCell(row, 1, vo.getStcd() != null ? vo.getStcd() : "", style); + ExcelUtils.formatCell(row, 2, vo.getStnm() != null ? vo.getStnm() : "", style); + ExcelUtils.formatCell(row, 3, vo.getDt() != null ? DateUtils.parseDateToStr(SystemConstants.TIME_FORMAT,vo.getDt()) : "", style); + ExcelUtils.formatCell(row, 4, vo.getAvq() != null ? vo.getAvq().toString() : "", style); + ExcelUtils.formatCell(row, 5, vo.getAvqrcd() != null ? vo.getAvqrcd() : "", style); + // 增加行号和全局序号 + rowIndex++; + globalIndex++; + } + } + return 0; + } + + + public void dataModel(Map map, Sheet sheet, CellStyle style) { + // 批量查询数据 + IPage hyDqCVoIPage = this.baseMapper.selectHyMtqEPageByInfo(new Query().getPage(map), map); + List records = hyDqCVoIPage.getRecords(); + // 定义当前sheet的行号 + int rowIndex = 2; + // 定义当前sheet的编号 + int sheetIndex = 1; + Row row; + // 最大行数限制 + int maxRowsPerSheet = 65536; // 对于 .xls 文件，最大行数为 65536 + int batchSize = 1000; // 每次批量处理1000行，减少逐行写入的开销 + // 批量处理数据 + for (int i = 0; i < records.size(); i += batchSize) { + // 处理一批数据 + int toIndex = Math.min(i + batchSize, records.size()); + List batchList = records.subList(i, toIndex); + // 批量写入数据 + for (HyDqCVo vo : batchList) { + // 如果当前行数达到最大行数，创建新sheet + if (rowIndex >= maxRowsPerSheet) { + sheetIndex++; + sheet = sheet.getWorkbook().createSheet("日平均流量表_" + sheetIndex); + rowIndex = 2; // 重置行号 + } + // 创建新行并写入数据 + row = ExcelUtils.createRow(sheet, rowIndex); + //序号 + ExcelUtils.formatCell(row, 0, String.valueOf(rowIndex - 1), style); + ExcelUtils.formatCell(row, 1, vo.getStcd() != null ? vo.getStcd() : "", style); + ExcelUtils.formatCell(row, 2, vo.getStnm() != null ? vo.getStnm() : "", style); + ExcelUtils.formatCell(row, 3, vo.getDt() != null ? DateUtils.parseDateToStr(SystemConstants.TIME_FORMAT,vo.getDt()) : "", style); + ExcelUtils.formatCell(row, 4, vo.getAvq() != null ? vo.getAvq().toString() : "", style); + ExcelUtils.formatCell(row, 5, vo.getAvqrcd() != null ? vo.getAvqrcd() : "", style); + rowIndex++; + } + } + } + +} + + + + diff --git a/swlscx/src/main/java/com/ruoyi/swlscx/day/service/impl/HyDqsCServiceImpl.java b/swlscx/src/main/java/com/ruoyi/swlscx/day/service/impl/HyDqsCServiceImpl.java new file mode 100644 index 0000000..35c7343 --- /dev/null +++ b/swlscx/src/main/java/com/ruoyi/swlscx/day/service/impl/HyDqsCServiceImpl.java @@ -0,0 +1,52 @@ +package com.ruoyi.swlscx.day.service.impl; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.ruoyi.common.core.text.Convert; +import com.ruoyi.common.utils.DateUtils; +import com.ruoyi.swlscx.common.utils.ExcelUtils; +import com.ruoyi.swlscx.day.domain.bo.HyDqsCBo; +import com.ruoyi.swlscx.day.domain.po.HyDqsC; +import com.ruoyi.swlscx.day.service.HyDqsCService; +import com.ruoyi.swlscx.day.mapper.HyDqsCMapper; +import org.springframework.beans.BeanUtils; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; +import org.springframework.web.multipart.MultipartFile; + +import java.util.List; +import java.util.stream.Collectors; + +/** +* @author 12974 +* @description 针对表【hy_dqs_c(日平均输沙率表)】的数据库操作Service实现 +* @createDate 2024-10-16 16:29:38 +*/ +@Service +public class HyDqsCServiceImpl extends ServiceImpl + implements HyDqsCService{ + + /** + * 导入日平均输沙率表数据 + */ + @Override + @Transactional(rollbackFor = Exception.class) + public void importHyDqsCData(MultipartFile file) { + try { + List hyDqsCBos = ExcelUtils.readExcel(file.getInputStream(), HyDqsCBo.class, 2); + List hyMtpEList = hyDqsCBos.stream().map(i -> { + HyDqsC hyDqsC = new HyDqsC(); + BeanUtils.copyProperties(i, hyDqsC); + hyDqsC.setDt(DateUtils.parseDate(i.getDt())); + hyDqsC.setAvqs(Convert.toBigDecimal(i.getAvqs())); + return hyDqsC; + }).collect(Collectors.toList()); + this.saveBatch(hyMtpEList, 10000); + } catch (Exception e) { + e.printStackTrace(); + } + } +} + + + + diff --git a/swlscx/src/main/java/com/ruoyi/swlscx/day/service/impl/HyDweCServiceImpl.java b/swlscx/src/main/java/com/ruoyi/swlscx/day/service/impl/HyDweCServiceImpl.java new file mode 100644 index 0000000..bbb4bf9 --- /dev/null +++ b/swlscx/src/main/java/com/ruoyi/swlscx/day/service/impl/HyDweCServiceImpl.java @@ -0,0 +1,330 @@ +package com.ruoyi.swlscx.day.service.impl; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.ruoyi.common.annotation.DataSource; +import com.ruoyi.common.config.RuoYiConfig; +import com.ruoyi.common.core.page.R; +import com.ruoyi.common.core.text.Convert; +import com.ruoyi.common.enums.DataSourceType; +import com.ruoyi.common.utils.DateUtils; +import com.ruoyi.common.utils.SecurityUtils; +import com.ruoyi.swlscx.basic.domain.po.YcExportTask; +import com.ruoyi.swlscx.basic.domain.vo.HyStscAVo; +import com.ruoyi.swlscx.basic.service.YcExportTaskService; +import com.ruoyi.swlscx.common.PageParams; +import com.ruoyi.swlscx.common.constants.SystemConstants; +import com.ruoyi.swlscx.common.utils.CommonUtils; +import com.ruoyi.swlscx.common.utils.ExcelUtils; +import com.ruoyi.swlscx.common.utils.Query; +import com.ruoyi.swlscx.day.domain.bo.HyDweCBo; +import com.ruoyi.swlscx.day.domain.po.HyDweC; +import com.ruoyi.swlscx.day.domain.vo.HyDweCVo; +import com.ruoyi.swlscx.day.service.HyDweCService; +import com.ruoyi.swlscx.day.mapper.HyDweCMapper; +import org.apache.commons.lang3.ObjectUtils; +import org.apache.poi.ss.usermodel.CellStyle; +import org.apache.poi.ss.usermodel.Row; +import org.apache.poi.ss.usermodel.Sheet; +import org.springframework.beans.BeanUtils; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.context.ApplicationContext; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; +import org.springframework.web.multipart.MultipartFile; + +import javax.annotation.Resource; +import javax.servlet.http.HttpServletResponse; +import java.io.File; +import java.util.Date; +import java.util.List; +import java.util.Map; +import java.util.concurrent.CompletableFuture; +import java.util.concurrent.ThreadPoolExecutor; +import java.util.stream.Collectors; + +/** +* @author 12974 +* @description 针对表【hy_dwe_c(日水面蒸发量表)】的数据库操作Service实现 +* @createDate 2024-10-16 17:24:19 +*/ +@Service +public class HyDweCServiceImpl extends ServiceImpl + implements HyDweCService{ + + @Resource + private ThreadPoolExecutor labelThreadPool; + + @Resource + private ThreadPoolExecutor importThreadPool; + + @Resource + private YcExportTaskService ycExportTaskService; + + @Autowired + private ApplicationContext context; + + /** + * 导入日水面蒸发量表数据 + */ + @Override + @Transactional(rollbackFor = Exception.class) + public void importHyDweCData(MultipartFile file) { + try { + List hyDweCBos = ExcelUtils.readExcel(file.getInputStream(), + HyDweCBo.class, 2); + List hyDweCList = hyDweCBos.stream().map(i -> { + HyDweC hyDweC = new HyDweC(); + BeanUtils.copyProperties(i, hyDweC); + hyDweC.setDt(DateUtils.parseDate(i.getDt())); + hyDweC.setWsfe(Convert.toBigDecimal(i.getWsfe())); + return hyDweC; + }).collect(Collectors.toList()); + //先清空临时表的数据 + this.baseMapper.deleteAll(); + //先插入到临时表中 从临时表中更新过去 + for (int i = 0; i < hyDweCList.size(); i += 1000) { + int end = Math.min(i + 1000, hyDweCList.size()); + List batchList = hyDweCList.subList(i, end); + List collect = batchList.stream().distinct().collect(Collectors.toList()); + this.baseMapper.batchInsert(collect); + } + //重临时表中把数据刷过去 + this.baseMapper.batchInsertOrUpdate(); + + } catch (Exception e) { + e.printStackTrace(); + } + } + + /** + * 查询日水面蒸发表数据 + */ + @Override + @DataSource(DataSourceType.MASTER) + public IPage selectHyDweCDataByPageAndInfo(PageParams pageParams, String startTime, String endTime, String stcd, String stnm) { + Map map = CommonUtils.getYearAndDayDataMap(pageParams, startTime, endTime, stcd, stnm); + return this.baseMapper.selectHyDweCDataByPageAndInfo(new Query().getPage(map), map); + } + + /** + * 导出日水面蒸发表数据 + */ + @Override + public R exportHyDweCData(HttpServletResponse response, String startTime, String endTime, String stcd, String stnm) { + + Long userId = SecurityUtils.getUserId(); + String tableName = "日水面蒸发量表"; + return taskAndExport(tableName,startTime, endTime, stcd, stnm, userId); + +// Map dataMap = CommonUtils.getYearAndDayDataMap(new PageParams(0L, 100000L), startTime, endTime, stcd, stnm); +// ExcelUtils.excelExport(response, "dayEvaporationWater.xls", "日水面蒸发量表", (Sheet sheet, CellStyle style) -> { +// dataModel(dataMap, sheet, style); +// }); + } + + @Override + public R importDateTosoft(String startTime, String endTime) { + Long userId = SecurityUtils.getUserId(); + String filename = "日水面蒸发量表" + startTime + "-" + endTime+"导入到南方片"; + YcExportTask ycExportTask = new YcExportTask(); + ycExportTask.setFilename(filename); + ycExportTask.setUserId(userId); + ycExportTask.setStartTime(new Date()); + ycExportTask.setStatus(0); + ycExportTaskService.save(ycExportTask); + CompletableFuture.runAsync(() -> { + try { + IPage stationPageByInfo = this.selectHyDweCDataByPageAndInfo(new PageParams(0L, 1000000000L), startTime, endTime, null, null); + HyDweCServiceImpl hyDweCService = context.getBean(HyDweCServiceImpl.class); + hyDweCService.importMysqlToSqlserver(stationPageByInfo.getRecords()); + ycExportTask.setStatus(2); + ycExportTask.setEndTime(new Date()); + ycExportTaskService.updateById(ycExportTask); + } catch (Exception e) { + log.error(e.getMessage(), e); + ycExportTask.setStatus(4); + ycExportTask.setEndTime(new Date()); + ycExportTaskService.updateById(ycExportTask); + } + }, importThreadPool); + return R.ok("任务已提交"); + } + + + /** + * 从mysql导入到sqlserver中 + */ + @Transactional(rollbackFor = Exception.class) + @DataSource(DataSourceType.SHARDING) + public void importMysqlToSqlserver(List hyDweCVoList) { + List records = hyDweCVoList.stream().map(i->{ + HyDweC hyDweC = new HyDweC(); + BeanUtils.copyProperties(i, hyDweC); + hyDweC.setWsfe(Convert.toBigDecimal(i.getWsfe())); + return hyDweC; + }).collect(Collectors.toList()); + this.saveBatch(records,10000); + } + + private R taskAndExport(String tableName,String startTime, String endTime, String stcd, String stnm, Long userId) { + String startNewTime=""; + String endNewTime=""; + if (ObjectUtils.isNotEmpty(startTime) ){ + startNewTime=startTime.substring(0,10); + } + if (ObjectUtils.isNotEmpty(endTime)){ + endNewTime=endTime.substring(0,10); + } + String filename = tableName + startNewTime + "-" + endNewTime; + // 查询是否已存在相同条件且未完成的任务 + List ongoingTasks = ycExportTaskService.list( + new QueryWrapper() + .eq("user_id", userId) + .eq("filename", filename) + .eq("status", 0) // 状态为0表示任务未完成 + ); + + if (!ongoingTasks.isEmpty()) { + return R.error("当前任务正在下载中，请稍后重试"); + } + + YcExportTask ycExportTask = new YcExportTask(); + String pathPeffix = RuoYiConfig.getExportPath() + + File.separator + userId + File.separator+ + DateUtils.parseDateToStr("yyyy-MM-dd",DateUtils.getNowDate()) + File.separator + + DateUtils.parseDateToStr("HH_mm",DateUtils.getNowDate())+File.separator; + ycExportTask.setFilename(filename); + ycExportTask.setUserId(userId); + ycExportTask.setStartTime(new Date()); + ycExportTask.setStatus(0); + ycExportTask.setFilepath(pathPeffix); + ycExportTaskService.save(ycExportTask); + CompletableFuture.runAsync(() -> { + try { + File dest = new File(pathPeffix); + if (!dest.exists()) { + dest.mkdirs(); + } + String fullPath = pathPeffix + filename; + exportBlackData(fullPath, startTime, endTime, stcd, stnm); + + ycExportTask.setStatus(1); + ycExportTask.setEndTime(new Date()); + ycExportTaskService.updateById(ycExportTask); + } catch (Exception e) { + log.error(e.getMessage(), e); + R.error("任务下载失败"); + } + }, labelThreadPool); + return R.ok("任务已提交，请稍后下载"); + } + + + private void exportBlackData(String tableName, String startTime, String endTime, String stcd, String stnm) { + Map rainMap = CommonUtils.getYearAndDayDataMap(new PageParams(0L, 1000000000L), startTime, endTime, stcd, stnm); + ExcelUtils.excelBackExport2("dayEvaporationWater.xls", tableName, (Sheet sheet, CellStyle style) -> + dataModel1(rainMap, sheet, style)); + } + + public int dataModel1(Map map, Sheet sheet, CellStyle style) { + // 批量查询数据 + IPage hyDweCVoIPage = this.baseMapper.selectHyDweCDataByPageAndInfo(new Query().getPage(map), map); + List records = hyDweCVoIPage.getRecords(); + // 定义当前sheet的行号 + int rowIndex = 2; // 从第二行开始写入数据 + // 定义全局序号 + int globalIndex = 1; // 从1开始 + + // 定义当前sheet的编号 + int sheetIndex = 1; + + // 最大行数限制 + int maxRowsPerSheet = 65536; // 对于 .xls 文件，最大行数为 65536 + int batchSize = 1000; // 每次批量处理1000行，减少逐行写入的开销 + + // 复制表头到新sheet的逻辑 + ExcelUtils.copyHeader(sheet, style); + + // 批量处理数据 + for (int i = 0; i < records.size(); i += batchSize) { + // 处理一批数据 + int toIndex = Math.min(i + batchSize, records.size()); + List batchList = records.subList(i, toIndex); + + // 批量写入数据 + for (HyDweCVo vo : batchList) { + // 如果当前行数达到最大行数，创建新sheet + if (rowIndex >= maxRowsPerSheet) { + sheetIndex++; + sheet = sheet.getWorkbook().createSheet("日降水表" + sheetIndex); + rowIndex = 2; // 重置行号 + // 复制表头到新sheet + ExcelUtils.copyHeader(sheet, style); + } + + // 创建新行并写入数据 + Row row = ExcelUtils.createRow(sheet, rowIndex); + + // 使用 globalIndex 作为序号 + ExcelUtils.formatCell(row, 0, String.valueOf(globalIndex), style); + ExcelUtils.formatCell(row, 1, vo.getStcd() != null ? vo.getStcd() : "", style); + ExcelUtils.formatCell(row, 2, vo.getStnm() != null ? vo.getStnm() : "", style); + ExcelUtils.formatCell(row, 3, vo.getDt() != null ? DateUtils.parseDateToStr(SystemConstants.TIME_FORMAT,vo.getDt()) : "", style); + ExcelUtils.formatCell(row, 4, vo.getEetp() != null ? vo.getEetp() : "", style); + ExcelUtils.formatCell(row, 5, vo.getWsfe() != null ? vo.getWsfe().toString() : "", style); + ExcelUtils.formatCell(row, 6, vo.getWsfercd() != null ? vo.getWsfercd() : "", style); + // 增加行号和全局序号 + rowIndex++; + globalIndex++; + } + } + return 0; + } + + public void dataModel(Map map, Sheet sheet, CellStyle style) { + // 批量查询数据 + IPage hyDweCVoIPage = this.baseMapper.selectHyDweCDataByPageAndInfo(new Query().getPage(map), map); + List records = hyDweCVoIPage.getRecords(); + // 定义当前sheet的行号 + int rowIndex = 2; + // 定义当前sheet的编号 + int sheetIndex = 1; + Row row; + // 最大行数限制 + int maxRowsPerSheet = 65536; // 对于 .xls 文件，最大行数为 65536 + int batchSize = 1000; // 每次批量处理1000行，减少逐行写入的开销 + // 批量处理数据 + for (int i = 0; i < records.size(); i += batchSize) { + // 处理一批数据 + int toIndex = Math.min(i + batchSize, records.size()); + List batchList = records.subList(i, toIndex); + // 批量写入数据 + for (HyDweCVo vo : batchList) { + // 如果当前行数达到最大行数，创建新sheet + if (rowIndex >= maxRowsPerSheet) { + sheetIndex++; + sheet = sheet.getWorkbook().createSheet("日水面蒸发量表_" + sheetIndex); + rowIndex = 2; // 重置行号 + } + // 创建新行并写入数据 + row = ExcelUtils.createRow(sheet, rowIndex); + //序号 + ExcelUtils.formatCell(row, 0, String.valueOf(rowIndex - 1), style); + ExcelUtils.formatCell(row, 1, vo.getStcd() != null ? vo.getStcd() : "", style); + ExcelUtils.formatCell(row, 2, vo.getStnm() != null ? vo.getStnm() : "", style); + ExcelUtils.formatCell(row, 3, vo.getDt() != null ? DateUtils.parseDateToStr(SystemConstants.TIME_FORMAT,vo.getDt()) : "", style); + ExcelUtils.formatCell(row, 4, vo.getEetp() != null ? vo.getEetp() : "", style); + ExcelUtils.formatCell(row, 5, vo.getWsfe() != null ? vo.getWsfe().toString() : "", style); + ExcelUtils.formatCell(row, 6, vo.getWsfercd() != null ? vo.getWsfercd() : "", style); + rowIndex++; + } + } + } + +} + + + + diff --git a/swlscx/src/main/java/com/ruoyi/swlscx/day/service/impl/HyDwtCServiceImpl.java b/swlscx/src/main/java/com/ruoyi/swlscx/day/service/impl/HyDwtCServiceImpl.java new file mode 100644 index 0000000..13152fd --- /dev/null +++ b/swlscx/src/main/java/com/ruoyi/swlscx/day/service/impl/HyDwtCServiceImpl.java @@ -0,0 +1,311 @@ +package com.ruoyi.swlscx.day.service.impl; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.ruoyi.common.annotation.DataSource; +import com.ruoyi.common.config.RuoYiConfig; +import com.ruoyi.common.core.page.R; +import com.ruoyi.common.core.text.Convert; +import com.ruoyi.common.enums.DataSourceType; +import com.ruoyi.common.utils.DateUtils; +import com.ruoyi.common.utils.SecurityUtils; +import com.ruoyi.swlscx.basic.domain.po.YcExportTask; +import com.ruoyi.swlscx.basic.service.YcExportTaskService; +import com.ruoyi.swlscx.common.PageParams; +import com.ruoyi.swlscx.common.constants.SystemConstants; +import com.ruoyi.swlscx.common.utils.CommonUtils; +import com.ruoyi.swlscx.common.utils.ExcelUtils; +import com.ruoyi.swlscx.common.utils.Query; +import com.ruoyi.swlscx.day.domain.bo.HyDwtCBo; +import com.ruoyi.swlscx.day.domain.po.HyDwtC; +import com.ruoyi.swlscx.day.domain.vo.HyDweCVo; +import com.ruoyi.swlscx.day.domain.vo.HyDwtCVo; +import com.ruoyi.swlscx.day.service.HyDwtCService; +import com.ruoyi.swlscx.day.mapper.HyDwtCMapper; +import org.apache.commons.lang3.ObjectUtils; +import org.apache.poi.ss.usermodel.CellStyle; +import org.apache.poi.ss.usermodel.Row; +import org.apache.poi.ss.usermodel.Sheet; +import org.springframework.beans.BeanUtils; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.context.ApplicationContext; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; +import org.springframework.web.multipart.MultipartFile; + +import javax.annotation.Resource; +import javax.servlet.http.HttpServletResponse; +import java.io.File; +import java.util.Date; +import java.util.List; +import java.util.Map; +import java.util.concurrent.CompletableFuture; +import java.util.concurrent.ThreadPoolExecutor; +import java.util.stream.Collectors; + +/** +* @author 12974 +* @description 针对表【hy_dwt_c(日水温表)】的数据库操作Service实现 +* @createDate 2024-10-17 15:07:12 +*/ +@Service +public class HyDwtCServiceImpl extends ServiceImpl + implements HyDwtCService{ + + @Resource + private ThreadPoolExecutor labelThreadPool; + + @Resource + private YcExportTaskService ycExportTaskService; + + @Autowired + private ApplicationContext context; + + @Resource + private ThreadPoolExecutor importThreadPool; + + /** + * 导入日水温表数据 + */ + @Transactional(rollbackFor = Exception.class) + @Override + public void importHyDwtCData(MultipartFile file) { + try { + List hyDwtCBos = ExcelUtils.readExcel(file.getInputStream(), + HyDwtCBo.class, 2); + List hyDwtCList = hyDwtCBos.stream().map(i -> { + HyDwtC hyDwtC = new HyDwtC(); + BeanUtils.copyProperties(i, hyDwtC); + hyDwtC.setDt(DateUtils.parseDate(i.getDt())); + hyDwtC.setWtmp(Convert.toBigDecimal(i.getWtmp())); + return hyDwtC; + }).collect(Collectors.toList()); + this.saveBatch(hyDwtCList, 10000); + } catch (Exception e) { + e.printStackTrace(); + } + } + + /** + * 查询日水温表数据 + */ + @Override + public IPage selectHyDwtCPageByInfo(PageParams pageParams, String startTime, String endTime, String stnm, String stcd) { + Map map = CommonUtils.getYearAndDayDataMap(pageParams, startTime, endTime, stcd, stnm); + return this.baseMapper.selectHyDwtCPageByInfo(new Query().getPage(map), map); + + } + + /** + * 从mysql导入到sqlserver中 + */ + @Transactional(rollbackFor = Exception.class) + @DataSource(DataSourceType.SHARDING) + public void importMysqlToSqlserver(List hyDwtCVoList) { + List records = hyDwtCVoList.stream().map(i->{ + HyDwtC hyDwtC = new HyDwtC(); + com.ruoyi.common.utils.bean.BeanUtils.copyProperties(i, hyDwtC); + return hyDwtC; + }).collect(Collectors.toList()); + this.saveBatch(records,10000); + } + + + @Override + public R exportDayWaterTemperature(HttpServletResponse response, String startTime, String endTime, String stcd, String stnm) { + Long userId = SecurityUtils.getUserId(); + String tableName = "日水温表"; + return taskAndExport(tableName,startTime, endTime, stcd, stnm, userId); + +// Map dataMap = CommonUtils.getYearAndDayDataMap(new PageParams(0L, 100000L), startTime, endTime, stcd, stnm); +// ExcelUtils.excelExport(response, "dayWaterTemperature.xls", "日水温表", (Sheet sheet, CellStyle style) -> { +// dataModel(dataMap, sheet, style); +// }); + } + + @Override + public R importDateTosoft(String startTime, String endTime) { + Long userId = SecurityUtils.getUserId(); + String filename = "日水温表" + startTime + "-" + endTime+"导入到南方片"; + YcExportTask ycExportTask = new YcExportTask(); + ycExportTask.setFilename(filename); + ycExportTask.setUserId(userId); + ycExportTask.setStartTime(new Date()); + ycExportTask.setStatus(0); + ycExportTaskService.save(ycExportTask); + CompletableFuture.runAsync(() -> { + try { + IPage stationPageByInfo = this.selectHyDwtCPageByInfo(new PageParams(0L, 1000000000L), startTime, endTime, null, null); + HyDwtCServiceImpl hyDwtCService = context.getBean(HyDwtCServiceImpl.class); + hyDwtCService.importMysqlToSqlserver(stationPageByInfo.getRecords()); + ycExportTask.setStatus(2); + ycExportTask.setEndTime(new Date()); + ycExportTaskService.updateById(ycExportTask); + } catch (Exception e) { + log.error(e.getMessage(), e); + ycExportTask.setStatus(4); + ycExportTask.setEndTime(new Date()); + ycExportTaskService.updateById(ycExportTask); + } + }, importThreadPool); + return R.ok("任务已提交"); + } + + private R taskAndExport(String tableName,String startTime, String endTime, String stcd, String stnm, Long userId) { + String startNewTime=""; + String endNewTime=""; + if (ObjectUtils.isNotEmpty(startTime) ){ + startNewTime=startTime.substring(0,10); + } + if (ObjectUtils.isNotEmpty(endTime)){ + endNewTime=endTime.substring(0,10); + } + String filename = tableName + startNewTime + "-" + endNewTime; + // 查询是否已存在相同条件且未完成的任务 + List ongoingTasks = ycExportTaskService.list( + new QueryWrapper() + .eq("user_id", userId) + .eq("filename", filename) + .eq("status", 0) // 状态为0表示任务未完成 + ); + + if (!ongoingTasks.isEmpty()) { + return R.error("当前任务正在下载中，请稍后重试"); + } + + YcExportTask ycExportTask = new YcExportTask(); + String pathPeffix = RuoYiConfig.getExportPath() + + File.separator + userId + File.separator+ + DateUtils.parseDateToStr("yyyy-MM-dd",DateUtils.getNowDate()) + File.separator + + DateUtils.parseDateToStr("HH_mm",DateUtils.getNowDate())+File.separator; + ycExportTask.setFilename(filename); + ycExportTask.setUserId(userId); + ycExportTask.setStartTime(new Date()); + ycExportTask.setStatus(0); + ycExportTask.setFilepath(pathPeffix); + ycExportTaskService.save(ycExportTask); + CompletableFuture.runAsync(() -> { + try { + File dest = new File(pathPeffix); + if (!dest.exists()) { + dest.mkdirs(); + } + String fullPath = pathPeffix + filename; + exportBlackData(fullPath, startTime, endTime, stcd, stnm); + + ycExportTask.setStatus(1); + ycExportTask.setEndTime(new Date()); + ycExportTaskService.updateById(ycExportTask); + } catch (Exception e) { + log.error(e.getMessage(), e); + R.error("任务下载失败"); + } + }, labelThreadPool); + return R.ok("任务已提交，请稍后下载"); + } + + private void exportBlackData(String tableName, String startTime, String endTime, String stcd, String stnm) { + Map rainMap = CommonUtils.getYearAndDayDataMap(new PageParams(0L, 1000000000L), startTime, endTime, stcd, stnm); + ExcelUtils.excelBackExport2("dayWaterTemperature.xls", tableName, (Sheet sheet, CellStyle style) -> + dataModel1(rainMap, sheet, style)); + } + + + public int dataModel1(Map map, Sheet sheet, CellStyle style) { + // 批量查询数据 + IPage hyDweCVoIPage = this.baseMapper.selectHyDwtCPageByInfo(new Query().getPage(map), map); + List records = hyDweCVoIPage.getRecords(); + // 定义当前sheet的行号 + int rowIndex = 2; // 从第二行开始写入数据 + // 定义全局序号 + int globalIndex = 1; // 从1开始 + + // 定义当前sheet的编号 + int sheetIndex = 1; + + // 最大行数限制 + int maxRowsPerSheet = 65536; // 对于 .xls 文件，最大行数为 65536 + int batchSize = 1000; // 每次批量处理1000行，减少逐行写入的开销 + + // 复制表头到新sheet的逻辑 + ExcelUtils.copyHeader(sheet, style); + + // 批量处理数据 + for (int i = 0; i < records.size(); i += batchSize) { + // 处理一批数据 + int toIndex = Math.min(i + batchSize, records.size()); + List batchList = records.subList(i, toIndex); + + // 批量写入数据 + for (HyDwtCVo vo : batchList) { + // 如果当前行数达到最大行数，创建新sheet + if (rowIndex >= maxRowsPerSheet) { + sheetIndex++; + sheet = sheet.getWorkbook().createSheet("日水温表" + sheetIndex); + rowIndex = 2; // 重置行号 + // 复制表头到新sheet + ExcelUtils.copyHeader(sheet, style); + } + + // 创建新行并写入数据 + Row row = ExcelUtils.createRow(sheet, rowIndex); + + // 使用 globalIndex 作为序号 + ExcelUtils.formatCell(row, 0, String.valueOf(globalIndex), style); + ExcelUtils.formatCell(row, 1, vo.getStcd() != null ? vo.getStcd() : "", style); + ExcelUtils.formatCell(row, 2, vo.getStnm() != null ? vo.getStnm() : "", style); + ExcelUtils.formatCell(row, 3, vo.getDt() != null ? DateUtils.parseDateToStr(SystemConstants.TIME_FORMAT,vo.getDt()) : "", style); + ExcelUtils.formatCell(row, 4, vo.getWtmp() != null ? CommonUtils.formatNum(vo.getWtmp()) : "", style); + ExcelUtils.formatCell(row, 5, vo.getWtmprcd() != null ? vo.getWtmprcd() : "", style); + // 增加行号和全局序号 + rowIndex++; + globalIndex++; + } + } + return 0; + } + + public void dataModel(Map map, Sheet sheet, CellStyle style) { + // 批量查询数据 + IPage hyDweCVoIPage = this.baseMapper.selectHyDwtCPageByInfo(new Query().getPage(map), map); + List records = hyDweCVoIPage.getRecords(); + // 定义当前sheet的行号 + int rowIndex = 2; + // 定义当前sheet的编号 + int sheetIndex = 1; + Row row; + // 最大行数限制 + int maxRowsPerSheet = 65536; // 对于 .xls 文件，最大行数为 65536 + int batchSize = 1000; // 每次批量处理1000行，减少逐行写入的开销 + // 批量处理数据 + for (int i = 0; i < records.size(); i += batchSize) { + // 处理一批数据 + int toIndex = Math.min(i + batchSize, records.size()); + List batchList = records.subList(i, toIndex); + // 批量写入数据 + for (HyDwtCVo vo : batchList) { + // 如果当前行数达到最大行数，创建新sheet + if (rowIndex >= maxRowsPerSheet) { + sheetIndex++; + sheet = sheet.getWorkbook().createSheet("日水温表_" + sheetIndex); + rowIndex = 2; // 重置行号 + } + // 创建新行并写入数据 + row = ExcelUtils.createRow(sheet, rowIndex); + //序号 + ExcelUtils.formatCell(row, 0, String.valueOf(rowIndex - 1), style); + ExcelUtils.formatCell(row, 1, vo.getStcd() != null ? vo.getStcd() : "", style); + ExcelUtils.formatCell(row, 2, vo.getStnm() != null ? vo.getStnm() : "", style); + ExcelUtils.formatCell(row, 3, vo.getDt() != null ? DateUtils.parseDateToStr(SystemConstants.TIME_FORMAT,vo.getDt()) : "", style); + ExcelUtils.formatCell(row, 4, vo.getWtmp() != null ? CommonUtils.formatNum(vo.getWtmp()) : "", style); + ExcelUtils.formatCell(row, 5, vo.getWtmprcd() != null ? vo.getWtmprcd() : "", style); + rowIndex++; + } + } + } +} + + + + diff --git a/swlscx/src/main/java/com/ruoyi/swlscx/day/service/impl/HyDzCServiceImpl.java b/swlscx/src/main/java/com/ruoyi/swlscx/day/service/impl/HyDzCServiceImpl.java new file mode 100644 index 0000000..b9540ef --- /dev/null +++ b/swlscx/src/main/java/com/ruoyi/swlscx/day/service/impl/HyDzCServiceImpl.java @@ -0,0 +1,354 @@ +package com.ruoyi.swlscx.day.service.impl; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.ruoyi.common.annotation.DataSource; +import com.ruoyi.common.config.RuoYiConfig; +import com.ruoyi.common.core.page.R; +import com.ruoyi.common.core.text.Convert; +import com.ruoyi.common.enums.DataSourceType; +import com.ruoyi.common.utils.DateUtils; +import com.ruoyi.common.utils.SecurityUtils; +import com.ruoyi.swlscx.basic.domain.po.HyStscA; +import com.ruoyi.swlscx.basic.domain.po.YcExportTask; +import com.ruoyi.swlscx.basic.service.YcExportTaskService; +import com.ruoyi.swlscx.common.PageParams; +import com.ruoyi.swlscx.common.constants.SystemConstants; +import com.ruoyi.swlscx.common.utils.CommonUtils; +import com.ruoyi.swlscx.common.utils.ExcelUtils; +import com.ruoyi.swlscx.common.utils.Query; +import com.ruoyi.swlscx.day.domain.bo.HyDzCBo; +import com.ruoyi.swlscx.day.domain.po.HyDzC; +import com.ruoyi.swlscx.day.domain.vo.HyDpCVo; +import com.ruoyi.swlscx.day.domain.vo.HyDzCVo; +import com.ruoyi.swlscx.day.mapper.HyDzCMapper; +import com.ruoyi.swlscx.day.service.HyDzCService; +import com.ruoyi.swlscx.year.domain.po.HyHmxpF; +import com.ruoyi.swlscx.year.domain.vo.HyHmxpFVo; +import com.ruoyi.swlscx.year.domain.vo.HyYrzFVo; +import com.ruoyi.swlscx.year.service.impl.HyHmxpFServiceImpl; +import org.apache.commons.lang3.ObjectUtils; +import org.apache.poi.ss.usermodel.CellStyle; +import org.apache.poi.ss.usermodel.Row; +import org.apache.poi.ss.usermodel.Sheet; +import org.springframework.beans.BeanUtils; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.context.ApplicationContext; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; +import org.springframework.web.multipart.MultipartFile; + +import javax.annotation.Resource; +import javax.servlet.http.HttpServletResponse; +import java.io.File; +import java.util.Date; +import java.util.List; +import java.util.Map; +import java.util.concurrent.CompletableFuture; +import java.util.concurrent.ThreadPoolExecutor; +import java.util.stream.Collectors; + +/** + * @author 12974 + * @description 针对表【hy_dz_c(日平均水位表)】的数据库操作Service实现 + * @createDate 2024-10-16 16:46:04 + */ +@Service +public class HyDzCServiceImpl extends ServiceImpl + implements HyDzCService { + + @Resource + private ThreadPoolExecutor labelThreadPool; + + @Resource + private YcExportTaskService ycExportTaskService; + + + /** + * 导入日平均水位表数据 + */ + @Override + @Transactional(rollbackFor = Exception.class) + public void importHyDzCData(MultipartFile file) { + try { + List hyDzCBos = ExcelUtils.readExcel(file.getInputStream(), + HyDzCBo.class, 2); + List hyDpCList = hyDzCBos.stream().map(i -> { + HyDzC hyDzC = new HyDzC(); + BeanUtils.copyProperties(i, hyDzC); + hyDzC.setDt(DateUtils.parseDate(i.getDt())); + hyDzC.setAvz(Convert.toBigDecimal(i.getAvz())); + return hyDzC; + }).collect(Collectors.toList()); + //先清空临时表的数据 + this.baseMapper.deleteAll(); + //先插入到临时表中 从临时表中更新过去 + for (int i = 0; i < hyDpCList.size(); i += 1000) { + int end = Math.min(i + 1000, hyDpCList.size()); + List batchList = hyDpCList.subList(i, end); + List collect = batchList.stream().distinct().collect(Collectors.toList()); + this.baseMapper.batchInsert(collect); + } + //重临时表中把数据刷过去 + this.baseMapper.batchInsertOrUpdate(); + + } catch (Exception e) { + e.printStackTrace(); + } + } + + /** + * 分页查询日平均水位表数据 + */ + @Override + public IPage selectHyDzCPageByInfo(PageParams pageParams, String startTime, String endTime, String stnm, String stcd) { + Map map = CommonUtils.getYearAndDayDataMap(pageParams, startTime, endTime, stcd, stnm); + return this.baseMapper.selectHyDzCPageByInfo(new Query().getPage(map), map); + } + + /** + * 导出日平均水位表数据 + */ + @Override + public R exportDayWaterLever(HttpServletResponse response, String startTime, String endTime, String stcd, String stnm) { + + Long userId = SecurityUtils.getUserId(); + String tableName = "日平均水位表"; + return taskAndExport(tableName,startTime, endTime, stcd, stnm, userId); + +// Map dataMap = CommonUtils.getYearAndDayDataMap(new PageParams(0L, 100000L), startTime, endTime, stcd, stnm); +// ExcelUtils.excelExport(response, "dayWaterLever.xls", "日平均水位表", (Sheet sheet, CellStyle style) -> { +// dataModel(dataMap, sheet, style); +// }); + } + + @Resource + private ThreadPoolExecutor importThreadPool; + + @Autowired + private ApplicationContext context; + + /** + * 从mysql导入到sqlserver中 + */ + @Transactional(rollbackFor = Exception.class) + @DataSource(DataSourceType.SHARDING) + public void importMysqlToSqlserver(List hyDzCVoList) { + List records = hyDzCVoList.stream().map(i->{ + HyDzC hyDzC = new HyDzC(); + BeanUtils.copyProperties(i, hyDzC); + hyDzC.setDt(i.getDt()); + hyDzC.setAvz(Convert.toBigDecimal(i.getAvz())); + return hyDzC; + }).collect(Collectors.toList()); + //先清空临时表的数据 + this.baseMapper.deleteAll(); + //插入临时表数据 + int batchSize = 50; + for (int i = 0; i < records.size(); i += batchSize) { + int end = Math.min(i + batchSize, records.size()); + List batch = records.subList(i, end); + // 执行批量插入 + this.baseMapper.batchInsert(batch); + } + //从临时表增或修改主表 + this.baseMapper.mergeToData(); + } + + @Override + public R importDateTosoft(String startTime, String endTime) { + Long userId = SecurityUtils.getUserId(); + String filename = "日平均水位表" + startTime + "-" + endTime+"导入到南方片"; + // 查询是否已存在相同条件且未完成的任务 + List ongoingTasks = ycExportTaskService.list( + new QueryWrapper() + .eq("user_id", userId) + .eq("status", 0) // 状态为0表示任务未完成 + .like("filename", "日平均水位表")); + if (!ongoingTasks.isEmpty()) { + return R.error("当前任务正在下载中，请稍后重试"); + } + YcExportTask ycExportTask = new YcExportTask(); + ycExportTask.setFilename(filename); + ycExportTask.setUserId(userId); + ycExportTask.setStartTime(new Date()); + ycExportTask.setStatus(0); + ycExportTaskService.save(ycExportTask); + CompletableFuture.runAsync(() -> { + try { + IPage pageByInfo = this.selectHyDzCPageByInfo(new PageParams(0L, 100L), startTime, endTime, null, null); +// IPage pageByInfo = this.selectMaxHRainListPageByInfo(new PageParams(0L, 1000000000L), null, null, startTime, endTime); + HyDzCServiceImpl hyDzCService = context.getBean(HyDzCServiceImpl.class); + hyDzCService.importMysqlToSqlserver(pageByInfo.getRecords()); + ycExportTask.setStatus(2); + } catch (Exception e) { + ycExportTask.setStatus(4); + log.error(e.getMessage()); + R.error("任务下载失败"); + }finally { + ycExportTask.setEndTime(new Date()); + ycExportTaskService.updateById(ycExportTask); + } + }, importThreadPool); + return R.ok("任务已提交"); + } + + private R taskAndExport(String tableName,String startTime, String endTime, String stcd, String stnm, Long userId) { + String startNewTime=""; + String endNewTime=""; + if (ObjectUtils.isNotEmpty(startTime) ){ + startNewTime=startTime.substring(0,10); + } + if (ObjectUtils.isNotEmpty(endTime)){ + endNewTime=endTime.substring(0,10); + } + String filename = tableName + startNewTime + "-" + endNewTime; + // 查询是否已存在相同条件且未完成的任务 + List ongoingTasks = ycExportTaskService.list( + new QueryWrapper() + .eq("user_id", userId) + .eq("filename", filename) + .eq("status", 0) // 状态为0表示任务未完成 + ); + + if (!ongoingTasks.isEmpty()) { + return R.error("当前任务正在下载中，请稍后重试"); + } + + YcExportTask ycExportTask = new YcExportTask(); + String pathPeffix = RuoYiConfig.getExportPath() + + File.separator + userId + File.separator+ + DateUtils.parseDateToStr("yyyy-MM-dd",DateUtils.getNowDate()) + File.separator + + DateUtils.parseDateToStr("HH_mm",DateUtils.getNowDate())+File.separator; + ycExportTask.setFilename(filename); + ycExportTask.setUserId(userId); + ycExportTask.setStartTime(new Date()); + ycExportTask.setStatus(0); + ycExportTask.setFilepath(pathPeffix); + ycExportTaskService.save(ycExportTask); + CompletableFuture.runAsync(() -> { + try { + File dest = new File(pathPeffix); + if (!dest.exists()) { + dest.mkdirs(); + } + String fullPath = pathPeffix + filename; + exportBlackData(fullPath, startTime, endTime, stcd, stnm); + + ycExportTask.setStatus(1); + ycExportTask.setEndTime(new Date()); + ycExportTaskService.updateById(ycExportTask); + } catch (Exception e) { + log.error(e.getMessage(), e); + R.error("任务下载失败"); + } + }, labelThreadPool); + return R.ok("任务已提交，请稍后下载"); + } + + private void exportBlackData(String tableName, String startTime, String endTime, String stcd, String stnm) { + Map rainMap = CommonUtils.getYearAndDayDataMap(new PageParams(0L, 1000000000L), startTime, endTime, stcd, stnm); + ExcelUtils.excelBackExport2("dayWaterLever.xls", tableName, (Sheet sheet, CellStyle style) -> + dataModel1(rainMap, sheet, style)); + } + + public int dataModel1(Map map, Sheet sheet, CellStyle style) { + // 批量查询数据 + IPage hyDzCVoIPage = this.baseMapper.selectHyDzCPageByInfo(new Query().getPage(map), map); + List records = hyDzCVoIPage.getRecords(); + // 定义当前sheet的行号 + int rowIndex = 2; // 从第二行开始写入数据 + // 定义全局序号 + int globalIndex = 1; // 从1开始 + + // 定义当前sheet的编号 + int sheetIndex = 1; + + // 最大行数限制 + int maxRowsPerSheet = 65536; // 对于 .xls 文件，最大行数为 65536 + int batchSize = 1000; // 每次批量处理1000行，减少逐行写入的开销 + + // 复制表头到新sheet的逻辑 + ExcelUtils.copyHeader(sheet, style); + + // 批量处理数据 + for (int i = 0; i < records.size(); i += batchSize) { + // 处理一批数据 + int toIndex = Math.min(i + batchSize, records.size()); + List batchList = records.subList(i, toIndex); + + // 批量写入数据 + for (HyDzCVo vo : batchList) { + // 如果当前行数达到最大行数，创建新sheet + if (rowIndex >= maxRowsPerSheet) { + sheetIndex++; + sheet = sheet.getWorkbook().createSheet("日平均水位表" + sheetIndex); + rowIndex = 2; // 重置行号 + // 复制表头到新sheet + ExcelUtils.copyHeader(sheet, style); + } + + // 创建新行并写入数据 + Row row = ExcelUtils.createRow(sheet, rowIndex); + + // 使用 globalIndex 作为序号 + ExcelUtils.formatCell(row, 0, String.valueOf(globalIndex), style); + ExcelUtils.formatCell(row, 1, vo.getStcd() != null ? vo.getStcd() : "", style); + ExcelUtils.formatCell(row, 2, vo.getStnm() != null ? vo.getStnm() : "", style); + ExcelUtils.formatCell(row, 3, vo.getDt() != null ? DateUtils.parseDateToStr(SystemConstants.TIME_FORMAT,vo.getDt()) : "", style); + ExcelUtils.formatCell(row, 4, vo.getAvz() != null ? vo.getAvz().toString() : "", style); + ExcelUtils.formatCell(row, 5, vo.getAvzrcd() != null ? vo.getAvzrcd() : "", style); + // 增加行号和全局序号 + rowIndex++; + globalIndex++; + } + } + return 0; + } + + public void dataModel(Map map, Sheet sheet, CellStyle style) { + // 批量查询数据 + IPage hyDzCVoIPage = this.baseMapper.selectHyDzCPageByInfo(new Query().getPage(map), map); + List records = hyDzCVoIPage.getRecords(); + // 定义当前sheet的行号 + int rowIndex = 2; + // 定义当前sheet的编号 + int sheetIndex = 1; + Row row; + // 最大行数限制 + int maxRowsPerSheet = 65536; // 对于 .xls 文件，最大行数为 65536 + int batchSize = 1000; // 每次批量处理1000行，减少逐行写入的开销 + // 批量处理数据 + for (int i = 0; i < records.size(); i += batchSize) { + // 处理一批数据 + int toIndex = Math.min(i + batchSize, records.size()); + List batchList = records.subList(i, toIndex); + // 批量写入数据 + for (HyDzCVo vo : batchList) { + // 如果当前行数达到最大行数，创建新sheet + if (rowIndex >= maxRowsPerSheet) { + sheetIndex++; + sheet = sheet.getWorkbook().createSheet("日平均水位表_" + sheetIndex); + rowIndex = 2; // 重置行号 + } + // 创建新行并写入数据 + row = ExcelUtils.createRow(sheet, rowIndex); + //序号 + ExcelUtils.formatCell(row, 0, String.valueOf(rowIndex - 1), style); + ExcelUtils.formatCell(row, 1, vo.getStcd() != null ? vo.getStcd() : "", style); + ExcelUtils.formatCell(row, 2, vo.getStnm() != null ? vo.getStnm() : "", style); + ExcelUtils.formatCell(row, 3, vo.getDt() != null ? DateUtils.parseDateToStr(SystemConstants.TIME_FORMAT,vo.getDt()) : "", style); + ExcelUtils.formatCell(row, 4, vo.getAvz() != null ? vo.getAvz().toString() : "", style); + ExcelUtils.formatCell(row, 5, vo.getAvzrcd() != null ? vo.getAvzrcd() : "", style); + rowIndex++; + } + } + } + + +} + + + + diff --git a/swlscx/src/main/java/com/ruoyi/swlscx/excerpt/controller/ExcerptExportController.java b/swlscx/src/main/java/com/ruoyi/swlscx/excerpt/controller/ExcerptExportController.java new file mode 100644 index 0000000..bbcaed7 --- /dev/null +++ b/swlscx/src/main/java/com/ruoyi/swlscx/excerpt/controller/ExcerptExportController.java @@ -0,0 +1,96 @@ +package com.ruoyi.swlscx.excerpt.controller; + +import com.ruoyi.common.core.page.R; +import com.ruoyi.swlscx.excerpt.service.*; +import lombok.RequiredArgsConstructor; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestParam; +import org.springframework.web.bind.annotation.RestController; + +import javax.servlet.http.HttpServletResponse; + +/** + * @Author al + * @Date 2024/10/18 9:19 + * @Description: TODO + * @Version + */ +@RequestMapping("/report") +@RequiredArgsConstructor +@RestController +public class ExcerptExportController { + + private final HyFdheexBService hyFdheexBService; + + private final HyPrexBService hyPrexBService; + + private final HyRvfhexBService hyRvfhexBService; + + private final HyWsfhexBService hyWsfhexBService; + + private final HyHltdzBService hyHltdzBService; + + /** + * 导出洪水水文要素摘录表 + */ + @PostMapping("/floodExcerpt") + public R exportFloodExcerpt(HttpServletResponse response, + @RequestParam String startTime, + @RequestParam String endTime, + @RequestParam String stcd, + @RequestParam String stnm) { + return hyFdheexBService.exportFloodExcerpt(response, startTime, endTime, stnm, stcd); + } + + + /** + * 导出降雨量摘录表 + */ + @PostMapping("/rainExcerpt") + public R exportRainExcerpt(HttpServletResponse response, + @RequestParam String startTime, + @RequestParam String endTime, + @RequestParam String stcd, + @RequestParam String stnm) { + return hyPrexBService.exportRainExcerpt(response, startTime, endTime, stnm, stcd); + } + + /** + * 导出水库洪水水文要素摘录表 + */ + @PostMapping("/rsverFloodExcerpt") + public R exportRsverFloodExcerpt(HttpServletResponse response, + @RequestParam String startTime, + @RequestParam String endTime, + @RequestParam String stcd, + @RequestParam String stnm) { + return hyRvfhexBService.exportRsverFloodExcerpt(response, startTime, endTime, stnm, stcd); + } + + /** + * 导出水闸洪水水文要素摘录表 + */ + @PostMapping("/szFloodExcerpt") + public R exportSzFloodExcerpt(HttpServletResponse response, + @RequestParam String startTime, + @RequestParam String endTime, + @RequestParam String stcd, + @RequestParam String stnm) { + return hyWsfhexBService.exportSzFloodExcerpt(response, startTime, endTime, stnm, stcd); + } + + + /** + * 导出逐潮高低潮位表 + */ + @PostMapping("/followingTheTideExcerpt") + public R exportFollowingTheTideExcerpt(HttpServletResponse response, + @RequestParam String startTime, + @RequestParam String endTime, + @RequestParam String stcd, + @RequestParam String stnm) { + return hyHltdzBService.exportFollowingTheTideExcerpt(response, startTime, endTime, stnm, stcd); + } + +} diff --git a/swlscx/src/main/java/com/ruoyi/swlscx/excerpt/controller/ExcerptImportController.java b/swlscx/src/main/java/com/ruoyi/swlscx/excerpt/controller/ExcerptImportController.java new file mode 100644 index 0000000..583fb45 --- /dev/null +++ b/swlscx/src/main/java/com/ruoyi/swlscx/excerpt/controller/ExcerptImportController.java @@ -0,0 +1,79 @@ +package com.ruoyi.swlscx.excerpt.controller; + +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.ruoyi.common.core.page.R; +import com.ruoyi.swlscx.common.PageParams; +import com.ruoyi.swlscx.excerpt.domain.vo.HyFdheexBVo; +import com.ruoyi.swlscx.excerpt.domain.vo.HyHltdzBVo; +import com.ruoyi.swlscx.excerpt.domain.vo.HyRvfhexBVo; +import com.ruoyi.swlscx.excerpt.domain.vo.HyWsfhexBVo; +import com.ruoyi.swlscx.excerpt.service.*; +import lombok.RequiredArgsConstructor; +import org.springframework.web.bind.annotation.*; + +import javax.servlet.http.HttpServletResponse; + +/** + * @Author al + * @Date 2024/10/18 9:19 + * @Description: TODO + * @Version + */ +@RequestMapping("/excerpt") +@RequiredArgsConstructor +@RestController +public class ExcerptImportController { + + private final HyFdheexBService hyFdheexBService; + + private final HyPrexBService hyPrexBService; + + private final HyRvfhexBService hyRvfhexBService; + + private final HyWsfhexBService hyWsfhexBService; + + private final HyHltdzBService hyHltdzBService; + + + /** + *导入洪水水文要素摘录表 + */ + @PostMapping("/importFloodExcerpt") + public R importFloodExcerpt(String startTime, String endTime){ + return hyFdheexBService.importDateTosoft(startTime, endTime); + } + + /** + *导入降雨量摘录表 + */ + @PostMapping("/importRainExcerpt") + public R importRainExcerpt(String startTime, String endTime){ + return hyPrexBService.importDateTosoft(startTime, endTime); + } + + + + /** + *导入水库洪水水文要素摘录表 + */ + @PostMapping("/importRsverFloodExcerpt") + public R importRsverFloodExcerpt(String startTime, String endTime){ + return hyRvfhexBService.importDateTosoft(startTime, endTime); + } + + /** + *导入水闸洪水水文要素摘录表 + */ + @PostMapping("/importSzFloodExcerpt") + public R importSzFloodExcerpt(String startTime, String endTime){ + return hyWsfhexBService.importDateTosoft(startTime, endTime); + } + + /** + *查询逐潮高低潮位表 + */ + @PostMapping("/importFollowingTheTideExcerpt") + public R importFollowingTheTideExcerpt(String startTime, String endTime){ + return hyHltdzBService.importDateTosoft(startTime, endTime); + } +} diff --git a/swlscx/src/main/java/com/ruoyi/swlscx/excerpt/controller/ExcerptTableController.java b/swlscx/src/main/java/com/ruoyi/swlscx/excerpt/controller/ExcerptTableController.java new file mode 100644 index 0000000..67bb6b3 --- /dev/null +++ b/swlscx/src/main/java/com/ruoyi/swlscx/excerpt/controller/ExcerptTableController.java @@ -0,0 +1,111 @@ +package com.ruoyi.swlscx.excerpt.controller; + +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.ruoyi.common.core.page.R; +import com.ruoyi.swlscx.common.PageParams; +import com.ruoyi.swlscx.excerpt.domain.vo.*; +import com.ruoyi.swlscx.excerpt.service.*; +import lombok.RequiredArgsConstructor; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestParam; +import org.springframework.web.bind.annotation.RestController; + +/** + * @Author al + * @Date 2024/10/18 9:19 + * @Description: TODO + * @Version + */ +@RequestMapping("/excerpt") +@RequiredArgsConstructor +@RestController +public class ExcerptTableController { + + private final HyFdheexBService hyFdheexBService; + + private final HyPrexBService hyPrexBService; + + private final HyRvfhexBService hyRvfhexBService; + + private final HyWsfhexBService hyWsfhexBService; + + private final HyHltdzBService hyHltdzBService; + + /** + *查询洪水水文要素摘录表 + */ + @GetMapping("/getFloodExcerpt") + public R getFloodExcerpt(@RequestParam("pageNum") Integer pageNum, + @RequestParam("pageSize") Integer pageSize, + @RequestParam("startTime") String startTime, + @RequestParam("endTime") String endTime, + @RequestParam("stcd") String stcd, + @RequestParam("stnm") String stnm){ + PageParams pageParams = new PageParams(pageNum.longValue(), pageSize.longValue()); + IPage hyFdheexBVoIPage = hyFdheexBService.selectHyFdheexBPageByInfo(pageParams, startTime, endTime, stnm, stcd); + return R.ok().put("data", hyFdheexBVoIPage.getRecords()).put("count", hyFdheexBVoIPage.getTotal()); + } + + /** + *查询降雨量摘录表 + */ + @GetMapping("/getRainExcerpt") + public R getRainExcerpt(@RequestParam("pageNum") Integer pageNum, + @RequestParam("pageSize") Integer pageSize, + @RequestParam("startTime") String startTime, + @RequestParam("endTime") String endTime, + @RequestParam("stcd") String stcd, + @RequestParam("stnm") String stnm){ + PageParams pageParams = new PageParams(pageNum.longValue(), pageSize.longValue()); + IPage hyPrexBVoIPage = hyPrexBService.selectHyPrexBPageByInfo(pageParams, startTime, endTime, stnm, stcd); + return R.ok().put("data", hyPrexBVoIPage.getRecords()).put("count", hyPrexBVoIPage.getTotal()); + } + + /** + *查询水库洪水水文要素摘录表 + */ + @GetMapping("/getRsverFloodExcerpt") + public R getRsverFloodExcerpt(@RequestParam("pageNum") Integer pageNum, + @RequestParam("pageSize") Integer pageSize, + @RequestParam("startTime") String startTime, + @RequestParam("endTime") String endTime, + @RequestParam("stcd") String stcd, + @RequestParam("stnm") String stnm){ + PageParams pageParams = new PageParams(pageNum.longValue(), pageSize.longValue()); + IPage hyRvfhexBVoIPage = hyRvfhexBService.selectHyRvfhexBPageByInfo(pageParams, startTime, endTime, stnm, stcd); + return R.ok().put("data", hyRvfhexBVoIPage.getRecords()).put("count", hyRvfhexBVoIPage.getTotal()); + } + + /** + *查询水闸洪水水文要素摘录表 + */ + @GetMapping("/getSzFloodExcerpt") + public R getSzFloodExcerpt(@RequestParam("pageNum") Integer pageNum, + @RequestParam("pageSize") Integer pageSize, + @RequestParam("startTime") String startTime, + @RequestParam("endTime") String endTime, + @RequestParam("stcd") String stcd, + @RequestParam("stnm") String stnm){ + PageParams pageParams = new PageParams(pageNum.longValue(), pageSize.longValue()); + IPage hyWsfhexBVoIPage = hyWsfhexBService.selectHyWsfhexBPageByInfo(pageParams, startTime, endTime, stnm, stcd); + return R.ok().put("data", hyWsfhexBVoIPage.getRecords()).put("count", hyWsfhexBVoIPage.getTotal()); + } + + /** + *查询逐潮高低潮位表 + */ + @GetMapping("/getFollowingTheTideExcerpt") + public R getFollowingTheTideExcerpt(@RequestParam("pageNum") Integer pageNum, + @RequestParam("pageSize") Integer pageSize, + @RequestParam("startTime") String startTime, + @RequestParam("endTime") String endTime, + @RequestParam("stcd") String stcd, + @RequestParam("stnm") String stnm){ + PageParams pageParams = new PageParams(pageNum.longValue(), pageSize.longValue()); + IPage hyHltdzBVoIPage = hyHltdzBService.selectHyHltdzBPageByInfo(pageParams, startTime, endTime, stnm, stcd); + return R.ok().put("data", hyHltdzBVoIPage.getRecords()).put("count", hyHltdzBVoIPage.getTotal()); + } + + +} diff --git a/swlscx/src/main/java/com/ruoyi/swlscx/excerpt/domain/bo/HyFdheexBBo.java b/swlscx/src/main/java/com/ruoyi/swlscx/excerpt/domain/bo/HyFdheexBBo.java new file mode 100644 index 0000000..85ce4a9 --- /dev/null +++ b/swlscx/src/main/java/com/ruoyi/swlscx/excerpt/domain/bo/HyFdheexBBo.java @@ -0,0 +1,52 @@ +package com.ruoyi.swlscx.excerpt.domain.bo; + +import com.alibaba.excel.annotation.ExcelProperty; +import lombok.Data; + +import java.io.Serializable; + +/** + * 洪水水文要素摘录表 + * + * @TableName hy_fdheex_b + */ +@Data +public class HyFdheexBBo implements Serializable { + /** + * 站码 + */ + @ExcelProperty(value = "站码", index = 1) + private String stcd; + + /** + * 时间 + */ + @ExcelProperty(value = "时间", index = 3) + private String tm; + + /** + * 水位 + */ + @ExcelProperty(value = "水位", index = 4) + private String z; + + /** + * 水位注解码 + */ + @ExcelProperty(value = "水位注解码", index = 5) + private String zrcd; + + /** + * 流量 + */ + @ExcelProperty(value = "流量", index = 6) + private String q; + + /** + * 含沙量 + */ + @ExcelProperty(value = "含沙量", index = 7) + private String s; + + private static final long serialVersionUID = 1L; +} \ No newline at end of file diff --git a/swlscx/src/main/java/com/ruoyi/swlscx/excerpt/domain/bo/HyHltdzBBo.java b/swlscx/src/main/java/com/ruoyi/swlscx/excerpt/domain/bo/HyHltdzBBo.java new file mode 100644 index 0000000..9cab5c6 --- /dev/null +++ b/swlscx/src/main/java/com/ruoyi/swlscx/excerpt/domain/bo/HyHltdzBBo.java @@ -0,0 +1,64 @@ +package com.ruoyi.swlscx.excerpt.domain.bo; + +import com.alibaba.excel.annotation.ExcelProperty; +import lombok.Data; + +import java.io.Serializable; + +/** + * 逐潮高低潮位表 + * + * @TableName hy_hltdz_b + */ +@Data +public class HyHltdzBBo implements Serializable { + /** + * 站码 + */ + @ExcelProperty(value = "站码", index = 1) + private String stcd; + + /** + * 时间 + */ + @ExcelProperty(value = "时间", index = 3) + private String tm; + + /** + * 潮别 + */ + @ExcelProperty(value = "潮别", index = 4) + private String tdtp; + + /** + * 潮位 + */ + @ExcelProperty(value = "潮位", index = 5) + private String tdz; + + /** + * 潮位注解码 + */ + @ExcelProperty(value = "潮位注解码", index = 6) + private String tdzrcd; + + /** + * 潮差 + */ + @ExcelProperty(value = "潮差", index = 7) + private String tdrng; + + /** + * 历时 + */ + @ExcelProperty(value = "历时", index = 8) + private String dr; + + /** + * 备注 + */ + @ExcelProperty(value = "备注", index = 9) + private String nt; + + private static final long serialVersionUID = 1L; +} \ No newline at end of file diff --git a/swlscx/src/main/java/com/ruoyi/swlscx/excerpt/domain/bo/HyPrexBBo.java b/swlscx/src/main/java/com/ruoyi/swlscx/excerpt/domain/bo/HyPrexBBo.java new file mode 100644 index 0000000..3bd1288 --- /dev/null +++ b/swlscx/src/main/java/com/ruoyi/swlscx/excerpt/domain/bo/HyPrexBBo.java @@ -0,0 +1,46 @@ +package com.ruoyi.swlscx.excerpt.domain.bo; + +import com.alibaba.excel.annotation.ExcelProperty; +import lombok.Data; + +import java.io.Serializable; + +/** + * 降水量摘录表 + * + * @TableName hy_prex_b + */ +@Data +public class HyPrexBBo implements Serializable { + /** + * 站码 + */ + @ExcelProperty(value = "站码", index = 1) + private String stcd; + + /** + * 起时间 + */ + @ExcelProperty(value = "起时间", index = 3) + private String bgtm; + + /** + * 止时间 + */ + @ExcelProperty(value = "止时间", index = 4) + private String endtm; + + /** + * 降水量(毫米) + */ + @ExcelProperty(value = "降水量", index = 5) + private String p; + + /** + * 降水量注解码 + */ + @ExcelProperty(value = "降水量注解码", index = 6) + private String prcd; + + private static final long serialVersionUID = 1L; +} \ No newline at end of file diff --git a/swlscx/src/main/java/com/ruoyi/swlscx/excerpt/domain/bo/HyRvfhexBBo.java b/swlscx/src/main/java/com/ruoyi/swlscx/excerpt/domain/bo/HyRvfhexBBo.java new file mode 100644 index 0000000..05298d6 --- /dev/null +++ b/swlscx/src/main/java/com/ruoyi/swlscx/excerpt/domain/bo/HyRvfhexBBo.java @@ -0,0 +1,64 @@ +package com.ruoyi.swlscx.excerpt.domain.bo; + +import com.alibaba.excel.annotation.ExcelProperty; +import lombok.Data; + +import java.io.Serializable; + +/** + * 水库洪水水文要素摘录表 + * + * @TableName hy_rvfhex_b + */ +@Data +public class HyRvfhexBBo implements Serializable { + /** + * 站码 + */ + @ExcelProperty(value = "站码", index = 1) + private String stcd; + + /** + * 时间 + */ + @ExcelProperty(value = "时间", index = 3) + private String tm; + + /** + * 坝上水位 + */ + @ExcelProperty(value = "坝上水位", index = 4) + private String dambhdz; + + /** + * 坝上水位注解码 + */ + @ExcelProperty(value = "坝上水位注解码", index = 5) + private String dambhdzrcd; + + /** + * 流量 + */ + @ExcelProperty(value = "流量", index = 6) + private String q; + + /** + * 含沙量 + */ + @ExcelProperty(value = "含沙量", index = 7) + private String s; + + /** + * 蓄水量 + */ + @ExcelProperty(value = "蓄水量", index = 8) + private String w; + + /** + * 备注 + */ + @ExcelProperty(value = "备注", index = 9) + private String nt; + + private static final long serialVersionUID = 1L; +} \ No newline at end of file diff --git a/swlscx/src/main/java/com/ruoyi/swlscx/excerpt/domain/bo/HyWsfhexBBo.java b/swlscx/src/main/java/com/ruoyi/swlscx/excerpt/domain/bo/HyWsfhexBBo.java new file mode 100644 index 0000000..3dc08cc --- /dev/null +++ b/swlscx/src/main/java/com/ruoyi/swlscx/excerpt/domain/bo/HyWsfhexBBo.java @@ -0,0 +1,67 @@ +package com.ruoyi.swlscx.excerpt.domain.bo; + +import com.alibaba.excel.annotation.ExcelProperty; +import com.baomidou.mybatisplus.annotation.TableField; +import lombok.Data; + +import java.io.Serializable; +import java.math.BigDecimal; +import java.util.Date; + +/** + * 水闸洪水水文要素摘录表 + * + * @TableName hy_wsfhex_b + */ +@Data +public class HyWsfhexBBo implements Serializable { + /** + * 站码 + */ + @ExcelProperty(value = "站码", index = 1) + private String stcd; + + /** + * 时间 + */ + @ExcelProperty(value = "时间", index = 3) + private String tm; + + /** + * 闸上水位 + */ + @ExcelProperty(value = "闸上水位", index = 4) + private String upz; + + /** + * 闸上水位注解码 + */ + @ExcelProperty(value = "闸上水位注解码", index = 5) + private String upzrcd; + + /** + * 闸下水位 + */ + @ExcelProperty(value = "闸下水位", index = 6) + private String dwz; + + /** + * 闸下水位注解码 + */ + @ExcelProperty(value = "闸下水位注解码", index = 7) + private String dwzrcd; + + /** + * 流量 + */ + @ExcelProperty(value = "流量", index = 8) + private String q; + + /** + * 含沙量 + */ + @ExcelProperty(value = "含沙量", index = 9) + private String s; + + private static final long serialVersionUID = 1L; +} \ No newline at end of file diff --git a/swlscx/src/main/java/com/ruoyi/swlscx/excerpt/domain/po/HyFdheexB.java b/swlscx/src/main/java/com/ruoyi/swlscx/excerpt/domain/po/HyFdheexB.java new file mode 100644 index 0000000..0ad77fa --- /dev/null +++ b/swlscx/src/main/java/com/ruoyi/swlscx/excerpt/domain/po/HyFdheexB.java @@ -0,0 +1,52 @@ +package com.ruoyi.swlscx.excerpt.domain.po; + +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 java.io.Serializable; +import java.math.BigDecimal; +import java.util.Date; +import lombok.Data; + +/** + * 洪水水文要素摘录表 + * @TableName hy_fdheex_b + */ +@TableName(value ="hy_fdheex_b") +@Data +public class HyFdheexB implements Serializable { + /** + * 站码 + */ + private String stcd; + + /** + * 时间 + */ + private Date tm; + + /** + * 水位 + */ + private BigDecimal z; + + /** + * 水位注解码 + + */ + private String zrcd; + + /** + * 流量 + */ + private BigDecimal q; + + /** + * 含沙量 + */ + private BigDecimal s; + + @TableField(exist = false) + private static final long serialVersionUID = 1L; +} \ No newline at end of file diff --git a/swlscx/src/main/java/com/ruoyi/swlscx/excerpt/domain/po/HyHltdzB.java b/swlscx/src/main/java/com/ruoyi/swlscx/excerpt/domain/po/HyHltdzB.java new file mode 100644 index 0000000..51ac30c --- /dev/null +++ b/swlscx/src/main/java/com/ruoyi/swlscx/excerpt/domain/po/HyHltdzB.java @@ -0,0 +1,61 @@ +package com.ruoyi.swlscx.excerpt.domain.po; + +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 java.io.Serializable; +import java.math.BigDecimal; +import java.util.Date; +import lombok.Data; + +/** + * 逐潮高低潮位表 + * @TableName hy_hltdz_b + */ +@TableName(value ="hy_hltdz_b") +@Data +public class HyHltdzB implements Serializable { + /** + * 站码 + */ + private String stcd; + + /** + * 时间 + */ + private Date tm; + + /** + * 潮别 + */ + private String tdtp; + + /** + * 潮位 + */ + private BigDecimal tdz; + + /** + * 潮位注解码 + */ + private String tdzrcd; + + /** + * 潮差 + */ + private BigDecimal tdrng; + + /** + * 历时 + */ + private String dr; + + /** + * 备注 + */ + private String nt; + + @TableField(exist = false) + private static final long serialVersionUID = 1L; +} \ No newline at end of file diff --git a/swlscx/src/main/java/com/ruoyi/swlscx/excerpt/domain/po/HyPrexB.java b/swlscx/src/main/java/com/ruoyi/swlscx/excerpt/domain/po/HyPrexB.java new file mode 100644 index 0000000..3600e9b --- /dev/null +++ b/swlscx/src/main/java/com/ruoyi/swlscx/excerpt/domain/po/HyPrexB.java @@ -0,0 +1,48 @@ +package com.ruoyi.swlscx.excerpt.domain.po; + +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 java.io.Serializable; +import java.math.BigDecimal; +import java.util.Date; +import lombok.Data; +import lombok.EqualsAndHashCode; + +/** + * 降水量摘录表 + * @TableName hy_prex_b + */ +@TableName(value ="hy_prex_b") +@Data +@EqualsAndHashCode +public class HyPrexB implements Serializable { + /** + * 站码 + */ + private String stcd; + + /** + * 起时间 + */ + private Date bgtm; + + /** + * 止时间 + */ + private Date endtm; + + /** + * 降水量(毫米) + */ + private BigDecimal p; + + /** + * 降水量注解码 + */ + private String prcd; + + @TableField(exist = false) + private static final long serialVersionUID = 1L; +} \ No newline at end of file diff --git a/swlscx/src/main/java/com/ruoyi/swlscx/excerpt/domain/po/HyRvfhexB.java b/swlscx/src/main/java/com/ruoyi/swlscx/excerpt/domain/po/HyRvfhexB.java new file mode 100644 index 0000000..d663907 --- /dev/null +++ b/swlscx/src/main/java/com/ruoyi/swlscx/excerpt/domain/po/HyRvfhexB.java @@ -0,0 +1,61 @@ +package com.ruoyi.swlscx.excerpt.domain.po; + +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 java.io.Serializable; +import java.math.BigDecimal; +import java.util.Date; +import lombok.Data; + +/** + * 水库洪水水文要素摘录表 + * @TableName hy_rvfhex_b + */ +@TableName(value ="hy_rvfhex_b") +@Data +public class HyRvfhexB implements Serializable { + /** + * 站码 + */ + private String stcd; + + /** + * 时间 + */ + private Date tm; + + /** + * 坝上水位 + */ + private BigDecimal dambhdz; + + /** + * 坝上水位注解码 + */ + private String dambhdzrcd; + + /** + * 流量 + */ + private BigDecimal q; + + /** + * 含沙量 + */ + private BigDecimal s; + + /** + * 蓄水量 + */ + private BigDecimal w; + + /** + * 备注 + */ + private String nt; + + @TableField(exist = false) + private static final long serialVersionUID = 1L; +} \ No newline at end of file diff --git a/swlscx/src/main/java/com/ruoyi/swlscx/excerpt/domain/po/HyWsfhexB.java b/swlscx/src/main/java/com/ruoyi/swlscx/excerpt/domain/po/HyWsfhexB.java new file mode 100644 index 0000000..84a14cd --- /dev/null +++ b/swlscx/src/main/java/com/ruoyi/swlscx/excerpt/domain/po/HyWsfhexB.java @@ -0,0 +1,61 @@ +package com.ruoyi.swlscx.excerpt.domain.po; + +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 java.io.Serializable; +import java.math.BigDecimal; +import java.util.Date; +import lombok.Data; + +/** + * 水闸洪水水文要素摘录表 + * @TableName hy_wsfhex_b + */ +@TableName(value ="hy_wsfhex_b") +@Data +public class HyWsfhexB implements Serializable { + /** + * 站码 + */ + private String stcd; + + /** + * 时间 + */ + private Date tm; + + /** + * 闸上水位 + */ + private BigDecimal upz; + + /** + * 闸上水位注解码 + */ + private String upzrcd; + + /** + * 闸下水位 + */ + private BigDecimal dwz; + + /** + * 闸下水位注解码 + */ + private String dwzrcd; + + /** + * 流量 + */ + private BigDecimal q; + + /** + * 含沙量 + */ + private BigDecimal s; + + @TableField(exist = false) + private static final long serialVersionUID = 1L; +} \ No newline at end of file diff --git a/swlscx/src/main/java/com/ruoyi/swlscx/excerpt/domain/vo/HyFdheexBVo.java b/swlscx/src/main/java/com/ruoyi/swlscx/excerpt/domain/vo/HyFdheexBVo.java new file mode 100644 index 0000000..62a4466 --- /dev/null +++ b/swlscx/src/main/java/com/ruoyi/swlscx/excerpt/domain/vo/HyFdheexBVo.java @@ -0,0 +1,57 @@ + +package com.ruoyi.swlscx.excerpt.domain.vo; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + +import java.io.Serializable; +import java.math.BigDecimal; +import java.util.Date; + +/** + * 洪水水文要素摘录表 + * @TableName hy_fdheex_b + */ +@Data +public class HyFdheexBVo implements Serializable { + /** + * 站码 + */ + private String stcd; + + + /** + * 站名 + */ + private String stnm; + + /** + * 时间 + */ + private Date tm; + + /** + * 水位 + */ + private BigDecimal z; + + /** + * 水位注解码 + + */ + private String zrcd; + + /** + * 流量 + */ + private BigDecimal q; + + /** + * 含沙量 + */ + private BigDecimal s; + + @TableField(exist = false) + private static final long serialVersionUID = 1L; +} \ No newline at end of file diff --git a/swlscx/src/main/java/com/ruoyi/swlscx/excerpt/domain/vo/HyHltdzBVo.java b/swlscx/src/main/java/com/ruoyi/swlscx/excerpt/domain/vo/HyHltdzBVo.java new file mode 100644 index 0000000..26f4161 --- /dev/null +++ b/swlscx/src/main/java/com/ruoyi/swlscx/excerpt/domain/vo/HyHltdzBVo.java @@ -0,0 +1,64 @@ +package com.ruoyi.swlscx.excerpt.domain.vo; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + +import java.io.Serializable; +import java.math.BigDecimal; +import java.util.Date; + +/** + * 逐潮高低潮位表 + * @TableName hy_hltdz_b + */ +@Data +public class HyHltdzBVo implements Serializable { + /** + * 站码 + */ + private String stcd; + + + /** + * 站名 + */ + private String stnm; + + /** + * 时间 + */ + private Date tm; + + /** + * 潮别 + */ + private String tdtp; + + /** + * 潮位 + */ + private BigDecimal tdz; + + /** + * 潮位注解码 + */ + private String tdzrcd; + + /** + * 潮差 + */ + private BigDecimal tdrng; + + /** + * 历时 + */ + private String dr; + + /** + * 备注 + */ + private String nt; + + private static final long serialVersionUID = 1L; +} \ No newline at end of file diff --git a/swlscx/src/main/java/com/ruoyi/swlscx/excerpt/domain/vo/HyPrexBVo.java b/swlscx/src/main/java/com/ruoyi/swlscx/excerpt/domain/vo/HyPrexBVo.java new file mode 100644 index 0000000..b778d29 --- /dev/null +++ b/swlscx/src/main/java/com/ruoyi/swlscx/excerpt/domain/vo/HyPrexBVo.java @@ -0,0 +1,51 @@ +package com.ruoyi.swlscx.excerpt.domain.vo; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; +import lombok.EqualsAndHashCode; + +import java.io.Serializable; +import java.math.BigDecimal; +import java.util.Date; + +/** + * 降水量摘录表 + * @TableName hy_prex_b + */ +@Data +@EqualsAndHashCode +public class HyPrexBVo implements Serializable { + /** + * 站码 + */ + private String stcd; + + + /** + * 站名 + */ + private String stnm; + + /** + * 起时间 + */ + private Date bgtm; + + /** + * 止时间 + */ + private Date endtm; + + /** + * 降水量(毫米) + */ + private BigDecimal p; + + /** + * 降水量注解码 + */ + private String prcd; + + private static final long serialVersionUID = 1L; +} \ No newline at end of file diff --git a/swlscx/src/main/java/com/ruoyi/swlscx/excerpt/domain/vo/HyRvfhexBVo.java b/swlscx/src/main/java/com/ruoyi/swlscx/excerpt/domain/vo/HyRvfhexBVo.java new file mode 100644 index 0000000..8464228 --- /dev/null +++ b/swlscx/src/main/java/com/ruoyi/swlscx/excerpt/domain/vo/HyRvfhexBVo.java @@ -0,0 +1,65 @@ +package com.ruoyi.swlscx.excerpt.domain.vo; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + +import java.io.Serializable; +import java.math.BigDecimal; +import java.util.Date; + +/** + * 水库洪水水文要素摘录表 + * @TableName hy_rvfhex_b + */ +@Data +public class HyRvfhexBVo implements Serializable { + /** + * 站码 + */ + private String stcd; + + /** + * 站名 + */ + private String stnm; + + + /** + * 时间 + */ + private Date tm; + + /** + * 坝上水位 + */ + private BigDecimal dambhdz; + + /** + * 坝上水位注解码 + */ + private String dambhdzrcd; + + /** + * 流量 + */ + private BigDecimal q; + + /** + * 含沙量 + */ + private BigDecimal s; + + /** + * 蓄水量 + */ + private BigDecimal w; + + /** + * 备注 + */ + private String nt; + + @TableField(exist = false) + private static final long serialVersionUID = 1L; +} \ No newline at end of file diff --git a/swlscx/src/main/java/com/ruoyi/swlscx/excerpt/domain/vo/HyWsfhexBVo.java b/swlscx/src/main/java/com/ruoyi/swlscx/excerpt/domain/vo/HyWsfhexBVo.java new file mode 100644 index 0000000..499388e --- /dev/null +++ b/swlscx/src/main/java/com/ruoyi/swlscx/excerpt/domain/vo/HyWsfhexBVo.java @@ -0,0 +1,64 @@ +package com.ruoyi.swlscx.excerpt.domain.vo; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + +import java.io.Serializable; +import java.math.BigDecimal; +import java.util.Date; + +/** + * 水闸洪水水文要素摘录表 + * @TableName hy_wsfhex_b + */ +@Data +public class HyWsfhexBVo implements Serializable { + /** + * 站码 + */ + private String stcd; + + + /** + * 站名 + */ + private String stnm; + + /** + * 时间 + */ + private Date tm; + + /** + * 闸上水位 + */ + private BigDecimal upz; + + /** + * 闸上水位注解码 + */ + private String upzrcd; + + /** + * 闸下水位 + */ + private BigDecimal dwz; + + /** + * 闸下水位注解码 + */ + private String dwzrcd; + + /** + * 流量 + */ + private BigDecimal q; + + /** + * 含沙量 + */ + private BigDecimal s; + + private static final long serialVersionUID = 1L; +} \ No newline at end of file diff --git a/swlscx/src/main/java/com/ruoyi/swlscx/excerpt/mapper/HyFdheexBMapper.java b/swlscx/src/main/java/com/ruoyi/swlscx/excerpt/mapper/HyFdheexBMapper.java new file mode 100644 index 0000000..a857a01 --- /dev/null +++ b/swlscx/src/main/java/com/ruoyi/swlscx/excerpt/mapper/HyFdheexBMapper.java @@ -0,0 +1,39 @@ +package com.ruoyi.swlscx.excerpt.mapper; + +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.ruoyi.swlscx.day.domain.vo.HyDcsFVo; +import com.ruoyi.swlscx.excerpt.domain.po.HyFdheexB; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.ruoyi.swlscx.excerpt.domain.po.HyPrexB; +import com.ruoyi.swlscx.excerpt.domain.vo.HyFdheexBVo; +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; + +import java.util.List; +import java.util.Map; + +/** +* @author 12974 +* @description 针对表【hy_fdheex_b(洪水水文要素摘录表)】的数据库操作Mapper +* @createDate 2024-10-17 13:15:04 +* @Entity com.ruoyi.swlscx.excerpt.domain.po.HyFdheexB +*/ +@Mapper +public interface HyFdheexBMapper extends BaseMapper { + + void deleteAll(); + + + void batchInsert(@Param("list") List collect); + + void batchInsertOrUpdate(); + + IPage selectHyFdheexBPageByInfo(Page page,@Param("map") Map map); + + void mergeToData(); +} + + + + diff --git a/swlscx/src/main/java/com/ruoyi/swlscx/excerpt/mapper/HyHltdzBMapper.java b/swlscx/src/main/java/com/ruoyi/swlscx/excerpt/mapper/HyHltdzBMapper.java new file mode 100644 index 0000000..e50ebf8 --- /dev/null +++ b/swlscx/src/main/java/com/ruoyi/swlscx/excerpt/mapper/HyHltdzBMapper.java @@ -0,0 +1,34 @@ +package com.ruoyi.swlscx.excerpt.mapper; + +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.ruoyi.swlscx.excerpt.domain.po.HyHltdzB; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.ruoyi.swlscx.excerpt.domain.vo.HyHltdzBVo; +import org.apache.ibatis.annotations.Param; + +import java.util.List; +import java.util.Map; + +/** +* @author 12974 +* @description 针对表【hy_hltdz_b(逐潮高低潮位表)】的数据库操作Mapper +* @createDate 2024-10-17 14:28:45 +* @Entity com.ruoyi.swlscx.excerpt.domain.po.HyHltdzB +*/ +public interface HyHltdzBMapper extends BaseMapper { + + void deleteAll(); + + void batchInsert(@Param("list") List batchList); + + void batchInsertOrUpdate(); + + IPage selectHyHltdzBPageByInfo(Page page, @Param("map") Map map); + + void mergeToData(); +} + + + + diff --git a/swlscx/src/main/java/com/ruoyi/swlscx/excerpt/mapper/HyPrexBMapper.java b/swlscx/src/main/java/com/ruoyi/swlscx/excerpt/mapper/HyPrexBMapper.java new file mode 100644 index 0000000..96f8e46 --- /dev/null +++ b/swlscx/src/main/java/com/ruoyi/swlscx/excerpt/mapper/HyPrexBMapper.java @@ -0,0 +1,40 @@ +package com.ruoyi.swlscx.excerpt.mapper; + +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.ruoyi.swlscx.day.domain.po.HyDweC; +import com.ruoyi.swlscx.excerpt.domain.po.HyPrexB; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.ruoyi.swlscx.excerpt.domain.vo.HyPrexBVo; +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; + +import java.util.List; +import java.util.Map; + +/** +* @author 12974 +* @description 针对表【hy_prex_b(降水量摘录表)】的数据库操作Mapper +* @createDate 2024-10-17 09:17:42 +* @Entity com.ruoyi.swlscx.excerpt.domain.po.HyPrexB +*/ +@Mapper +public interface HyPrexBMapper extends BaseMapper { + + void deleteAll(); + + void batchInsert(@Param("list") List collect); + + void batchInsertOrUpdate(); + + /** + * 查询降雨量摘录表 + */ + IPage selectHyDcsFPageByInfo(Page page,@Param("map") Map map); + + void mergeToData(); +} + + + + diff --git a/swlscx/src/main/java/com/ruoyi/swlscx/excerpt/mapper/HyRvfhexBMapper.java b/swlscx/src/main/java/com/ruoyi/swlscx/excerpt/mapper/HyRvfhexBMapper.java new file mode 100644 index 0000000..78c4b7e --- /dev/null +++ b/swlscx/src/main/java/com/ruoyi/swlscx/excerpt/mapper/HyRvfhexBMapper.java @@ -0,0 +1,34 @@ +package com.ruoyi.swlscx.excerpt.mapper; + +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.ruoyi.swlscx.excerpt.domain.po.HyRvfhexB; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.ruoyi.swlscx.excerpt.domain.vo.HyRvfhexBVo; +import org.apache.ibatis.annotations.Param; + +import java.util.List; +import java.util.Map; + +/** +* @author 12974 +* @description 针对表【hy_rvfhex_b(水库洪水水文要素摘录表)】的数据库操作Mapper +* @createDate 2024-10-17 13:54:18 +* @Entity com.ruoyi.swlscx.excerpt.domain.po.HyRvfhexB +*/ +public interface HyRvfhexBMapper extends BaseMapper { + + void deleteAll(); + + void batchInsert(@Param("list") List batchList); + + void batchInsertOrUpdate(); + + IPage selectHyRvfhexBPageByInfo(Page page,@Param("map") Map map); + + void mergeToData(); +} + + + + diff --git a/swlscx/src/main/java/com/ruoyi/swlscx/excerpt/mapper/HyWsfhexBMapper.java b/swlscx/src/main/java/com/ruoyi/swlscx/excerpt/mapper/HyWsfhexBMapper.java new file mode 100644 index 0000000..5f7287c --- /dev/null +++ b/swlscx/src/main/java/com/ruoyi/swlscx/excerpt/mapper/HyWsfhexBMapper.java @@ -0,0 +1,36 @@ +package com.ruoyi.swlscx.excerpt.mapper; + +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.ruoyi.swlscx.excerpt.domain.po.HyWsfhexB; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.ruoyi.swlscx.excerpt.domain.vo.HyWsfhexBVo; +import org.apache.ibatis.annotations.Param; +import org.springframework.security.core.parameters.P; + +import java.util.List; +import java.util.Map; + +/** +* @author 12974 +* @description 针对表【hy_wsfhex_b(水闸洪水水文要素摘录表)】的数据库操作Mapper +* @createDate 2024-10-17 14:14:32 +* @Entity com.ruoyi.swlscx.excerpt.domain.po.HyWsfhexB +*/ +public interface HyWsfhexBMapper extends BaseMapper { + + /** + * 查询水闸洪水水文要素摘录表 + */ + IPage selectHyWsfhexBPageByInfo(Page page,@Param("map") Map map); + + void deleteTempData(); + + void insertTempData(@Param("list") List batch); + + void mergeToData(); +} + + + + diff --git a/swlscx/src/main/java/com/ruoyi/swlscx/excerpt/service/HyFdheexBService.java b/swlscx/src/main/java/com/ruoyi/swlscx/excerpt/service/HyFdheexBService.java new file mode 100644 index 0000000..ac8eecd --- /dev/null +++ b/swlscx/src/main/java/com/ruoyi/swlscx/excerpt/service/HyFdheexBService.java @@ -0,0 +1,37 @@ +package com.ruoyi.swlscx.excerpt.service; + +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.ruoyi.common.core.page.R; +import com.ruoyi.swlscx.common.PageParams; +import com.ruoyi.swlscx.excerpt.domain.po.HyFdheexB; +import com.baomidou.mybatisplus.extension.service.IService; +import com.ruoyi.swlscx.excerpt.domain.vo.HyFdheexBVo; +import org.springframework.web.multipart.MultipartFile; + +import javax.servlet.http.HttpServletResponse; + +/** +* @author 12974 +* @description 针对表【hy_fdheex_b(洪水水文要素摘录表)】的数据库操作Service +* @createDate 2024-10-17 13:15:04 +*/ +public interface HyFdheexBService extends IService { + + /** + * 导入洪水水文要素摘录表 + */ + void imporHyFdheexBData(MultipartFile file); + + + /** + * 查询洪水水文要素摘录表 + */ + IPage selectHyFdheexBPageByInfo(PageParams pageParams, String startTime, String endTime, String stnm, String stcd); + + /** + * 导出洪水水文要素摘录表 + */ + R exportFloodExcerpt(HttpServletResponse response, String startTime, String endTime, String stnm, String stcd); + + R importDateTosoft(String startTime, String endTime); +} diff --git a/swlscx/src/main/java/com/ruoyi/swlscx/excerpt/service/HyHltdzBService.java b/swlscx/src/main/java/com/ruoyi/swlscx/excerpt/service/HyHltdzBService.java new file mode 100644 index 0000000..20e1992 --- /dev/null +++ b/swlscx/src/main/java/com/ruoyi/swlscx/excerpt/service/HyHltdzBService.java @@ -0,0 +1,38 @@ +package com.ruoyi.swlscx.excerpt.service; + +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.ruoyi.common.core.page.R; +import com.ruoyi.swlscx.common.PageParams; +import com.ruoyi.swlscx.excerpt.domain.po.HyHltdzB; +import com.baomidou.mybatisplus.extension.service.IService; +import com.ruoyi.swlscx.excerpt.domain.vo.HyHltdzBVo; +import org.springframework.web.multipart.MultipartFile; + +import javax.servlet.http.HttpServletResponse; + +/** +* @author 12974 +* @description 针对表【hy_hltdz_b(逐潮高低潮位表)】的数据库操作Service +* @createDate 2024-10-17 14:28:45 +*/ +public interface HyHltdzBService extends IService { + + + + /** + * 导入逐潮高低潮位表数据 + */ + void importHyHltdzBData(MultipartFile file); + + /** + * 查询逐潮高低潮位表 + */ + IPage selectHyHltdzBPageByInfo(PageParams pageParams, String startTime, String endTime, String stnm, String stcd); + + /** + * 导出逐潮高低潮位表 + */ + R exportFollowingTheTideExcerpt(HttpServletResponse response, String startTime, String endTime, String stnm, String stcd); + + R importDateTosoft(String startTime, String endTime); +} diff --git a/swlscx/src/main/java/com/ruoyi/swlscx/excerpt/service/HyPrexBService.java b/swlscx/src/main/java/com/ruoyi/swlscx/excerpt/service/HyPrexBService.java new file mode 100644 index 0000000..4cb2baa --- /dev/null +++ b/swlscx/src/main/java/com/ruoyi/swlscx/excerpt/service/HyPrexBService.java @@ -0,0 +1,37 @@ +package com.ruoyi.swlscx.excerpt.service; + +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.ruoyi.common.core.page.R; +import com.ruoyi.swlscx.common.PageParams; +import com.ruoyi.swlscx.excerpt.domain.po.HyPrexB; +import com.baomidou.mybatisplus.extension.service.IService; +import com.ruoyi.swlscx.excerpt.domain.vo.HyPrexBVo; +import org.springframework.web.multipart.MultipartFile; + +import javax.servlet.http.HttpServletResponse; + +/** +* @author 12974 +* @description 针对表【hy_prex_b(降水量摘录表)】的数据库操作Service +* @createDate 2024-10-17 09:17:42 +*/ +public interface HyPrexBService extends IService { + + + /** + * 导入降水量摘录表数据 + */ + void importHyPrexBData(MultipartFile file); + + /** + * 查询降雨量摘录表 + */ + IPage selectHyPrexBPageByInfo(PageParams pageParams, String startTime, String endTime, String stnm, String stcd); + + /** + * 导出降雨量摘录表 + */ + R exportRainExcerpt(HttpServletResponse response, String startTime, String endTime, String stnm, String stcd); + + R importDateTosoft(String startTime, String endTime); +} diff --git a/swlscx/src/main/java/com/ruoyi/swlscx/excerpt/service/HyRvfhexBService.java b/swlscx/src/main/java/com/ruoyi/swlscx/excerpt/service/HyRvfhexBService.java new file mode 100644 index 0000000..209f092 --- /dev/null +++ b/swlscx/src/main/java/com/ruoyi/swlscx/excerpt/service/HyRvfhexBService.java @@ -0,0 +1,36 @@ +package com.ruoyi.swlscx.excerpt.service; + +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.ruoyi.common.core.page.R; +import com.ruoyi.swlscx.common.PageParams; +import com.ruoyi.swlscx.excerpt.domain.po.HyRvfhexB; +import com.baomidou.mybatisplus.extension.service.IService; +import com.ruoyi.swlscx.excerpt.domain.vo.HyRvfhexBVo; +import org.springframework.web.multipart.MultipartFile; + +import javax.servlet.http.HttpServletResponse; + +/** +* @author 12974 +* @description 针对表【hy_rvfhex_b(水库洪水水文要素摘录表)】的数据库操作Service +* @createDate 2024-10-17 13:54:18 +*/ +public interface HyRvfhexBService extends IService { + + /** + * 导入水库洪水水文要素摘录表 + */ + void importHyRvfhexBData(MultipartFile file); + + /** + * 查询水库洪水水文要素摘录表 + */ + IPage selectHyRvfhexBPageByInfo(PageParams pageParams, String startTime, String endTime, String stnm, String stcd); + + /** + * 导出水库洪水水文要素摘录表 + */ + R exportRsverFloodExcerpt(HttpServletResponse response, String startTime, String endTime, String stnm, String stcd); + + R importDateTosoft(String startTime, String endTime); +} diff --git a/swlscx/src/main/java/com/ruoyi/swlscx/excerpt/service/HyWsfhexBService.java b/swlscx/src/main/java/com/ruoyi/swlscx/excerpt/service/HyWsfhexBService.java new file mode 100644 index 0000000..df25646 --- /dev/null +++ b/swlscx/src/main/java/com/ruoyi/swlscx/excerpt/service/HyWsfhexBService.java @@ -0,0 +1,36 @@ +package com.ruoyi.swlscx.excerpt.service; + +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.ruoyi.common.core.page.R; +import com.ruoyi.swlscx.common.PageParams; +import com.ruoyi.swlscx.excerpt.domain.po.HyWsfhexB; +import com.baomidou.mybatisplus.extension.service.IService; +import com.ruoyi.swlscx.excerpt.domain.vo.HyWsfhexBVo; +import org.springframework.web.multipart.MultipartFile; + +import javax.servlet.http.HttpServletResponse; + +/** +* @author 12974 +* @description 针对表【hy_wsfhex_b(水闸洪水水文要素摘录表)】的数据库操作Service +* @createDate 2024-10-17 14:14:32 +*/ +public interface HyWsfhexBService extends IService { + + /** + * 导入水闸洪水水文要素摘录表 + */ + void importHyWsfhexBData(MultipartFile file); + + /** + * 查询水闸洪水水文要素摘录表 + */ + IPage selectHyWsfhexBPageByInfo(PageParams pageParams, String startTime, String endTime, String stnm, String stcd); + + /** + * 导出水库洪水水文要素摘录表 + */ + R exportSzFloodExcerpt(HttpServletResponse response, String startTime, String endTime, String stnm, String stcd); + + R importDateTosoft(String startTime, String endTime); +} diff --git a/swlscx/src/main/java/com/ruoyi/swlscx/excerpt/service/impl/HyFdheexBServiceImpl.java b/swlscx/src/main/java/com/ruoyi/swlscx/excerpt/service/impl/HyFdheexBServiceImpl.java new file mode 100644 index 0000000..05df0ab --- /dev/null +++ b/swlscx/src/main/java/com/ruoyi/swlscx/excerpt/service/impl/HyFdheexBServiceImpl.java @@ -0,0 +1,359 @@ +package com.ruoyi.swlscx.excerpt.service.impl; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.ruoyi.common.annotation.DataSource; +import com.ruoyi.common.config.RuoYiConfig; +import com.ruoyi.common.core.page.R; +import com.ruoyi.common.core.text.Convert; +import com.ruoyi.common.enums.DataSourceType; +import com.ruoyi.common.utils.DateUtils; +import com.ruoyi.common.utils.SecurityUtils; +import com.ruoyi.swlscx.basic.domain.po.YcExportTask; +import com.ruoyi.swlscx.basic.service.YcExportTaskService; +import com.ruoyi.swlscx.common.PageParams; +import com.ruoyi.swlscx.common.constants.SystemConstants; +import com.ruoyi.swlscx.common.utils.CommonUtils; +import com.ruoyi.swlscx.common.utils.ExcelUtils; +import com.ruoyi.swlscx.common.utils.Query; +import com.ruoyi.swlscx.day.domain.vo.HyDcsFVo; +import com.ruoyi.swlscx.excerpt.domain.bo.HyFdheexBBo; +import com.ruoyi.swlscx.excerpt.domain.po.HyFdheexB; +import com.ruoyi.swlscx.excerpt.domain.vo.HyFdheexBVo; +import com.ruoyi.swlscx.excerpt.service.HyFdheexBService; +import com.ruoyi.swlscx.excerpt.mapper.HyFdheexBMapper; +import com.ruoyi.swlscx.year.domain.po.HyHmxpF; +import com.ruoyi.swlscx.year.domain.vo.HyHmxpFVo; +import com.ruoyi.swlscx.year.service.impl.HyHmxpFServiceImpl; +import org.apache.commons.lang3.ObjectUtils; +import org.apache.poi.ss.usermodel.CellStyle; +import org.apache.poi.ss.usermodel.Row; +import org.apache.poi.ss.usermodel.Sheet; +import org.springframework.beans.BeanUtils; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.context.ApplicationContext; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; +import org.springframework.web.multipart.MultipartFile; + +import javax.annotation.Resource; +import javax.servlet.http.HttpServletResponse; +import java.io.File; +import java.util.Date; +import java.util.List; +import java.util.Map; +import java.util.concurrent.CompletableFuture; +import java.util.concurrent.ThreadPoolExecutor; +import java.util.stream.Collectors; + +/** +* @author 12974 +* @description 针对表【hy_fdheex_b(洪水水文要素摘录表)】的数据库操作Service实现 +* @createDate 2024-10-17 13:15:04 +*/ +@Service +public class HyFdheexBServiceImpl extends ServiceImpl + implements HyFdheexBService{ + + + @Resource + private ThreadPoolExecutor labelThreadPool; + + @Resource + private YcExportTaskService ycExportTaskService; + + /** + * 导入洪水水文要素摘录表 + */ + @Override + @Transactional(rollbackFor = Exception.class) + public void imporHyFdheexBData(MultipartFile file) { + try { + List hyFdheexBBos = ExcelUtils.readExcel(file.getInputStream(), + HyFdheexBBo.class, 2); + List hyFdheexBList = hyFdheexBBos.stream().map(i -> { + HyFdheexB hyFdheexB = new HyFdheexB(); + BeanUtils.copyProperties(i, hyFdheexB); + hyFdheexB.setTm(DateUtils.parseDate(i.getTm())); + hyFdheexB.setZ(Convert.toBigDecimal(i.getZ())); + hyFdheexB.setQ(Convert.toBigDecimal(i.getQ())); + hyFdheexB.setS(Convert.toBigDecimal(i.getS())); + return hyFdheexB; + }).collect(Collectors.toList()); + List collect = hyFdheexBList.stream().distinct(). + collect(Collectors.toList()); + //先清空临时表的数据 + this.baseMapper.deleteAll(); + //先插入到临时表中 从临时表中更新过去 + for (int i = 0; i < collect.size(); i += 1000) { + int end = Math.min(i + 1000, collect.size()); + List batchList = collect.subList(i, end); + this.baseMapper.batchInsert(batchList); + } + //重临时表中把数据刷过去 + this.baseMapper.batchInsertOrUpdate(); + + } catch (Exception e) { + e.printStackTrace(); + } + } + + /** + * 查询洪水水文要素摘录表 + */ + @Override + public IPage selectHyFdheexBPageByInfo(PageParams pageParams, String startTime, String endTime, String stnm, String stcd) { + Map map = CommonUtils.getYearAndDayDataMap(pageParams, startTime, endTime, stcd, stnm); + return this.baseMapper.selectHyFdheexBPageByInfo(new Query().getPage(map), map); + } + + @Override + public R exportFloodExcerpt(HttpServletResponse response, String startTime, String endTime, String stnm, String stcd) { + Long userId = SecurityUtils.getUserId(); + String tableName = "洪水水文要素摘录表"; + return taskAndExport(tableName,startTime, endTime, stcd, stnm, userId); + + + +// Map dataMap = CommonUtils.getYearAndDayDataMap(new PageParams(0L, 100000L), startTime, endTime, stcd, stnm); +// ExcelUtils.excelExport(response, "floodExcerpt.xls", "洪水水文要素摘录表", (Sheet sheet, CellStyle style) -> { +// dataModel(dataMap, sheet, style); +// }); + } + + @Resource + private ThreadPoolExecutor importThreadPool; + + @Autowired + private ApplicationContext context; + + + /** + * 从mysql导入到sqlserver中 + */ + @Transactional(rollbackFor = Exception.class) + @DataSource(DataSourceType.SHARDING) + public void importMysqlToSqlserver(List hyFdheexBVoList) { + List records = hyFdheexBVoList.stream().map(i->{ + HyFdheexB hyFdheexB = new HyFdheexB(); + BeanUtils.copyProperties(i, hyFdheexB); + hyFdheexB.setZ(Convert.toBigDecimal(i.getZ())); + hyFdheexB.setQ(Convert.toBigDecimal(i.getQ())); + hyFdheexB.setS(Convert.toBigDecimal(i.getS())); + return hyFdheexB; + }).collect(Collectors.toList()); + //先清空临时表的数据 + this.baseMapper.deleteAll(); + //插入临时表数据 + int batchSize = 50; + for (int i = 0; i < records.size(); i += batchSize) { + int end = Math.min(i + batchSize, records.size()); + List batch = records.subList(i, end); + // 执行批量插入 + this.baseMapper.batchInsert(batch); + } + //从临时表增或修改主表 + this.baseMapper.mergeToData(); + } + + + @Override + public R importDateTosoft(String startTime, String endTime) { + Long userId = SecurityUtils.getUserId(); + String filename = "洪水水文要素摘录表" + startTime + "-" + endTime+"导入到南方片"; + // 查询是否已存在相同条件且未完成的任务 + List ongoingTasks = ycExportTaskService.list( + new QueryWrapper() + .eq("user_id", userId) + .eq("status", 0) // 状态为0表示任务未完成 + .like("filename", "洪水水文要素摘录表")); + if (!ongoingTasks.isEmpty()) { + return R.error("当前任务正在下载中，请稍后重试"); + } + YcExportTask ycExportTask = new YcExportTask(); + ycExportTask.setFilename(filename); + ycExportTask.setUserId(userId); + ycExportTask.setStartTime(new Date()); + ycExportTask.setStatus(0); + ycExportTaskService.save(ycExportTask); + CompletableFuture.runAsync(() -> { + try { + IPage pageByInfo = this.selectHyFdheexBPageByInfo(new PageParams(0L, 1000000000000L), startTime, endTime, null, null); +// IPage pageByInfo = this.selectMaxHRainListPageByInfo(new PageParams(0L, 1000L), null, null, startTime, endTime); + HyFdheexBServiceImpl hyFdheexBService = context.getBean(HyFdheexBServiceImpl.class); + hyFdheexBService.importMysqlToSqlserver(pageByInfo.getRecords()); + ycExportTask.setStatus(2); + } catch (Exception e) { + ycExportTask.setStatus(4); + log.error(e.getMessage()); + R.error("任务下载失败"); + }finally { + ycExportTask.setEndTime(new Date()); + ycExportTaskService.updateById(ycExportTask); + } + }, importThreadPool); + return R.ok("任务已提交"); + } + + private R taskAndExport(String tableName,String startTime, String endTime, String stcd, String stnm, Long userId) { + String startNewTime=""; + String endNewTime=""; + if (ObjectUtils.isNotEmpty(startTime) ){ + startNewTime=startTime.substring(0,10); + } + if (ObjectUtils.isNotEmpty(endTime)){ + endNewTime=endTime.substring(0,10); + } + String filename = tableName + startNewTime + "-" + endNewTime; + // 查询是否已存在相同条件且未完成的任务 + List ongoingTasks = ycExportTaskService.list( + new QueryWrapper() + .eq("user_id", userId) + .eq("filename", filename) + .eq("status", 0) // 状态为0表示任务未完成 + ); + + if (!ongoingTasks.isEmpty()) { + return R.error("当前任务正在下载中，请稍后重试"); + } + + YcExportTask ycExportTask = new YcExportTask(); + String pathPeffix = RuoYiConfig.getExportPath() + + File.separator + userId + File.separator+ + DateUtils.parseDateToStr("yyyy-MM-dd",DateUtils.getNowDate()) + File.separator + + DateUtils.parseDateToStr("HH_mm",DateUtils.getNowDate())+File.separator; + ycExportTask.setFilename(filename); + ycExportTask.setUserId(userId); + ycExportTask.setStartTime(new Date()); + ycExportTask.setStatus(0); + ycExportTask.setFilepath(pathPeffix); + ycExportTaskService.save(ycExportTask); + CompletableFuture.runAsync(() -> { + try { + File dest = new File(pathPeffix); + if (!dest.exists()) { + dest.mkdirs(); + } + String fullPath = pathPeffix + filename; + exportBlackData(fullPath, startTime, endTime, stcd, stnm); + + ycExportTask.setStatus(1); + ycExportTask.setEndTime(new Date()); + ycExportTaskService.updateById(ycExportTask); + } catch (Exception e) { + log.error(e.getMessage(), e); + R.error("任务下载失败"); + } + }, labelThreadPool); + return R.ok("任务已提交，请稍后下载"); + } + + private void exportBlackData(String tableName, String startTime, String endTime, String stcd, String stnm) { + Map rainMap = CommonUtils.getYearAndDayDataMap(new PageParams(0L, 1000000000L), startTime, endTime, stcd, stnm); + ExcelUtils.excelBackExport2("floodExcerpt.xls", tableName, (Sheet sheet, CellStyle style) -> + dataModel1(rainMap, sheet, style)); + } + + public int dataModel1(Map map, Sheet sheet, CellStyle style) { + // 批量查询数据 + IPage hyFdheexBVoIPage = this.baseMapper.selectHyFdheexBPageByInfo(new Query().getPage(map), map); + List records = hyFdheexBVoIPage.getRecords(); + // 定义当前sheet的行号 + int rowIndex = 2; // 从第二行开始写入数据 + // 定义全局序号 + int globalIndex = 1; // 从1开始 + + // 定义当前sheet的编号 + int sheetIndex = 1; + + // 最大行数限制 + int maxRowsPerSheet = 65536; // 对于 .xls 文件，最大行数为 65536 + int batchSize = 1000; // 每次批量处理1000行，减少逐行写入的开销 + + // 复制表头到新sheet的逻辑 + ExcelUtils.copyHeader(sheet, style); + + // 批量处理数据 + for (int i = 0; i < records.size(); i += batchSize) { + // 处理一批数据 + int toIndex = Math.min(i + batchSize, records.size()); + List batchList = records.subList(i, toIndex); + + // 批量写入数据 + for (HyFdheexBVo vo : batchList) { + // 如果当前行数达到最大行数，创建新sheet + if (rowIndex >= maxRowsPerSheet) { + sheetIndex++; + sheet = sheet.getWorkbook().createSheet("洪水水文要素摘录表" + sheetIndex); + rowIndex = 2; // 重置行号 + // 复制表头到新sheet + ExcelUtils.copyHeader(sheet, style); + } + + // 创建新行并写入数据 + Row row = ExcelUtils.createRow(sheet, rowIndex); + + // 使用 globalIndex 作为序号 + ExcelUtils.formatCell(row, 0, String.valueOf(globalIndex), style); + ExcelUtils.formatCell(row, 1, vo.getStcd() != null ? vo.getStcd() : "", style); + ExcelUtils.formatCell(row, 2, vo.getStnm() != null ? vo.getStnm() : "", style); + ExcelUtils.formatCell(row, 3, vo.getTm() != null ? DateUtils.parseDateToStr(SystemConstants.TIME_FORMAT,vo.getTm()) : "", style); + ExcelUtils.formatCell(row, 4, vo.getZ() != null ? CommonUtils.formatNum(vo.getZ()) : "", style); + ExcelUtils.formatCell(row, 5, vo.getZrcd() != null ? vo.getZrcd() : "", style); + ExcelUtils.formatCell(row, 6, vo.getQ() != null ? CommonUtils.formatNum(vo.getQ()) : "", style); + ExcelUtils.formatCell(row, 7, vo.getS() != null ? CommonUtils.formatNum(vo.getS()) : "", style); + // 增加行号和全局序号 + rowIndex++; + globalIndex++; + } + } + return 0; + } + + + public void dataModel(Map map, Sheet sheet, CellStyle style) { + // 批量查询数据 + IPage hyFdheexBVoIPage = this.baseMapper.selectHyFdheexBPageByInfo(new Query().getPage(map), map); + List records = hyFdheexBVoIPage.getRecords(); + // 定义当前sheet的行号 + int rowIndex = 2; + // 定义当前sheet的编号 + int sheetIndex = 1; + Row row; + // 最大行数限制 + int maxRowsPerSheet = 65536; // 对于 .xls 文件，最大行数为 65536 + int batchSize = 1000; // 每次批量处理1000行，减少逐行写入的开销 + // 批量处理数据 + for (int i = 0; i < records.size(); i += batchSize) { + // 处理一批数据 + int toIndex = Math.min(i + batchSize, records.size()); + List batchList = records.subList(i, toIndex); + // 批量写入数据 + for (HyFdheexBVo vo : batchList) { + // 如果当前行数达到最大行数，创建新sheet + if (rowIndex >= maxRowsPerSheet) { + sheetIndex++; + sheet = sheet.getWorkbook().createSheet("洪水水文要素摘录表_" + sheetIndex); + rowIndex = 2; // 重置行号 + } + // 创建新行并写入数据 + row = ExcelUtils.createRow(sheet, rowIndex); + //序号 + ExcelUtils.formatCell(row, 0, String.valueOf(rowIndex - 1), style); + ExcelUtils.formatCell(row, 1, vo.getStcd() != null ? vo.getStcd() : "", style); + ExcelUtils.formatCell(row, 2, vo.getStnm() != null ? vo.getStnm() : "", style); + ExcelUtils.formatCell(row, 3, vo.getTm() != null ? DateUtils.parseDateToStr(SystemConstants.TIME_FORMAT,vo.getTm()) : "", style); + ExcelUtils.formatCell(row, 4, vo.getZ() != null ? CommonUtils.formatNum(vo.getZ()) : "", style); + ExcelUtils.formatCell(row, 5, vo.getZrcd() != null ? vo.getZrcd() : "", style); + ExcelUtils.formatCell(row, 6, vo.getQ() != null ? CommonUtils.formatNum(vo.getQ()) : "", style); + ExcelUtils.formatCell(row, 7, vo.getS() != null ? CommonUtils.formatNum(vo.getS()) : "", style); + rowIndex++; + } + } + } +} + + + + diff --git a/swlscx/src/main/java/com/ruoyi/swlscx/excerpt/service/impl/HyHltdzBServiceImpl.java b/swlscx/src/main/java/com/ruoyi/swlscx/excerpt/service/impl/HyHltdzBServiceImpl.java new file mode 100644 index 0000000..70d52cb --- /dev/null +++ b/swlscx/src/main/java/com/ruoyi/swlscx/excerpt/service/impl/HyHltdzBServiceImpl.java @@ -0,0 +1,363 @@ +package com.ruoyi.swlscx.excerpt.service.impl; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.ruoyi.common.annotation.DataSource; +import com.ruoyi.common.config.RuoYiConfig; +import com.ruoyi.common.core.page.R; +import com.ruoyi.common.core.text.Convert; +import com.ruoyi.common.enums.DataSourceType; +import com.ruoyi.common.utils.DateUtils; +import com.ruoyi.common.utils.SecurityUtils; +import com.ruoyi.swlscx.basic.domain.po.YcExportTask; +import com.ruoyi.swlscx.basic.service.YcExportTaskService; +import com.ruoyi.swlscx.common.PageParams; +import com.ruoyi.swlscx.common.constants.SystemConstants; +import com.ruoyi.swlscx.common.utils.CommonUtils; +import com.ruoyi.swlscx.common.utils.ExcelUtils; +import com.ruoyi.swlscx.common.utils.Query; +import com.ruoyi.swlscx.day.domain.vo.HyDcsFVo; +import com.ruoyi.swlscx.excerpt.domain.bo.HyHltdzBBo; +import com.ruoyi.swlscx.excerpt.domain.po.HyHltdzB; +import com.ruoyi.swlscx.excerpt.domain.vo.HyHltdzBVo; +import com.ruoyi.swlscx.excerpt.mapper.HyHltdzBMapper; +import com.ruoyi.swlscx.excerpt.service.HyHltdzBService; +import com.ruoyi.swlscx.year.domain.po.HyHmxpF; +import com.ruoyi.swlscx.year.domain.vo.HyHmxpFVo; +import com.ruoyi.swlscx.year.service.impl.HyHmxpFServiceImpl; +import org.apache.commons.lang3.ObjectUtils; +import org.apache.poi.ss.usermodel.CellStyle; +import org.apache.poi.ss.usermodel.Row; +import org.apache.poi.ss.usermodel.Sheet; +import org.springframework.beans.BeanUtils; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.context.ApplicationContext; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; +import org.springframework.web.multipart.MultipartFile; + +import javax.annotation.Resource; +import javax.servlet.http.HttpServletResponse; +import java.io.File; +import java.util.Date; +import java.util.List; +import java.util.Map; +import java.util.concurrent.CompletableFuture; +import java.util.concurrent.ThreadPoolExecutor; +import java.util.stream.Collectors; + +/** + * @author 12974 + * @description 针对表【hy_hltdz_b(逐潮高低潮位表)】的数据库操作Service实现 + * @createDate 2024-10-17 14:28:45 + */ +@Service +public class HyHltdzBServiceImpl extends ServiceImpl + implements HyHltdzBService { + @Resource + private ThreadPoolExecutor labelThreadPool; + + @Resource + private YcExportTaskService ycExportTaskService; + + + + /** + * 导入逐潮高低潮位表数据 + */ + @Override + @Transactional(rollbackFor = Exception.class) + public void importHyHltdzBData(MultipartFile file) { + try { + List hyHltdzBBos = ExcelUtils.readExcel(file.getInputStream(), + HyHltdzBBo.class, 2); + List hyHltdzBList = hyHltdzBBos.stream().map(i -> { + HyHltdzB hyHltdzB = new HyHltdzB(); + BeanUtils.copyProperties(i, hyHltdzB); + hyHltdzB.setTm(DateUtils.parseDate(i.getTm())); + hyHltdzB.setTdz(Convert.toBigDecimal(i.getTdz())); + hyHltdzB.setTdrng(Convert.toBigDecimal(i.getTdrng())); + return hyHltdzB; + }).collect(Collectors.toList()); + List collect = hyHltdzBList.stream().distinct().collect(Collectors.toList()); + //先清空临时表的数据 + this.baseMapper.deleteAll(); + //先插入到临时表中 从临时表中更新过去 + for (int i = 0; i < collect.size(); i += 1000) { + int end = Math.min(i + 1000, collect.size()); + List batchList = collect.subList(i, end); + this.baseMapper.batchInsert(batchList); + } + //重临时表中把数据刷过去 + this.baseMapper.batchInsertOrUpdate(); + + } catch (Exception e) { + e.printStackTrace(); + } + } + + /** + * 查询逐潮高低潮位表 + */ + @Override + public IPage selectHyHltdzBPageByInfo(PageParams pageParams, String startTime, String endTime, String stnm, String stcd) { + Map map = CommonUtils.getYearAndDayDataMap(pageParams, startTime, endTime, stcd, stnm); + return this.baseMapper.selectHyHltdzBPageByInfo(new Query().getPage(map), map); + } + + /** + * 导出逐潮高低潮位表 + */ + @Override + public R exportFollowingTheTideExcerpt(HttpServletResponse response, String startTime, String endTime, String stnm, String stcd) { + Long userId = SecurityUtils.getUserId(); + String tableName = "逐潮高低潮位表"; + return taskAndExport(tableName,startTime, endTime, stcd, stnm, userId); + + + // Map dataMap = CommonUtils.getYearAndDayDataMap(new PageParams(0L, 100000L), startTime, endTime, stcd, stnm); +// ExcelUtils.excelExport(response, "followingTheTideExcerpt.xls", "逐潮高低潮位表", (Sheet sheet, CellStyle style) -> { +// dataModel(dataMap, sheet, style); +// }); + } + + @Resource + private ThreadPoolExecutor importThreadPool; + + @Autowired + private ApplicationContext context; + + + + /** + * 从mysql导入到sqlserver中 + */ + @Transactional(rollbackFor = Exception.class) + @DataSource(DataSourceType.SHARDING) + public void importMysqlToSqlserver(List hyHltdzBVoList) { + List records = hyHltdzBVoList.stream().map(i->{ + HyHltdzB hyHltdzB = new HyHltdzB(); + BeanUtils.copyProperties(i, hyHltdzB); + hyHltdzB.setTdz(Convert.toBigDecimal(i.getTdz())); + hyHltdzB.setTdrng(Convert.toBigDecimal(i.getTdrng())); + return hyHltdzB; + }).collect(Collectors.toList()); + //先清空临时表的数据 + this.baseMapper.deleteAll(); + //插入临时表数据 + int batchSize = 50; + for (int i = 0; i < records.size(); i += batchSize) { + int end = Math.min(i + batchSize, records.size()); + List batch = records.subList(i, end); + // 执行批量插入 + this.baseMapper.batchInsert(batch); + } + //从临时表增或修改主表 + this.baseMapper.mergeToData(); + } + + + @Override + public R importDateTosoft(String startTime, String endTime) { + Long userId = SecurityUtils.getUserId(); + String filename = "逐潮高低潮位表" + startTime + "-" + endTime+"导入到南方片"; + // 查询是否已存在相同条件且未完成的任务 + List ongoingTasks = ycExportTaskService.list( + new QueryWrapper() + .eq("user_id", userId) + .eq("status", 0) // 状态为0表示任务未完成 + .like("filename", "逐潮高低潮位表")); + if (!ongoingTasks.isEmpty()) { + return R.error("当前任务正在下载中，请稍后重试"); + } + YcExportTask ycExportTask = new YcExportTask(); + ycExportTask.setFilename(filename); + ycExportTask.setUserId(userId); + ycExportTask.setStartTime(new Date()); + ycExportTask.setStatus(0); + ycExportTaskService.save(ycExportTask); + CompletableFuture.runAsync(() -> { + try { + IPage pageByInfo = this.selectHyHltdzBPageByInfo(new PageParams(0L, 100000000000000L), startTime, endTime, null, null); +// IPage pageByInfo = this.selectMaxHRainListPageByInfo(new PageParams(0L, 1000L), null, null, startTime, endTime); + HyHltdzBServiceImpl hyHltdzBService = context.getBean(HyHltdzBServiceImpl.class); + hyHltdzBService.importMysqlToSqlserver(pageByInfo.getRecords()); + ycExportTask.setStatus(2); + } catch (Exception e) { + ycExportTask.setStatus(4); + log.error(e.getMessage()); + R.error("任务下载失败"); + }finally { + ycExportTask.setEndTime(new Date()); + ycExportTaskService.updateById(ycExportTask); + } + }, importThreadPool); + return R.ok("任务已提交"); + } + + private R taskAndExport(String tableName,String startTime, String endTime, String stcd, String stnm, Long userId) { + String startNewTime=""; + String endNewTime=""; + if (ObjectUtils.isNotEmpty(startTime) ){ + startNewTime=startTime.substring(0,10); + } + if (ObjectUtils.isNotEmpty(endTime)){ + endNewTime=endTime.substring(0,10); + } + String filename = tableName + startNewTime + "-" + endNewTime; + // 查询是否已存在相同条件且未完成的任务 + List ongoingTasks = ycExportTaskService.list( + new QueryWrapper() + .eq("user_id", userId) + .eq("filename", filename) + .eq("status", 0) // 状态为0表示任务未完成 + ); + + if (!ongoingTasks.isEmpty()) { + return R.error("当前任务正在下载中，请稍后重试"); + } + + YcExportTask ycExportTask = new YcExportTask(); + String pathPeffix = RuoYiConfig.getExportPath() + + File.separator + userId + File.separator+ + DateUtils.parseDateToStr("yyyy-MM-dd",DateUtils.getNowDate()) + File.separator + + DateUtils.parseDateToStr("HH_mm",DateUtils.getNowDate())+File.separator; + ycExportTask.setFilename(filename); + ycExportTask.setUserId(userId); + ycExportTask.setStartTime(new Date()); + ycExportTask.setStatus(0); + ycExportTask.setFilepath(pathPeffix); + ycExportTaskService.save(ycExportTask); + CompletableFuture.runAsync(() -> { + try { + File dest = new File(pathPeffix); + if (!dest.exists()) { + dest.mkdirs(); + } + String fullPath = pathPeffix + filename; + exportBlackData(fullPath, startTime, endTime, stcd, stnm); + + ycExportTask.setStatus(1); + ycExportTask.setEndTime(new Date()); + ycExportTaskService.updateById(ycExportTask); + } catch (Exception e) { + log.error(e.getMessage(), e); + R.error("任务下载失败"); + } + }, labelThreadPool); + return R.ok("任务已提交，请稍后下载"); + } + + private void exportBlackData(String tableName, String startTime, String endTime, String stcd, String stnm) { + Map rainMap = CommonUtils.getYearAndDayDataMap(new PageParams(0L, 1000000000L), startTime, endTime, stcd, stnm); + ExcelUtils.excelBackExport2("followingTheTideExcerpt.xls", tableName, (Sheet sheet, CellStyle style) -> + dataModel1(rainMap, sheet, style)); + } + + public int dataModel1(Map map, Sheet sheet, CellStyle style) { + // 批量查询数据 + IPage hyHltdzBVoIPage = this.baseMapper.selectHyHltdzBPageByInfo(new Query().getPage(map), map); + List records = hyHltdzBVoIPage.getRecords(); + // 定义当前sheet的行号 + int rowIndex = 2; // 从第二行开始写入数据 + // 定义全局序号 + int globalIndex = 1; // 从1开始 + + // 定义当前sheet的编号 + int sheetIndex = 1; + + // 最大行数限制 + int maxRowsPerSheet = 65536; // 对于 .xls 文件，最大行数为 65536 + int batchSize = 1000; // 每次批量处理1000行，减少逐行写入的开销 + + // 复制表头到新sheet的逻辑 + ExcelUtils.copyHeader(sheet, style); + + // 批量处理数据 + for (int i = 0; i < records.size(); i += batchSize) { + // 处理一批数据 + int toIndex = Math.min(i + batchSize, records.size()); + List batchList = records.subList(i, toIndex); + + // 批量写入数据 + for (HyHltdzBVo vo : batchList) { + // 如果当前行数达到最大行数，创建新sheet + if (rowIndex >= maxRowsPerSheet) { + sheetIndex++; + sheet = sheet.getWorkbook().createSheet("逐潮高低潮位表" + sheetIndex); + rowIndex = 2; // 重置行号 + // 复制表头到新sheet + ExcelUtils.copyHeader(sheet, style); + } + + // 创建新行并写入数据 + Row row = ExcelUtils.createRow(sheet, rowIndex); + + // 使用 globalIndex 作为序号 + ExcelUtils.formatCell(row, 0, String.valueOf(globalIndex), style); + ExcelUtils.formatCell(row, 1, vo.getStcd() != null ? vo.getStcd() : "", style); + ExcelUtils.formatCell(row, 2, vo.getStnm() != null ? vo.getStnm() : "", style); + ExcelUtils.formatCell(row, 3, vo.getTm() != null ? DateUtils.parseDateToStr(SystemConstants.TIME_FORMAT, vo.getTm()) : "", style); + ExcelUtils.formatCell(row, 4, vo.getTdtp() != null ? vo.getTdtp() : "", style); + ExcelUtils.formatCell(row, 5, vo.getTdz() != null ? CommonUtils.formatNum(vo.getTdz()) : "", style); + ExcelUtils.formatCell(row, 6, vo.getTdzrcd() != null ? vo.getTdzrcd() : "", style); + ExcelUtils.formatCell(row, 7, vo.getTdrng() != null ? CommonUtils.formatNum(vo.getTdrng()) : "", style); + ExcelUtils.formatCell(row, 8, vo.getDr() != null ? vo.getDr() : "", style); + ExcelUtils.formatCell(row, 9, vo.getNt() != null ? vo.getNt() : "", style); + // 增加行号和全局序号 + rowIndex++; + globalIndex++; + } + } + return 0; + } + + public void dataModel(Map map, Sheet sheet, CellStyle style) { + // 批量查询数据 + IPage hyHltdzBVoIPage = this.baseMapper.selectHyHltdzBPageByInfo(new Query().getPage(map), map); + List records = hyHltdzBVoIPage.getRecords(); + // 定义当前sheet的行号 + int rowIndex = 2; + // 定义当前sheet的编号 + int sheetIndex = 1; + Row row; + // 最大行数限制 + int maxRowsPerSheet = 65536; // 对于 .xls 文件，最大行数为 65536 + int batchSize = 1000; // 每次批量处理1000行，减少逐行写入的开销 + // 批量处理数据 + for (int i = 0; i < records.size(); i += batchSize) { + // 处理一批数据 + int toIndex = Math.min(i + batchSize, records.size()); + List batchList = records.subList(i, toIndex); + // 批量写入数据 + for (HyHltdzBVo vo : batchList) { + // 如果当前行数达到最大行数，创建新sheet + if (rowIndex >= maxRowsPerSheet) { + sheetIndex++; + sheet = sheet.getWorkbook().createSheet("逐潮高低潮位表_" + sheetIndex); + rowIndex = 2; // 重置行号 + } + // 创建新行并写入数据 + row = ExcelUtils.createRow(sheet, rowIndex); + //序号 + ExcelUtils.formatCell(row, 0, String.valueOf(rowIndex - 1), style); + ExcelUtils.formatCell(row, 1, vo.getStcd() != null ? vo.getStcd() : "", style); + ExcelUtils.formatCell(row, 2, vo.getStnm() != null ? vo.getStnm() : "", style); + ExcelUtils.formatCell(row, 3, vo.getTm() != null ? DateUtils.parseDateToStr(SystemConstants.TIME_FORMAT, vo.getTm()) : "", style); + ExcelUtils.formatCell(row, 4, vo.getTdtp() != null ? vo.getTdtp() : "", style); + ExcelUtils.formatCell(row, 5, vo.getTdz() != null ? CommonUtils.formatNum(vo.getTdz()) : "", style); + ExcelUtils.formatCell(row, 6, vo.getTdzrcd() != null ? vo.getTdzrcd() : "", style); + ExcelUtils.formatCell(row, 7, vo.getTdrng() != null ? CommonUtils.formatNum(vo.getTdrng()) : "", style); + ExcelUtils.formatCell(row, 8, vo.getDr() != null ? vo.getDr() : "", style); + ExcelUtils.formatCell(row, 9, vo.getNt() != null ? vo.getNt() : "", style); + rowIndex++; + } + } + } + +} + + + + diff --git a/swlscx/src/main/java/com/ruoyi/swlscx/excerpt/service/impl/HyPrexBServiceImpl.java b/swlscx/src/main/java/com/ruoyi/swlscx/excerpt/service/impl/HyPrexBServiceImpl.java new file mode 100644 index 0000000..826cea3 --- /dev/null +++ b/swlscx/src/main/java/com/ruoyi/swlscx/excerpt/service/impl/HyPrexBServiceImpl.java @@ -0,0 +1,355 @@ +package com.ruoyi.swlscx.excerpt.service.impl; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.ruoyi.common.annotation.DataSource; +import com.ruoyi.common.config.RuoYiConfig; +import com.ruoyi.common.core.page.R; +import com.ruoyi.common.core.text.Convert; +import com.ruoyi.common.enums.DataSourceType; +import com.ruoyi.common.utils.DateUtils; +import com.ruoyi.common.utils.SecurityUtils; +import com.ruoyi.swlscx.basic.domain.po.YcExportTask; +import com.ruoyi.swlscx.basic.service.YcExportTaskService; +import com.ruoyi.swlscx.common.PageParams; +import com.ruoyi.swlscx.common.constants.SystemConstants; +import com.ruoyi.swlscx.common.utils.CommonUtils; +import com.ruoyi.swlscx.common.utils.ExcelUtils; +import com.ruoyi.swlscx.common.utils.Query; +import com.ruoyi.swlscx.day.domain.vo.HyDcsFVo; +import com.ruoyi.swlscx.excerpt.domain.bo.HyPrexBBo; +import com.ruoyi.swlscx.excerpt.domain.po.HyPrexB; +import com.ruoyi.swlscx.excerpt.domain.vo.HyFdheexBVo; +import com.ruoyi.swlscx.excerpt.domain.vo.HyPrexBVo; +import com.ruoyi.swlscx.excerpt.service.HyPrexBService; +import com.ruoyi.swlscx.excerpt.mapper.HyPrexBMapper; +import com.ruoyi.swlscx.year.domain.po.HyHmxpF; +import com.ruoyi.swlscx.year.domain.vo.HyHmxpFVo; +import com.ruoyi.swlscx.year.service.impl.HyHmxpFServiceImpl; +import org.apache.commons.lang3.ObjectUtils; +import org.apache.poi.ss.usermodel.CellStyle; +import org.apache.poi.ss.usermodel.Row; +import org.apache.poi.ss.usermodel.Sheet; +import org.springframework.beans.BeanUtils; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.context.ApplicationContext; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; +import org.springframework.web.multipart.MultipartFile; + +import javax.annotation.Resource; +import javax.servlet.http.HttpServletResponse; +import java.io.File; +import java.util.Date; +import java.util.List; +import java.util.Map; +import java.util.concurrent.CompletableFuture; +import java.util.concurrent.ThreadPoolExecutor; +import java.util.stream.Collectors; + +/** +* @author 12974 +* @description 针对表【hy_prex_b(降水量摘录表)】的数据库操作Service实现 +* @createDate 2024-10-17 09:17:42 +*/ +@Service +public class HyPrexBServiceImpl extends ServiceImpl + implements HyPrexBService{ + + @Resource + private ThreadPoolExecutor labelThreadPool; + + @Resource + private YcExportTaskService ycExportTaskService; + + /** + * 导入降水量摘录表数据 + */ + @Override + @Transactional(rollbackFor = Exception.class) + public void importHyPrexBData(MultipartFile file) { + try { + List hyPrexBBos = ExcelUtils.readExcel(file.getInputStream(), + HyPrexBBo.class, 2); + List hyPrexBList = hyPrexBBos.stream().map(i -> { + HyPrexB hyPrexB = new HyPrexB(); + BeanUtils.copyProperties(i, hyPrexB); + hyPrexB.setBgtm(DateUtils.parseDate(i.getBgtm())); + hyPrexB.setEndtm(DateUtils.parseDate(i.getEndtm())); + hyPrexB.setP(Convert.toBigDecimal(i.getP())); + return hyPrexB; + }).collect(Collectors.toList()); + List collect = hyPrexBList.stream().distinct().collect(Collectors.toList()); + //先清空临时表的数据 + this.baseMapper.deleteAll(); + //先插入到临时表中 从临时表中更新过去 + for (int i = 0; i < collect.size(); i += 1000) { + int end = Math.min(i + 1000, collect.size()); + List batchList = collect.subList(i, end); + this.baseMapper.batchInsert(batchList); + } + //重临时表中把数据刷过去 + this.baseMapper.batchInsertOrUpdate(); + + } catch (Exception e) { + e.printStackTrace(); + } + } + + /** + * 查询降雨量摘录表 + */ + @Override + public IPage selectHyPrexBPageByInfo(PageParams pageParams, String startTime, String endTime, String stnm, String stcd) { + Map map = CommonUtils.getYearAndDayDataMap(pageParams, startTime, endTime, stcd, stnm); + return this.baseMapper.selectHyDcsFPageByInfo(new Query().getPage(map), map); + } + + /** + * 导出降雨量摘录表 + */ + @Override + public R exportRainExcerpt(HttpServletResponse response, String startTime, String endTime, String stnm, String stcd) { + Long userId = SecurityUtils.getUserId(); + String tableName = "降水量摘录表"; + return taskAndExport(tableName,startTime, endTime, stcd, stnm, userId); + + +// Map dataMap = CommonUtils.getYearAndDayDataMap(new PageParams(0L, 100000L), startTime, endTime, stcd, stnm); +// ExcelUtils.excelExport(response, "rainExcerpt.xls", "降水量摘录表", (Sheet sheet, CellStyle style) -> { +// dataModel(dataMap, sheet, style); +// }); + } + + @Resource + private ThreadPoolExecutor importThreadPool; + + @Autowired + private ApplicationContext context; + + /** + * 从mysql导入到sqlserver中 + */ + @Transactional(rollbackFor = Exception.class) + @DataSource(DataSourceType.SHARDING) + public void importMysqlToSqlserver(List hyPrexBVoList) { + List records = hyPrexBVoList.stream().map(i->{ + HyPrexB hyPrexB = new HyPrexB(); + BeanUtils.copyProperties(i, hyPrexB); + hyPrexB.setP(Convert.toBigDecimal(i.getP())); + return hyPrexB; + }).collect(Collectors.toList()); + //先清空临时表的数据 + this.baseMapper.deleteAll(); + //插入临时表数据 + int batchSize = 50; + for (int i = 0; i < records.size(); i += batchSize) { + int end = Math.min(i + batchSize, records.size()); + List batch = records.subList(i, end); + // 执行批量插入 + this.baseMapper.batchInsert(batch); + } + //从临时表增或修改主表 + this.baseMapper.mergeToData(); + } + + @Override + public R importDateTosoft(String startTime, String endTime) { + Long userId = SecurityUtils.getUserId(); + String filename = "降水量摘录表" + startTime + "-" + endTime+"导入到南方片"; + // 查询是否已存在相同条件且未完成的任务 + List ongoingTasks = ycExportTaskService.list( + new QueryWrapper() + .eq("user_id", userId) + .eq("status", 0) // 状态为0表示任务未完成 + .like("filename", "降水量摘录表")); + if (!ongoingTasks.isEmpty()) { + return R.error("当前任务正在下载中，请稍后重试"); + } + YcExportTask ycExportTask = new YcExportTask(); + ycExportTask.setFilename(filename); + ycExportTask.setUserId(userId); + ycExportTask.setStartTime(new Date()); + ycExportTask.setStatus(0); + ycExportTaskService.save(ycExportTask); + CompletableFuture.runAsync(() -> { + try { + IPage pageByInfo = this.selectHyPrexBPageByInfo(new PageParams(0L, 100000000L), startTime, endTime, null, null); +// IPage pageByInfo = this.selectMaxHRainListPageByInfo(new PageParams(0L, 1000L), null, null, startTime, endTime); + HyPrexBServiceImpl hyPrexBService = context.getBean(HyPrexBServiceImpl.class); + hyPrexBService.importMysqlToSqlserver(pageByInfo.getRecords()); + ycExportTask.setStatus(2); + } catch (Exception e) { + ycExportTask.setStatus(4); + log.error(e.getMessage()); + R.error("任务下载失败"); + }finally { + ycExportTask.setEndTime(new Date()); + ycExportTaskService.updateById(ycExportTask); + } + }, importThreadPool); + return R.ok("任务已提交"); + } + + private R taskAndExport(String tableName,String startTime, String endTime, String stcd, String stnm, Long userId) { + String startNewTime=""; + String endNewTime=""; + if (ObjectUtils.isNotEmpty(startTime) ){ + startNewTime=startTime.substring(0,10); + } + if (ObjectUtils.isNotEmpty(endTime)){ + endNewTime=endTime.substring(0,10); + } + String filename = tableName + startNewTime + "-" + endNewTime; + // 查询是否已存在相同条件且未完成的任务 + List ongoingTasks = ycExportTaskService.list( + new QueryWrapper() + .eq("user_id", userId) + .eq("filename", filename) + .eq("status", 0) // 状态为0表示任务未完成 + ); + + if (!ongoingTasks.isEmpty()) { + return R.error("当前任务正在下载中，请稍后重试"); + } + + YcExportTask ycExportTask = new YcExportTask(); + String pathPeffix = RuoYiConfig.getExportPath() + + File.separator + userId + File.separator+ + DateUtils.parseDateToStr("yyyy-MM-dd",DateUtils.getNowDate()) + File.separator + + DateUtils.parseDateToStr("HH_mm",DateUtils.getNowDate())+File.separator; + ycExportTask.setFilename(filename); + ycExportTask.setUserId(userId); + ycExportTask.setStartTime(new Date()); + ycExportTask.setStatus(0); + ycExportTask.setFilepath(pathPeffix); + ycExportTaskService.save(ycExportTask); + CompletableFuture.runAsync(() -> { + try { + File dest = new File(pathPeffix); + if (!dest.exists()) { + dest.mkdirs(); + } + String fullPath = pathPeffix + filename; + exportBlackData(fullPath, startTime, endTime, stcd, stnm); + + ycExportTask.setStatus(1); + ycExportTask.setEndTime(new Date()); + ycExportTaskService.updateById(ycExportTask); + } catch (Exception e) { + log.error(e.getMessage(), e); + R.error("任务下载失败"); + } + }, labelThreadPool); + return R.ok("任务已提交，请稍后下载"); + } + + + + private void exportBlackData(String tableName, String startTime, String endTime, String stcd, String stnm) { + Map rainMap = CommonUtils.getYearAndDayDataMap(new PageParams(0L, 1000000000L), startTime, endTime, stcd, stnm); + ExcelUtils.excelBackExport2("rainExcerpt.xls", tableName, (Sheet sheet, CellStyle style) -> + dataModel1(rainMap, sheet, style)); + } + + public int dataModel1(Map map, Sheet sheet, CellStyle style) { + // 批量查询数据 + IPage hyPrexBVoIPage = this.baseMapper.selectHyDcsFPageByInfo(new Query().getPage(map), map); + List records = hyPrexBVoIPage.getRecords(); + // 定义当前sheet的行号 + int rowIndex = 2; // 从第二行开始写入数据 + // 定义全局序号 + int globalIndex = 1; // 从1开始 + + // 定义当前sheet的编号 + int sheetIndex = 1; + + // 最大行数限制 + int maxRowsPerSheet = 65536; // 对于 .xls 文件，最大行数为 65536 + int batchSize = 1000; // 每次批量处理1000行，减少逐行写入的开销 + + // 复制表头到新sheet的逻辑 + ExcelUtils.copyHeader(sheet, style); + + // 批量处理数据 + for (int i = 0; i < records.size(); i += batchSize) { + // 处理一批数据 + int toIndex = Math.min(i + batchSize, records.size()); + List batchList = records.subList(i, toIndex); + + // 批量写入数据 + for (HyPrexBVo vo : batchList) { + // 如果当前行数达到最大行数，创建新sheet + if (rowIndex >= maxRowsPerSheet) { + sheetIndex++; + sheet = sheet.getWorkbook().createSheet("降水量摘录表" + sheetIndex); + rowIndex = 2; // 重置行号 + // 复制表头到新sheet + ExcelUtils.copyHeader(sheet, style); + } + + // 创建新行并写入数据 + Row row = ExcelUtils.createRow(sheet, rowIndex); + + // 使用 globalIndex 作为序号 + ExcelUtils.formatCell(row, 0, String.valueOf(globalIndex), style); + ExcelUtils.formatCell(row, 1, vo.getStcd() != null ? vo.getStcd() : "", style); + ExcelUtils.formatCell(row, 2, vo.getStnm() != null ? vo.getStnm() : "", style); + ExcelUtils.formatCell(row, 3, vo.getBgtm() != null ? DateUtils.parseDateToStr(SystemConstants.TIME_FORMAT,vo.getBgtm()) : "", style); + ExcelUtils.formatCell(row, 4, vo.getEndtm() != null ? DateUtils.parseDateToStr(SystemConstants.TIME_FORMAT,vo.getEndtm()) : "", style); + ExcelUtils.formatCell(row, 5, vo.getP() != null ? CommonUtils.formatNum(vo.getP()) : "", style); + ExcelUtils.formatCell(row, 6, vo.getPrcd() != null ? vo.getPrcd() : "", style); + // 增加行号和全局序号 + rowIndex++; + globalIndex++; + } + } + return 0; + } + + public void dataModel(Map map, Sheet sheet, CellStyle style) { + // 批量查询数据 + IPage hyPrexBVoIPage = this.baseMapper.selectHyDcsFPageByInfo(new Query().getPage(map), map); + List records = hyPrexBVoIPage.getRecords(); + // 定义当前sheet的行号 + int rowIndex = 2; + // 定义当前sheet的编号 + int sheetIndex = 1; + Row row; + // 最大行数限制 + int maxRowsPerSheet = 65536; // 对于 .xls 文件，最大行数为 65536 + int batchSize = 1000; // 每次批量处理1000行，减少逐行写入的开销 + // 批量处理数据 + for (int i = 0; i < records.size(); i += batchSize) { + // 处理一批数据 + int toIndex = Math.min(i + batchSize, records.size()); + List batchList = records.subList(i, toIndex); + // 批量写入数据 + for (HyPrexBVo vo : batchList) { + // 如果当前行数达到最大行数，创建新sheet + if (rowIndex >= maxRowsPerSheet) { + sheetIndex++; + sheet = sheet.getWorkbook().createSheet("降水量摘录表_" + sheetIndex); + rowIndex = 2; // 重置行号 + } + // 创建新行并写入数据 + row = ExcelUtils.createRow(sheet, rowIndex); + //序号 + ExcelUtils.formatCell(row, 0, String.valueOf(rowIndex - 1), style); + ExcelUtils.formatCell(row, 1, vo.getStcd() != null ? vo.getStcd() : "", style); + ExcelUtils.formatCell(row, 2, vo.getStnm() != null ? vo.getStnm() : "", style); + ExcelUtils.formatCell(row, 3, vo.getBgtm() != null ? DateUtils.parseDateToStr(SystemConstants.TIME_FORMAT,vo.getBgtm()) : "", style); + ExcelUtils.formatCell(row, 4, vo.getEndtm() != null ? DateUtils.parseDateToStr(SystemConstants.TIME_FORMAT,vo.getEndtm()) : "", style); + ExcelUtils.formatCell(row, 5, vo.getP() != null ? CommonUtils.formatNum(vo.getP()) : "", style); + ExcelUtils.formatCell(row, 6, vo.getPrcd() != null ? vo.getPrcd() : "", style); + rowIndex++; + } + } + } + +} + + + + diff --git a/swlscx/src/main/java/com/ruoyi/swlscx/excerpt/service/impl/HyRvfhexBServiceImpl.java b/swlscx/src/main/java/com/ruoyi/swlscx/excerpt/service/impl/HyRvfhexBServiceImpl.java new file mode 100644 index 0000000..032d027 --- /dev/null +++ b/swlscx/src/main/java/com/ruoyi/swlscx/excerpt/service/impl/HyRvfhexBServiceImpl.java @@ -0,0 +1,359 @@ +package com.ruoyi.swlscx.excerpt.service.impl; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.ruoyi.common.annotation.DataSource; +import com.ruoyi.common.config.RuoYiConfig; +import com.ruoyi.common.core.page.R; +import com.ruoyi.common.core.text.Convert; +import com.ruoyi.common.enums.DataSourceType; +import com.ruoyi.common.utils.DateUtils; +import com.ruoyi.common.utils.SecurityUtils; +import com.ruoyi.swlscx.basic.domain.po.YcExportTask; +import com.ruoyi.swlscx.basic.service.YcExportTaskService; +import com.ruoyi.swlscx.common.PageParams; +import com.ruoyi.swlscx.common.constants.SystemConstants; +import com.ruoyi.swlscx.common.utils.CommonUtils; +import com.ruoyi.swlscx.common.utils.ExcelUtils; +import com.ruoyi.swlscx.common.utils.Query; +import com.ruoyi.swlscx.excerpt.domain.bo.HyRvfhexBBo; +import com.ruoyi.swlscx.excerpt.domain.po.HyRvfhexB; +import com.ruoyi.swlscx.excerpt.domain.vo.HyRvfhexBVo; +import com.ruoyi.swlscx.excerpt.service.HyRvfhexBService; +import com.ruoyi.swlscx.excerpt.mapper.HyRvfhexBMapper; +import org.apache.commons.lang3.ObjectUtils; +import org.apache.poi.ss.usermodel.CellStyle; +import org.apache.poi.ss.usermodel.Row; +import org.apache.poi.ss.usermodel.Sheet; +import org.springframework.beans.BeanUtils; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.context.ApplicationContext; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; +import org.springframework.web.multipart.MultipartFile; + +import javax.annotation.Resource; +import javax.servlet.http.HttpServletResponse; +import java.io.File; +import java.util.Date; +import java.util.List; +import java.util.Map; +import java.util.concurrent.CompletableFuture; +import java.util.concurrent.ThreadPoolExecutor; +import java.util.stream.Collectors; + +/** +* @author 12974 +* @description 针对表【hy_rvfhex_b(水库洪水水文要素摘录表)】的数据库操作Service实现 +* @createDate 2024-10-17 13:54:18 +*/ +@Service +public class HyRvfhexBServiceImpl extends ServiceImpl + implements HyRvfhexBService{ + + @Resource + private ThreadPoolExecutor labelThreadPool; + + @Resource + private YcExportTaskService ycExportTaskService; + + + /** + * 导入水库洪水水文要素摘录表 + */ + @Override + @Transactional(rollbackFor = Exception.class) + public void importHyRvfhexBData(MultipartFile file) { + try { + List hyRvfhexBBos = ExcelUtils.readExcel(file.getInputStream(), + HyRvfhexBBo.class, 2); + List hyRvfhexBS = hyRvfhexBBos.stream().map(i -> { + HyRvfhexB hyRvfhexB = new HyRvfhexB(); + BeanUtils.copyProperties(i, hyRvfhexB); + hyRvfhexB.setTm(DateUtils.parseDate(i.getTm())); + hyRvfhexB.setDambhdz(Convert.toBigDecimal(i.getDambhdz())); + hyRvfhexB.setQ(Convert.toBigDecimal(i.getQ())); + hyRvfhexB.setS(Convert.toBigDecimal(i.getS())); + hyRvfhexB.setW(Convert.toBigDecimal(i.getW())); + return hyRvfhexB; + }).collect(Collectors.toList()); + List collect = hyRvfhexBS.stream().distinct().collect(Collectors.toList()); + //先清空临时表的数据 + this.baseMapper.deleteAll(); + //先插入到临时表中 从临时表中更新过去 + for (int i = 0; i < collect.size(); i += 1000) { + int end = Math.min(i + 1000, collect.size()); + List batchList = collect.subList(i, end); + this.baseMapper.batchInsert(batchList); + } + //重临时表中把数据刷过去 + this.baseMapper.batchInsertOrUpdate(); + + } catch (Exception e) { + e.printStackTrace(); + } + } + + /** + * 查询水库洪水水文要素摘录表 + */ + @Override + public IPage selectHyRvfhexBPageByInfo(PageParams pageParams, String startTime, String endTime, String stnm, String stcd) { + Map map = CommonUtils.getYearAndDayDataMap(pageParams, startTime, endTime, stcd, stnm); + return this.baseMapper.selectHyRvfhexBPageByInfo(new Query().getPage(map), map); + } + + @Override + public R exportRsverFloodExcerpt(HttpServletResponse response, String startTime, String endTime, String stnm, String stcd) { + + Long userId = SecurityUtils.getUserId(); + String tableName = "水库洪水水文要素摘录表"; + return taskAndExport(tableName,startTime, endTime, stcd, stnm, userId); + + +// Map dataMap = CommonUtils.getYearAndDayDataMap(new PageParams(0L, 100000L), startTime, endTime, stcd, stnm); +// ExcelUtils.excelExport(response, "rsverFloodExcerpt.xls", "水库洪水水文要素摘录表", (Sheet sheet, CellStyle style) -> { +// dataModel(dataMap, sheet, style); +// }); + } + + @Resource + private ThreadPoolExecutor importThreadPool; + + @Autowired + private ApplicationContext context; + + /** + * 从mysql导入到sqlserver中 + */ + @Transactional(rollbackFor = Exception.class) + @DataSource(DataSourceType.SHARDING) + public void importMysqlToSqlserver(List hyRvfhexBVoList) { + List records = hyRvfhexBVoList.stream().map(i->{ + HyRvfhexB hyRvfhexB = new HyRvfhexB(); + BeanUtils.copyProperties(i, hyRvfhexB); + hyRvfhexB.setDambhdz(Convert.toBigDecimal(i.getDambhdz())); + hyRvfhexB.setQ(Convert.toBigDecimal(i.getQ())); + hyRvfhexB.setS(Convert.toBigDecimal(i.getS())); + hyRvfhexB.setW(Convert.toBigDecimal(i.getW())); + return hyRvfhexB; + }).collect(Collectors.toList()); + //先清空临时表的数据 + this.baseMapper.deleteAll(); + //插入临时表数据 + int batchSize = 50; + for (int i = 0; i < records.size(); i += batchSize) { + int end = Math.min(i + batchSize, records.size()); + List batch = records.subList(i, end); + // 执行批量插入 + this.baseMapper.batchInsert(batch); + } + //从临时表增或修改主表 + this.baseMapper.mergeToData(); + } + + + @Override + public R importDateTosoft(String startTime, String endTime) { + Long userId = SecurityUtils.getUserId(); + String filename = "水库洪水水文要素摘录表" + startTime + "-" + endTime+"导入到南方片"; + // 查询是否已存在相同条件且未完成的任务 + List ongoingTasks = ycExportTaskService.list( + new QueryWrapper() + .eq("user_id", userId) + .eq("status", 0) // 状态为0表示任务未完成 + .like("filename", "水库洪水水文要素摘录表")); + if (!ongoingTasks.isEmpty()) { + return R.error("当前任务正在下载中，请稍后重试"); + } + YcExportTask ycExportTask = new YcExportTask(); + ycExportTask.setFilename(filename); + ycExportTask.setUserId(userId); + ycExportTask.setStartTime(new Date()); + ycExportTask.setStatus(0); + ycExportTaskService.save(ycExportTask); + CompletableFuture.runAsync(() -> { + try { + IPage pageByInfo = this.selectHyRvfhexBPageByInfo(new PageParams(0L, 10000000000000000L), startTime, endTime, null, null); +// IPage pageByInfo = this.selectMaxHRainListPageByInfo(new PageParams(0L, 1000L), null, null, startTime, endTime); + HyRvfhexBServiceImpl hyRvfhexBService = context.getBean(HyRvfhexBServiceImpl.class); + hyRvfhexBService.importMysqlToSqlserver(pageByInfo.getRecords()); + ycExportTask.setStatus(2); + } catch (Exception e) { + ycExportTask.setStatus(4); + log.error(e.getMessage()); + R.error("任务下载失败"); + }finally { + ycExportTask.setEndTime(new Date()); + ycExportTaskService.updateById(ycExportTask); + } + }, importThreadPool); + return R.ok("任务已提交"); + } + + private R taskAndExport(String tableName,String startTime, String endTime, String stcd, String stnm, Long userId) { + String startNewTime=""; + String endNewTime=""; + if (ObjectUtils.isNotEmpty(startTime) ){ + startNewTime=startTime.substring(0,10); + } + if (ObjectUtils.isNotEmpty(endTime)){ + endNewTime=endTime.substring(0,10); + } + String filename = tableName + startNewTime + "-" + endNewTime; + // 查询是否已存在相同条件且未完成的任务 + List ongoingTasks = ycExportTaskService.list( + new QueryWrapper() + .eq("user_id", userId) + .eq("filename", filename) + .eq("status", 0) // 状态为0表示任务未完成 + ); + + if (!ongoingTasks.isEmpty()) { + return R.error("当前任务正在下载中，请稍后重试"); + } + + YcExportTask ycExportTask = new YcExportTask(); + String pathPeffix = RuoYiConfig.getExportPath() + + File.separator + userId + File.separator+ + DateUtils.parseDateToStr("yyyy-MM-dd",DateUtils.getNowDate()) + File.separator + + DateUtils.parseDateToStr("HH_mm",DateUtils.getNowDate())+File.separator; + ycExportTask.setFilename(filename); + ycExportTask.setUserId(userId); + ycExportTask.setStartTime(new Date()); + ycExportTask.setStatus(0); + ycExportTask.setFilepath(pathPeffix); + ycExportTaskService.save(ycExportTask); + CompletableFuture.runAsync(() -> { + try { + File dest = new File(pathPeffix); + if (!dest.exists()) { + dest.mkdirs(); + } + String fullPath = pathPeffix + filename; + exportBlackData(fullPath, startTime, endTime, stcd, stnm); + + ycExportTask.setStatus(1); + ycExportTask.setEndTime(new Date()); + ycExportTaskService.updateById(ycExportTask); + } catch (Exception e) { + log.error(e.getMessage(), e); + R.error("任务下载失败"); + } + }, labelThreadPool); + return R.ok("任务已提交，请稍后下载"); + } + + private void exportBlackData(String tableName, String startTime, String endTime, String stcd, String stnm) { + Map rainMap = CommonUtils.getYearAndDayDataMap(new PageParams(0L, 1000000000L), startTime, endTime, stcd, stnm); + ExcelUtils.excelBackExport2("rsverFloodExcerpt.xls", tableName, (Sheet sheet, CellStyle style) -> + dataModel1(rainMap, sheet, style)); + } + + public int dataModel1(Map map, Sheet sheet, CellStyle style) { + // 批量查询数据 + IPage hyRvfhexBVoIPage = this.baseMapper.selectHyRvfhexBPageByInfo(new Query().getPage(map), map); + List records = hyRvfhexBVoIPage.getRecords(); + // 定义当前sheet的行号 + int rowIndex = 2; // 从第二行开始写入数据 + // 定义全局序号 + int globalIndex = 1; // 从1开始 + + // 定义当前sheet的编号 + int sheetIndex = 1; + + // 最大行数限制 + int maxRowsPerSheet = 65536; // 对于 .xls 文件，最大行数为 65536 + int batchSize = 1000; // 每次批量处理1000行，减少逐行写入的开销 + + // 复制表头到新sheet的逻辑 + ExcelUtils.copyHeader(sheet, style); + + // 批量处理数据 + for (int i = 0; i < records.size(); i += batchSize) { + // 处理一批数据 + int toIndex = Math.min(i + batchSize, records.size()); + List batchList = records.subList(i, toIndex); + + // 批量写入数据 + for (HyRvfhexBVo vo : batchList) { + // 如果当前行数达到最大行数，创建新sheet + if (rowIndex >= maxRowsPerSheet) { + sheetIndex++; + sheet = sheet.getWorkbook().createSheet("水库洪水水文要素摘录表" + sheetIndex); + rowIndex = 2; // 重置行号 + // 复制表头到新sheet + ExcelUtils.copyHeader(sheet, style); + } + + // 创建新行并写入数据 + Row row = ExcelUtils.createRow(sheet, rowIndex); + + // 使用 globalIndex 作为序号 + ExcelUtils.formatCell(row, 0, String.valueOf(globalIndex), style); + ExcelUtils.formatCell(row, 1, vo.getStcd() != null ? vo.getStcd() : "", style); + ExcelUtils.formatCell(row, 2, vo.getStnm() != null ? vo.getStnm() : "", style); + ExcelUtils.formatCell(row, 3, vo.getTm() != null ? DateUtils.parseDateToStr(SystemConstants.TIME_FORMAT,vo.getTm()) : "", style); + ExcelUtils.formatCell(row, 4, vo.getDambhdz() != null ? CommonUtils.formatNum(vo.getDambhdz()) : "", style); + ExcelUtils.formatCell(row, 5, vo.getDambhdzrcd() != null ? vo.getDambhdzrcd() : "", style); + ExcelUtils.formatCell(row, 6, vo.getQ() != null ? CommonUtils.formatNum(vo.getQ()) : "", style); + ExcelUtils.formatCell(row, 7, vo.getS() != null ? CommonUtils.formatNum(vo.getS()) : "", style); + ExcelUtils.formatCell(row, 8, vo.getW() != null ? CommonUtils.formatNum(vo.getW()) : "", style); + ExcelUtils.formatCell(row, 9, vo.getNt() != null ? vo.getNt() : "", style); + // 增加行号和全局序号 + rowIndex++; + globalIndex++; + } + } + return 0; + } + + public void dataModel(Map map, Sheet sheet, CellStyle style) { + // 批量查询数据 + IPage hyRvfhexBVoIPage = this.baseMapper.selectHyRvfhexBPageByInfo(new Query().getPage(map), map); + List records = hyRvfhexBVoIPage.getRecords(); + // 定义当前sheet的行号 + int rowIndex = 2; + // 定义当前sheet的编号 + int sheetIndex = 1; + Row row; + // 最大行数限制 + int maxRowsPerSheet = 65536; // 对于 .xls 文件，最大行数为 65536 + int batchSize = 1000; // 每次批量处理1000行，减少逐行写入的开销 + // 批量处理数据 + for (int i = 0; i < records.size(); i += batchSize) { + // 处理一批数据 + int toIndex = Math.min(i + batchSize, records.size()); + List batchList = records.subList(i, toIndex); + // 批量写入数据 + for (HyRvfhexBVo vo : batchList) { + // 如果当前行数达到最大行数，创建新sheet + if (rowIndex >= maxRowsPerSheet) { + sheetIndex++; + sheet = sheet.getWorkbook().createSheet("水库洪水水文要素摘录表_" + sheetIndex); + rowIndex = 2; // 重置行号 + } + // 创建新行并写入数据 + row = ExcelUtils.createRow(sheet, rowIndex); + //序号 + ExcelUtils.formatCell(row, 0, String.valueOf(rowIndex - 1), style); + ExcelUtils.formatCell(row, 1, vo.getStcd() != null ? vo.getStcd() : "", style); + ExcelUtils.formatCell(row, 2, vo.getStnm() != null ? vo.getStnm() : "", style); + ExcelUtils.formatCell(row, 3, vo.getTm() != null ? DateUtils.parseDateToStr(SystemConstants.TIME_FORMAT,vo.getTm()) : "", style); + ExcelUtils.formatCell(row, 4, vo.getDambhdz() != null ? CommonUtils.formatNum(vo.getDambhdz()) : "", style); + ExcelUtils.formatCell(row, 5, vo.getDambhdzrcd() != null ? vo.getDambhdzrcd() : "", style); + ExcelUtils.formatCell(row, 6, vo.getQ() != null ? CommonUtils.formatNum(vo.getQ()) : "", style); + ExcelUtils.formatCell(row, 7, vo.getS() != null ? CommonUtils.formatNum(vo.getS()) : "", style); + ExcelUtils.formatCell(row, 8, vo.getW() != null ? CommonUtils.formatNum(vo.getW()) : "", style); + ExcelUtils.formatCell(row, 9, vo.getNt() != null ? vo.getNt() : "", style); + rowIndex++; + } + } + } + +} + + + + diff --git a/swlscx/src/main/java/com/ruoyi/swlscx/excerpt/service/impl/HyWsfhexBServiceImpl.java b/swlscx/src/main/java/com/ruoyi/swlscx/excerpt/service/impl/HyWsfhexBServiceImpl.java new file mode 100644 index 0000000..9ebfc82 --- /dev/null +++ b/swlscx/src/main/java/com/ruoyi/swlscx/excerpt/service/impl/HyWsfhexBServiceImpl.java @@ -0,0 +1,347 @@ +package com.ruoyi.swlscx.excerpt.service.impl; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.ruoyi.common.annotation.DataSource; +import com.ruoyi.common.config.RuoYiConfig; +import com.ruoyi.common.core.page.R; +import com.ruoyi.common.core.text.Convert; +import com.ruoyi.common.enums.DataSourceType; +import com.ruoyi.common.utils.DateUtils; +import com.ruoyi.common.utils.SecurityUtils; +import com.ruoyi.swlscx.basic.domain.po.YcExportTask; +import com.ruoyi.swlscx.basic.service.YcExportTaskService; +import com.ruoyi.swlscx.common.PageParams; +import com.ruoyi.swlscx.common.constants.SystemConstants; +import com.ruoyi.swlscx.common.utils.CommonUtils; +import com.ruoyi.swlscx.common.utils.ExcelUtils; +import com.ruoyi.swlscx.common.utils.Query; +import com.ruoyi.swlscx.excerpt.domain.bo.HyWsfhexBBo; +import com.ruoyi.swlscx.excerpt.domain.po.HyWsfhexB; +import com.ruoyi.swlscx.excerpt.domain.vo.HyWsfhexBVo; +import com.ruoyi.swlscx.excerpt.service.HyWsfhexBService; +import com.ruoyi.swlscx.excerpt.mapper.HyWsfhexBMapper; +import org.apache.commons.lang3.ObjectUtils; +import org.apache.poi.ss.usermodel.CellStyle; +import org.apache.poi.ss.usermodel.Row; +import org.apache.poi.ss.usermodel.Sheet; +import org.springframework.beans.BeanUtils; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.context.ApplicationContext; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; +import org.springframework.web.multipart.MultipartFile; + +import javax.annotation.Resource; +import javax.servlet.http.HttpServletResponse; +import java.io.File; +import java.util.Date; +import java.util.List; +import java.util.Map; +import java.util.concurrent.CompletableFuture; +import java.util.concurrent.ThreadPoolExecutor; +import java.util.stream.Collectors; + +/** +* @author 12974 +* @description 针对表【hy_wsfhex_b(水闸洪水水文要素摘录表)】的数据库操作Service实现 +* @createDate 2024-10-17 14:14:32 +*/ +@Service +public class HyWsfhexBServiceImpl extends ServiceImpl + implements HyWsfhexBService{ + + @Resource + private ThreadPoolExecutor labelThreadPool; + + @Resource + private YcExportTaskService ycExportTaskService; + + + /** + * 导入水闸洪水水文要素摘录表 + */ + @Override + @Transactional(rollbackFor = Exception.class) + public void importHyWsfhexBData(MultipartFile file) { + try { + List hyWsfhexBBos = ExcelUtils.readExcel(file.getInputStream(), + HyWsfhexBBo.class, 2); + List hyWsfhexBList = hyWsfhexBBos.stream().map(i -> { + HyWsfhexB hyWsfhexB = new HyWsfhexB(); + BeanUtils.copyProperties(i, hyWsfhexB); + hyWsfhexB.setTm(DateUtils.parseDate(i.getTm())); + hyWsfhexB.setUpz(Convert.toBigDecimal(i.getUpz())); + hyWsfhexB.setDwz(Convert.toBigDecimal(i.getDwz())); + hyWsfhexB.setQ(Convert.toBigDecimal(i.getQ())); + hyWsfhexB.setS(Convert.toBigDecimal(i.getS())); + return hyWsfhexB; + }).collect(Collectors.toList()); + this.saveBatch(hyWsfhexBList, 10000); + } catch (Exception e) { + e.printStackTrace(); + } + } + + /** + * 查询水闸洪水水文要素摘录表 + */ + @Override + public IPage selectHyWsfhexBPageByInfo(PageParams pageParams, String startTime, String endTime, String stnm, String stcd) { + Map map = CommonUtils.getYearAndDayDataMap(pageParams, startTime, endTime, stcd, stnm); + return this.baseMapper.selectHyWsfhexBPageByInfo(new Query().getPage(map), map); + } + + @Override + public R exportSzFloodExcerpt(HttpServletResponse response, String startTime, String endTime, String stnm, String stcd) { + Long userId = SecurityUtils.getUserId(); + String tableName = "水闸洪水水文要素摘录表"; + return taskAndExport(tableName,startTime, endTime, stcd, stnm, userId); + + +// Map dataMap = CommonUtils.getYearAndDayDataMap(new PageParams(0L, 100000L), startTime, endTime, stcd, stnm); +// ExcelUtils.excelExport(response, "szFloodExcerpt.xls", "水闸洪水水文要素摘录表", (Sheet sheet, CellStyle style) -> { +// dataModel(dataMap, sheet, style); +// }); + } + + @Resource + private ThreadPoolExecutor importThreadPool; + + @Autowired + private ApplicationContext context; + + /** + * 从mysql导入到sqlserver中 + */ + @Transactional(rollbackFor = Exception.class) + @DataSource(DataSourceType.SHARDING) + public void importMysqlToSqlserver(List hyWsfhexBVoList) { + List records = hyWsfhexBVoList.stream().map(i->{ + HyWsfhexB hyWsfhexB = new HyWsfhexB(); + BeanUtils.copyProperties(i, hyWsfhexB); + hyWsfhexB.setUpz(Convert.toBigDecimal(i.getUpz())); + hyWsfhexB.setDwz(Convert.toBigDecimal(i.getDwz())); + hyWsfhexB.setQ(Convert.toBigDecimal(i.getQ())); + hyWsfhexB.setS(Convert.toBigDecimal(i.getS())); + return hyWsfhexB; + }).collect(Collectors.toList()); + //先清空临时表的数据 + this.baseMapper.deleteTempData(); + //插入临时表数据 + int batchSize = 50; + for (int i = 0; i < records.size(); i += batchSize) { + int end = Math.min(i + batchSize, records.size()); + List batch = records.subList(i, end); + // 执行批量插入 + this.baseMapper.insertTempData(batch); + } + //从临时表增或修改主表 + this.baseMapper.mergeToData(); + } + + @Override + public R importDateTosoft(String startTime, String endTime) { + Long userId = SecurityUtils.getUserId(); + String filename = "水闸洪水水文要素摘录表" + startTime + "-" + endTime+"导入到南方片"; + // 查询是否已存在相同条件且未完成的任务 + List ongoingTasks = ycExportTaskService.list( + new QueryWrapper() + .eq("user_id", userId) + .eq("status", 0) // 状态为0表示任务未完成 + .like("filename", "水闸洪水水文要素摘录表")); + if (!ongoingTasks.isEmpty()) { + return R.error("当前任务正在下载中，请稍后重试"); + } + YcExportTask ycExportTask = new YcExportTask(); + ycExportTask.setFilename(filename); + ycExportTask.setUserId(userId); + ycExportTask.setStartTime(new Date()); + ycExportTask.setStatus(0); + ycExportTaskService.save(ycExportTask); + CompletableFuture.runAsync(() -> { + try { + IPage pageByInfo = this.selectHyWsfhexBPageByInfo(new PageParams(0L, 100000000000000L), startTime, endTime, null, null); +// IPage pageByInfo = this.selectMaxHRainListPageByInfo(new PageParams(0L, 1000L), null, null, startTime, endTime); + HyWsfhexBServiceImpl hyWsfhexBService = context.getBean(HyWsfhexBServiceImpl.class); + hyWsfhexBService.importMysqlToSqlserver(pageByInfo.getRecords()); + ycExportTask.setStatus(2); + } catch (Exception e) { + ycExportTask.setStatus(4); + log.error(e.getMessage()); + R.error("任务下载失败"); + }finally { + ycExportTask.setEndTime(new Date()); + ycExportTaskService.updateById(ycExportTask); + } + }, importThreadPool); + return R.ok("任务已提交"); + } + + private R taskAndExport(String tableName,String startTime, String endTime, String stcd, String stnm, Long userId) { + String startNewTime=""; + String endNewTime=""; + if (ObjectUtils.isNotEmpty(startTime) ){ + startNewTime=startTime.substring(0,10); + } + if (ObjectUtils.isNotEmpty(endTime)){ + endNewTime=endTime.substring(0,10); + } + String filename = tableName + startNewTime + "-" + endNewTime; + // 查询是否已存在相同条件且未完成的任务 + List ongoingTasks = ycExportTaskService.list( + new QueryWrapper() + .eq("user_id", userId) + .eq("filename", filename) + .eq("status", 0) // 状态为0表示任务未完成 + ); + + if (!ongoingTasks.isEmpty()) { + return R.error("当前任务正在下载中，请稍后重试"); + } + + YcExportTask ycExportTask = new YcExportTask(); + String pathPeffix = RuoYiConfig.getExportPath() + + File.separator + userId + File.separator+ + DateUtils.parseDateToStr("yyyy-MM-dd",DateUtils.getNowDate()) + File.separator + + DateUtils.parseDateToStr("HH_mm",DateUtils.getNowDate())+File.separator; + ycExportTask.setFilename(filename); + ycExportTask.setUserId(userId); + ycExportTask.setStartTime(new Date()); + ycExportTask.setStatus(0); + ycExportTask.setFilepath(pathPeffix); + ycExportTaskService.save(ycExportTask); + CompletableFuture.runAsync(() -> { + try { + File dest = new File(pathPeffix); + if (!dest.exists()) { + dest.mkdirs(); + } + String fullPath = pathPeffix + filename; + exportBlackData(fullPath, startTime, endTime, stcd, stnm); + + ycExportTask.setStatus(1); + ycExportTask.setEndTime(new Date()); + ycExportTaskService.updateById(ycExportTask); + } catch (Exception e) { + log.error(e.getMessage(), e); + R.error("任务下载失败"); + } + }, labelThreadPool); + return R.ok("任务已提交，请稍后下载"); + } + + private void exportBlackData(String tableName, String startTime, String endTime, String stcd, String stnm) { + Map rainMap = CommonUtils.getYearAndDayDataMap(new PageParams(0L, 1000000000L), startTime, endTime, stcd, stnm); + ExcelUtils.excelBackExport2("szFloodExcerpt.xls", tableName, (Sheet sheet, CellStyle style) -> + dataModel1(rainMap, sheet, style)); + } + + public int dataModel1(Map map, Sheet sheet, CellStyle style) { + // 批量查询数据 + IPage hyWsfhexBVoIPage = this.baseMapper.selectHyWsfhexBPageByInfo(new Query().getPage(map), map); + List records = hyWsfhexBVoIPage.getRecords(); + // 定义当前sheet的行号 + int rowIndex = 2; // 从第二行开始写入数据 + // 定义全局序号 + int globalIndex = 1; // 从1开始 + + // 定义当前sheet的编号 + int sheetIndex = 1; + + // 最大行数限制 + int maxRowsPerSheet = 65536; // 对于 .xls 文件，最大行数为 65536 + int batchSize = 1000; // 每次批量处理1000行，减少逐行写入的开销 + + // 复制表头到新sheet的逻辑 + ExcelUtils.copyHeader(sheet, style); + + // 批量处理数据 + for (int i = 0; i < records.size(); i += batchSize) { + // 处理一批数据 + int toIndex = Math.min(i + batchSize, records.size()); + List batchList = records.subList(i, toIndex); + + // 批量写入数据 + for (HyWsfhexBVo vo : batchList) { + // 如果当前行数达到最大行数，创建新sheet + if (rowIndex >= maxRowsPerSheet) { + sheetIndex++; + sheet = sheet.getWorkbook().createSheet("水闸洪水水文要素摘录表" + sheetIndex); + rowIndex = 2; // 重置行号 + // 复制表头到新sheet + ExcelUtils.copyHeader(sheet, style); + } + + // 创建新行并写入数据 + Row row = ExcelUtils.createRow(sheet, rowIndex); + + // 使用 globalIndex 作为序号 + ExcelUtils.formatCell(row, 0, String.valueOf(globalIndex), style); + ExcelUtils.formatCell(row, 1, vo.getStcd() != null ? vo.getStcd() : "", style); + ExcelUtils.formatCell(row, 2, vo.getStnm() != null ? vo.getStnm() : "", style); + ExcelUtils.formatCell(row, 3, vo.getTm() != null ? DateUtils.parseDateToStr(SystemConstants.TIME_FORMAT,vo.getTm()) : "", style); + ExcelUtils.formatCell(row, 4, vo.getUpz() != null ? CommonUtils.formatNum(vo.getUpz()) : "", style); + ExcelUtils.formatCell(row, 5, vo.getUpzrcd() != null ? vo.getUpzrcd() : "", style); + ExcelUtils.formatCell(row, 6, vo.getDwz() != null ? CommonUtils.formatNum(vo.getDwz()) : "", style); + ExcelUtils.formatCell(row, 7, vo.getDwzrcd() != null ? vo.getDwzrcd() : "", style); + ExcelUtils.formatCell(row, 8, vo.getQ() != null ? CommonUtils.formatNum(vo.getQ()) : "", style); + ExcelUtils.formatCell(row, 9, vo.getS() != null ? CommonUtils.formatNum(vo.getS()) : "", style); + // 增加行号和全局序号 + rowIndex++; + globalIndex++; + } + } + return 0; + } + + + public void dataModel(Map map, Sheet sheet, CellStyle style) { + // 批量查询数据 + IPage hyWsfhexBVoIPage = this.baseMapper.selectHyWsfhexBPageByInfo(new Query().getPage(map), map); + List records = hyWsfhexBVoIPage.getRecords(); + // 定义当前sheet的行号 + int rowIndex = 2; + // 定义当前sheet的编号 + int sheetIndex = 1; + Row row; + // 最大行数限制 + int maxRowsPerSheet = 65536; // 对于 .xls 文件，最大行数为 65536 + int batchSize = 1000; // 每次批量处理1000行，减少逐行写入的开销 + // 批量处理数据 + for (int i = 0; i < records.size(); i += batchSize) { + // 处理一批数据 + int toIndex = Math.min(i + batchSize, records.size()); + List batchList = records.subList(i, toIndex); + // 批量写入数据 + for (HyWsfhexBVo vo : batchList) { + // 如果当前行数达到最大行数，创建新sheet + if (rowIndex >= maxRowsPerSheet) { + sheetIndex++; + sheet = sheet.getWorkbook().createSheet("水闸洪水水文要素摘录表_" + sheetIndex); + rowIndex = 2; // 重置行号 + } + // 创建新行并写入数据 + row = ExcelUtils.createRow(sheet, rowIndex); + //序号 + ExcelUtils.formatCell(row, 0, String.valueOf(rowIndex - 1), style); + ExcelUtils.formatCell(row, 1, vo.getStcd() != null ? vo.getStcd() : "", style); + ExcelUtils.formatCell(row, 2, vo.getStnm() != null ? vo.getStnm() : "", style); + ExcelUtils.formatCell(row, 3, vo.getTm() != null ? DateUtils.parseDateToStr(SystemConstants.TIME_FORMAT,vo.getTm()) : "", style); + ExcelUtils.formatCell(row, 4, vo.getUpz() != null ? CommonUtils.formatNum(vo.getUpz()) : "", style); + ExcelUtils.formatCell(row, 5, vo.getUpzrcd() != null ? vo.getUpzrcd() : "", style); + ExcelUtils.formatCell(row, 6, vo.getDwz() != null ? CommonUtils.formatNum(vo.getDwz()) : "", style); + ExcelUtils.formatCell(row, 7, vo.getDwzrcd() != null ? vo.getDwzrcd() : "", style); + ExcelUtils.formatCell(row, 8, vo.getQ() != null ? CommonUtils.formatNum(vo.getQ()) : "", style); + ExcelUtils.formatCell(row, 9, vo.getS() != null ? CommonUtils.formatNum(vo.getS()) : "", style); + rowIndex++; + } + } + } + +} + + + + diff --git a/swlscx/src/main/java/com/ruoyi/swlscx/month/controller/MonthExportController.java b/swlscx/src/main/java/com/ruoyi/swlscx/month/controller/MonthExportController.java new file mode 100644 index 0000000..578605f --- /dev/null +++ b/swlscx/src/main/java/com/ruoyi/swlscx/month/controller/MonthExportController.java @@ -0,0 +1,136 @@ +package com.ruoyi.swlscx.month.controller; + +import com.ruoyi.common.core.page.R; +import com.ruoyi.swlscx.month.service.*; +import lombok.RequiredArgsConstructor; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestParam; +import org.springframework.web.bind.annotation.RestController; + +import javax.servlet.http.HttpServletResponse; + +/** + * @Author al + * @Date 2024/8/7 14:10 + * @Description: TODO + * @Version + */ + +@RequestMapping("/report") +@RequiredArgsConstructor +@RestController +public class MonthExportController { + + private final HyMtpEService hyMtpEService; + + private final HyMtweEService hyMtweEService; + + private final HyMtwtEService hyMtwtEService; + + private final HyMtqsEService hyMtqsEService; + + private final HyMtqEService hyMtqEService; + + private final HyMtzEService hyMtzEService; + + private final HyMtcsEService hyMtcsEService; + + private final HyMttdzEService hyMttdzEService; + + /** + * 导出月降水表数据 + */ + @RequestMapping("/monthRain") + public R exportMonthRainList(HttpServletResponse response, + @RequestParam String startTime, + @RequestParam String endTime, + @RequestParam String stcd, + @RequestParam String stnm) { + return hyMtpEService.exportHyMtpData(response, startTime, endTime, stcd, stnm); + } + + /** + * 导出月水面蒸发量表 + */ + @RequestMapping("/monthEvaporationWater") + public R exportMonthEvaporationWaterList(HttpServletResponse response, + @RequestParam String startTime, + @RequestParam String endTime, + @RequestParam String stcd, + @RequestParam String stnm) { + return hyMtweEService.exportMonthEvaporationWaterList(response, startTime, endTime, stcd, stnm); + } + + /** + * 导出月水温表 + */ + @RequestMapping("/monthWaterTemperature") + public R exportMonthWaterTemperatureList(HttpServletResponse response, + @RequestParam String startTime, + @RequestParam String endTime, + @RequestParam String stcd, + @RequestParam String stnm) { + return hyMtwtEService.exportMonthWaterTemperatureList(response, startTime, endTime, stcd, stnm); + } + + /** + * 导出月输沙率表 + */ + @RequestMapping("/monthSedimentDischarge") + public R exportMonthSedimentDischargeList(HttpServletResponse response, + @RequestParam String startTime, + @RequestParam String endTime, + @RequestParam String stcd, + @RequestParam String stnm) { + return hyMtqsEService.exportMonthSedimentDischargeList(response, startTime, endTime, stcd, stnm); + } + + /** + * 导出月流量表 + */ + @RequestMapping("/monthFlow") + public R exportMonthFlowList(HttpServletResponse response, + @RequestParam String startTime, + @RequestParam String endTime, + @RequestParam String stcd, + @RequestParam String stnm) { + return hyMtqEService.exportMonthFlowList(response, startTime, endTime, stcd, stnm); + } + + /** + * 导出月水位表 + */ + @RequestMapping("/monthWaterLever") + public R exportMonthWaterLeverList(HttpServletResponse response, + @RequestParam String startTime, + @RequestParam String endTime, + @RequestParam String stcd, + @RequestParam String stnm) { + return hyMtzEService.exportMonthWaterLeverList(response, startTime, endTime, stcd, stnm); + } + + /** + * 导出月含沙量表 + */ + @RequestMapping("/monthSedimentConcentration") + public R exportMonthSedimentContentList(HttpServletResponse response, + @RequestParam String startTime, + @RequestParam String endTime, + @RequestParam String stcd, + @RequestParam String stnm) { + return hyMtcsEService.exportMonthSedimentContentList(response, startTime, endTime, stcd, stnm); + } + + /** + * 导出月潮位表 + */ + @RequestMapping("/monthTideLever") + public R exportMonthTideLeverList(HttpServletResponse response, + @RequestParam String startTime, + @RequestParam String endTime, + @RequestParam String stcd, + @RequestParam String stnm) { + return hyMttdzEService.exportMonthTideLeverList(response, startTime, endTime, stcd, stnm); + } + +} diff --git a/swlscx/src/main/java/com/ruoyi/swlscx/month/controller/MonthTableController.java b/swlscx/src/main/java/com/ruoyi/swlscx/month/controller/MonthTableController.java new file mode 100644 index 0000000..2bf9f4d --- /dev/null +++ b/swlscx/src/main/java/com/ruoyi/swlscx/month/controller/MonthTableController.java @@ -0,0 +1,110 @@ +package com.ruoyi.swlscx.month.controller; + +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.ruoyi.common.core.page.R; +import com.ruoyi.swlscx.common.PageParams; +import com.ruoyi.swlscx.month.domain.vo.*; +import com.ruoyi.swlscx.month.service.*; +import lombok.RequiredArgsConstructor; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +/** + * @Author al + * @Date 2024/7/31 13:34 + * @Description: TODO + * @Version + */ + +@RestController +@RequestMapping("/month") +@RequiredArgsConstructor +public class MonthTableController { + + private final com.ruoyi.swlscx.month.service.HyMtpEService HyMtpEService; + + private final HyMtzEService hyMtzEService; + + private final HyMtqEService hyMtqEService; + + private final HyMttdzEService hyMttdzEService; + + private final HyMtweEService hyMtweEService; + + private final HyMtcsEService hyMtcsEService; + + private final HyMtqsEService hyMtqsEService; + + private final HyMtwtEService hyMtwtEService; + + /** + * 查询月降水表数据 + */ + @GetMapping("/getMonthRainList") + public R getMonthRainList(Integer pageNum,Integer pageSize, String startTime, String endTime,String stcd,String stnm) { + PageParams pageParams = new PageParams(pageNum.longValue(), pageSize.longValue()); + IPage hyMptEVoIPage = HyMtpEService.selectHyMtpDataByPageAndInfo(pageParams, startTime, endTime, stcd, stnm); + return R.ok().put("data", hyMptEVoIPage.getRecords()).put("count", hyMptEVoIPage.getTotal()); + } + + + /**查询月水位表数据**/ + @GetMapping("/getWaterLeverList") + public R getWaterLeverList(Integer pageNum,Integer pageSize, String stcdIds, String startTime, String endTime,String stnm,String stcd) { + PageParams pageParams = new PageParams(pageNum.longValue(), pageSize.longValue()); + IPage hyMtzEVoIPage = hyMtzEService.selectHyMtzEPageByInfo(pageParams, stcdIds, startTime, endTime, stnm, stcd); + return R.ok().put("data", hyMtzEVoIPage.getRecords()).put("count", hyMtzEVoIPage.getTotal()); + } + + /**查询月流量表数据**/ + @GetMapping("/getFlowList") + public R getFlowList(Integer pageNum,Integer pageSize, String stcdIds, String startTime, String endTime,String stcd,String stnm) { + PageParams pageParams = new PageParams(pageNum.longValue(), pageSize.longValue()); + IPage hyMtqEVoIPage = hyMtqEService.selectHyMtqEListPageByInfo(pageParams, stcdIds, startTime, endTime, stcd, stnm); + return R.ok().put("data", hyMtqEVoIPage.getRecords()).put("count", hyMtqEVoIPage.getTotal()); + } + + /**查询月潮位表数据**/ + @GetMapping("/getTideLeverList") + public R getTideLeverList(Integer pageNum,Integer pageSize, String stcdIds, String startTime, String endTime,String stcd,String stnm) { + PageParams pageParams = new PageParams(pageNum.longValue(), pageSize.longValue()); + return hyMttdzEService.selectHyMttdzEListPageByInfo(pageParams, stcdIds, startTime, endTime,stcd,stnm); + } + + /**查询月水面蒸发表数据**/ + @RequestMapping("/getEvaporationWaterList") + public R getEvaporationWaterList(Integer pageNum,Integer pageSize, String stcdIds, String startTime, String endTime,String stcd,String stnm) { + PageParams pageParams = new PageParams(pageNum.longValue(), pageSize.longValue()); + IPage hyMtweEVoIPage = hyMtweEService.selectHyMtweEListPageByInfo(pageParams, stcdIds, startTime, endTime, stcd, stnm); + return R.ok().put("data", hyMtweEVoIPage.getRecords()).put("count", hyMtweEVoIPage.getTotal()); + } + + /**查询月含沙量数据**/ + @RequestMapping("/getSedimentConcentrationList") + public R getSedimentConcentrationList(Integer pageNum,Integer pageSize, String stcdIds, String startTime, String endTime,String stcd,String stnm) { + PageParams pageParams = new PageParams(pageNum.longValue(), pageSize.longValue()); + IPage hyMtcsEVoIPage = hyMtcsEService.selectHyMtcsEByPageAndInfo(pageParams, stcdIds, startTime, endTime, stcd, stnm); + return R.ok().put("data",hyMtcsEVoIPage.getRecords()).put("count",hyMtcsEVoIPage.getTotal()); + } + + + /**查询月输沙率表数据**/ + @RequestMapping("/getSedimentTransportRateList") + public R getSedimentTransportRateList(Integer pageNum,Integer pageSize, String stcdIds, String startTime, String endTime,String stcd,String stnm) { + PageParams pageParams = new PageParams(pageNum.longValue(), pageSize.longValue()); + IPage hyMtqsEVoIPage = hyMtqsEService.selectHyMtqsEDataByPageAndInfo(pageParams, stcdIds, startTime, endTime, stcd, stnm); + return R.ok().put("data",hyMtqsEVoIPage.getRecords()).put("count",hyMtqsEVoIPage.getTotal()); + } + + /** + * 查询月水温表数据 + */ + @RequestMapping("/getWaterTemperatureList") + public R getWaterTemperatureList(Integer pageNum,Integer pageSize, String stcdIds, String startTime, String endTime,String stcd,String stnm) { + PageParams pageParams = new PageParams(pageNum.longValue(), pageSize.longValue()); + IPage hyMtwtEVoIPage = hyMtwtEService.selectHyMtweEDataByPageAndInfo(pageParams, stcdIds, startTime, endTime, stcd, stnm); + return R.ok().put("data", hyMtwtEVoIPage.getRecords()).put("count", hyMtwtEVoIPage.getTotal()); + } + +} diff --git a/swlscx/src/main/java/com/ruoyi/swlscx/month/controller/MonthToSoftController.java b/swlscx/src/main/java/com/ruoyi/swlscx/month/controller/MonthToSoftController.java new file mode 100644 index 0000000..0a70408 --- /dev/null +++ b/swlscx/src/main/java/com/ruoyi/swlscx/month/controller/MonthToSoftController.java @@ -0,0 +1,93 @@ +package com.ruoyi.swlscx.month.controller; + +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.ruoyi.common.core.page.R; +import com.ruoyi.swlscx.common.PageParams; +import com.ruoyi.swlscx.month.domain.vo.*; +import com.ruoyi.swlscx.month.service.*; +import com.ruoyi.swlscx.year.service.*; +import lombok.RequiredArgsConstructor; +import lombok.extern.slf4j.Slf4j; +import org.springframework.security.core.parameters.P; +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; + +/** + * @Author al + * @Date 2025/1/5 16:11 + * @Description: TODO + * @Version + */ +@RestController +@RequestMapping("/month/import") +@RequiredArgsConstructor +@Slf4j +public class MonthToSoftController { + + private final com.ruoyi.swlscx.month.service.HyMtpEService HyMtpEService; + + private final HyMtzEService hyMtzEService; + + private final HyMtqEService hyMtqEService; + + private final HyMttdzEService hyMttdzEService; + + private final HyMtweEService hyMtweEService; + + private final HyMtcsEService hyMtcsEService; + + private final HyMtqsEService hyMtqsEService; + + private final HyMtwtEService hyMtwtEService; + + /** + * 导入月降水表数据 + */ + @PostMapping("/importMonthRainList") + public R importMonthRainList(String startTime, String endTime) { + return HyMtpEService.importDateTosoft(startTime, endTime); + } + + /**导入月水面蒸发表数据**/ + @RequestMapping("/importEvaporationWaterList") + public R importEvaporationWaterList(String startTime, String endTime) { + return hyMtweEService.importDateTosoft(startTime, endTime); + } + + /**导入月水位表数据**/ + @PostMapping("/importWaterLeverList") + public R getWaterLeverList(String startTime, String endTime) { + return hyMtzEService.importDateTosoft(startTime, endTime); + } + /**导入月含沙量数据**/ + @RequestMapping("/importSedimentConcentrationList") + public R importSedimentConcentrationList(String startTime, String endTime) { + return hyMtcsEService.importDateTosoft(startTime, endTime); + } + + + /**导入月流量表数据**/ + @RequestMapping("/importFlowList") + public R getFlowList(String startTime, String endTime) { + return hyMtqEService.importDateTosoft(startTime, endTime); + } + + /** + * 导入月水温表数据 + */ + @RequestMapping("/importWaterTemperatureList") + public R importWaterTemperatureList(String startTime, String endTime) { + return hyMtwtEService.importDateTosoft(startTime, endTime); + + } + + + /**查询月输沙率表数据**/ + @RequestMapping("/importSedimentTransportRateList") + public R importSedimentTransportRateList(String startTime, String endTime) { + return hyMtqsEService.importDateTosoft(startTime, endTime); + } + +} diff --git a/swlscx/src/main/java/com/ruoyi/swlscx/month/domain/bo/HyHmxpFExcelBo.java b/swlscx/src/main/java/com/ruoyi/swlscx/month/domain/bo/HyHmxpFExcelBo.java new file mode 100644 index 0000000..322b7fb --- /dev/null +++ b/swlscx/src/main/java/com/ruoyi/swlscx/month/domain/bo/HyHmxpFExcelBo.java @@ -0,0 +1,62 @@ +package com.ruoyi.swlscx.month.domain.bo; + + +import com.alibaba.excel.annotation.ExcelProperty; +import com.alibaba.excel.annotation.format.DateTimeFormat; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + +import java.io.Serializable; +import java.math.BigDecimal; +import java.util.Date; + +/** + * + * @author 12974 + * @TableName hy_hmxp_f + */ +@TableName(value ="hy_hmxp_f") +@Data +public class HyHmxpFExcelBo implements Serializable { + /** + * 站码 + */ + @ExcelProperty(value = "站码",index = 1) + private String stcd; + + /** + * 最大降水量时段长(小时) + */ + @ExcelProperty(value = "最大降水量时段长",index = 7) + private Integer mxpdr; + + /** + * 年 + */ + @ExcelProperty(value = "年",index = 5) + private Integer yr; + + /** + * 起时间 + */ + @ExcelProperty(value = "起时间",index = 6) + private String bgtm; + + /** + * 最大降水量(毫米) + */ + @ExcelProperty(value = "最大降水量",index = 8) + private String mxp; + + /** + * 最大降水量注解码 + */ + @ExcelProperty(value = "最大降水量注解码",index = 9) + private String mxprc; + + @TableField(exist = false) + private static final long serialVersionUID = 1L; + + +} \ No newline at end of file diff --git a/swlscx/src/main/java/com/ruoyi/swlscx/month/domain/bo/HyMtcsEBo.java b/swlscx/src/main/java/com/ruoyi/swlscx/month/domain/bo/HyMtcsEBo.java new file mode 100644 index 0000000..0c3ba53 --- /dev/null +++ b/swlscx/src/main/java/com/ruoyi/swlscx/month/domain/bo/HyMtcsEBo.java @@ -0,0 +1,85 @@ +package com.ruoyi.swlscx.month.domain.bo; + +import com.alibaba.excel.annotation.ExcelProperty; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + +import java.io.Serializable; +import java.math.BigDecimal; +import java.util.Date; + +/** + * 月含沙量表 + * @TableName hy_mtcs_e + */ +@Data +public class HyMtcsEBo implements Serializable { + /** + * 站码 + */ + @ExcelProperty(value = "站码",index = 1) + private String stcd; + + /** + * 年 + */ + @ExcelProperty(value = "年",index = 5) + private String yr; + + /** + * 月 + */ + @ExcelProperty(value = "月",index = 6) + private String mth; + + /** + * 平均含沙量(千克每立方米) + */ + @ExcelProperty(value = "平均含沙量",index = 7) + private String avcs; + + /** + * 平均含沙量注解码 + */ + @ExcelProperty(value = "平均含沙量注解码",index = 8) + private String avcsrcd; + + /** + * 最大含沙量(千克每立方米) + */ + @ExcelProperty(value = "最大含沙量",index = 9) + private String mxs; + + /** + * 最大含沙量注解码 + */ + @ExcelProperty(value = "最大含沙量注解码",index = 10) + private String mxsrcd; + + /** + * 最大含沙量日期 + */ + @ExcelProperty(value = "最大含沙量日期",index = 11) + private String mxsdt; + + /** + * 最小含沙量(千克每立方米) + */ + @ExcelProperty(value = "最小含沙量",index = 12) + private String mns; + + /** + * 最小含沙量注解码 + */ + @ExcelProperty(value = "最小含沙量注解码",index = 13) + private String mnsrcd; + + /** + * 最小含沙量日期 + */ + @ExcelProperty(value = "最小含沙量日期",index = 14) + private String mnsdt; + + private static final long serialVersionUID = 1L; +} \ No newline at end of file diff --git a/swlscx/src/main/java/com/ruoyi/swlscx/month/domain/bo/HyMtpEBo.java b/swlscx/src/main/java/com/ruoyi/swlscx/month/domain/bo/HyMtpEBo.java new file mode 100644 index 0000000..8f12f92 --- /dev/null +++ b/swlscx/src/main/java/com/ruoyi/swlscx/month/domain/bo/HyMtpEBo.java @@ -0,0 +1,83 @@ +package com.ruoyi.swlscx.month.domain.bo; + +import com.alibaba.excel.annotation.ExcelProperty; +import com.baomidou.mybatisplus.annotation.TableField; +import lombok.Data; + +import java.io.Serializable; +import java.math.BigDecimal; +import java.util.Date; + +/** + * @Author al + * @Date 2024/7/30 15:52 + * @Description: TODO + * @Version + */ +@Data +public class HyMtpEBo implements Serializable { + + /** + * 站码 + */ + @ExcelProperty(value = "站码",index = 1) + private String stcd; + + + /** + * 年 + */ + @ExcelProperty(value = "年",index = 4) + private String yr; + + /** + * 月 + */ + @ExcelProperty(value = "月",index = 5) + private String mth; + + /** + * 降水量(毫米) + */ + @ExcelProperty(value = "降水量",index = 6) + private String p; + + /** + * 降水量注解码 + */ + @ExcelProperty(value = "降水量注解码",index = 7) + private String prcd; + + /** + * 降水日数 + */ + @ExcelProperty(value = "降水日数",index = 8) + private String pdynum; + + /** + * 降水日数注解码 + */ + @ExcelProperty(value = "降水日数注解码",index = 9) + private String pdynumrcd; + + /** + * 最大降水量(毫米) + */ + @ExcelProperty(value = "最大日降水量",index = 10) + private String mxdyp; + + /** + * 最大降水量注解码 + */ + @ExcelProperty(value = "最大日降水量注解码",index = 11) + private String mxdyprcd; + + /** + * 最大日降水量出现日期 + */ + @ExcelProperty(value = "最大日降水量出现日期",index = 12) + private String mxdypodt; + + private static final long serialVersionUID = 1L; + +} diff --git a/swlscx/src/main/java/com/ruoyi/swlscx/month/domain/bo/HyMtpddbEBo.java b/swlscx/src/main/java/com/ruoyi/swlscx/month/domain/bo/HyMtpddbEBo.java new file mode 100644 index 0000000..4b42624 --- /dev/null +++ b/swlscx/src/main/java/com/ruoyi/swlscx/month/domain/bo/HyMtpddbEBo.java @@ -0,0 +1,47 @@ +package com.ruoyi.swlscx.month.domain.bo; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + +import java.io.Serializable; +import java.math.BigDecimal; + +/** + * 月平均泥沙颗粒级配表 + * @TableName hy_mtpddb_e + */ +@Data +public class HyMtpddbEBo implements Serializable { + /** + * 站码 + */ + private String stcd; + + /** + * 泥沙类型 + */ + private String sdtp; + + /** + * 年 + */ + private String yr; + + /** + * 月 + */ + private String mth; + + /** + * 上限粒径(毫米) + */ + private String ltpd; + + /** + * 平均沙重百分数 + */ + private String avswpct; + + private static final long serialVersionUID = 1L; +} \ No newline at end of file diff --git a/swlscx/src/main/java/com/ruoyi/swlscx/month/domain/bo/HyMtqEBo.java b/swlscx/src/main/java/com/ruoyi/swlscx/month/domain/bo/HyMtqEBo.java new file mode 100644 index 0000000..b440d98 --- /dev/null +++ b/swlscx/src/main/java/com/ruoyi/swlscx/month/domain/bo/HyMtqEBo.java @@ -0,0 +1,86 @@ +package com.ruoyi.swlscx.month.domain.bo; + +import com.alibaba.excel.annotation.ExcelProperty; +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.math.BigDecimal; +import java.util.Date; + +/** + * 月流量表 + * @TableName hy_mtq_e + */ +@Data +public class HyMtqEBo implements Serializable { + /** + * 站码 + */ + @ExcelProperty(value = "站码",index = 1) + private String stcd; + + /** + * 年 + */ + @ExcelProperty(value = "年",index = 5) + private String yr; + + /** + * 月 + */ + @ExcelProperty(value = "月",index = 6) + private String mth; + + /** + * 平均流量 + */ + @ExcelProperty(value = "平均流量",index = 7) + private String avq; + + /** + * 平均流量注解码 + */ + @ExcelProperty(value = "平均流量注解码",index = 8) + private String avqrcd; + + /** + * 最高流量 + */ + @ExcelProperty(value = "最高流量",index = 9) + private String mxq; + + /** + * 最高流量注解码 + */ + @ExcelProperty(value = "最高流量注解码",index = 10) + private String mxqrcd; + + /** + * 最高流量日期 + */ + @ExcelProperty(value = "最高流量日期",index = 11) + private String mxqdt; + + /** + * 最小流量 + */ + @ExcelProperty(value = "最小流量",index = 12) + private String mnq; + + /** + * 最小流量注解码 + */ + @ExcelProperty(value = "最小流量注解码",index = 13) + private String mnqrcd; + + /** + * 最小流量日期 + */ + @ExcelProperty(value = "最小流量日期",index = 14) + private String mnqdt; + + private static final long serialVersionUID = 1L; +} \ No newline at end of file diff --git a/swlscx/src/main/java/com/ruoyi/swlscx/month/domain/bo/HyMtqsEBo.java b/swlscx/src/main/java/com/ruoyi/swlscx/month/domain/bo/HyMtqsEBo.java new file mode 100644 index 0000000..3652f11 --- /dev/null +++ b/swlscx/src/main/java/com/ruoyi/swlscx/month/domain/bo/HyMtqsEBo.java @@ -0,0 +1,75 @@ +package com.ruoyi.swlscx.month.domain.bo; + +import com.alibaba.excel.annotation.ExcelProperty; +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.math.BigDecimal; +import java.util.Date; + +/** + * 月输沙率表 + * @TableName hy_mtqs_e + */ +@TableName(value ="hy_mtqs_e") +@Data +public class HyMtqsEBo implements Serializable { + /** + * 站码 + */ + @ExcelProperty(value = "站码",index = 1) + private String stcd; + + /** + * 泥沙类型 + */ + @ExcelProperty(value = "泥沙类型",index = 7) + private String sdtp; + + /** + * 年 + */ + @ExcelProperty(value = "年",index = 5) + private String yr; + + /** + * 月 + */ + @ExcelProperty(value = "月",index = 6) + private String mth; + + /** + * 平均输沙率(千克每秒) + */ + @ExcelProperty(value = "平均输沙率",index = 8) + private String avqs; + + /** + * 平均输沙率注解码 + */ + @ExcelProperty(value = "平均输沙率注解码",index = 9) + private String avqsrcd; + + /** + * 最大日平均沙率(千克每秒) + */ + @ExcelProperty(value = "最大日平均沙率",index = 10) + private String mxdyqs; + + /** + * 最大日平均沙率注解码 + */ + @ExcelProperty(value = "最大日平均沙率注解码",index = 11) + private String mxdyqsrcd; + + /** + * 最大日平均沙率出现日期 + */ + @ExcelProperty(value = "最大日平均沙率出现日期",index = 12) + private String mxdyqsodt; + + private static final long serialVersionUID = 1L; +} \ No newline at end of file diff --git a/swlscx/src/main/java/com/ruoyi/swlscx/month/domain/bo/HyMttdzEBo.java b/swlscx/src/main/java/com/ruoyi/swlscx/month/domain/bo/HyMttdzEBo.java new file mode 100644 index 0000000..ad571be --- /dev/null +++ b/swlscx/src/main/java/com/ruoyi/swlscx/month/domain/bo/HyMttdzEBo.java @@ -0,0 +1,361 @@ +package com.ruoyi.swlscx.month.domain.bo; + +import com.alibaba.excel.annotation.ExcelProperty; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + +import java.io.Serializable; +import java.math.BigDecimal; +import java.util.Date; + +/** + * + * @TableName hy_mttdz_e + */ +@Data +public class HyMttdzEBo implements Serializable { + /** + * 站码 + */ + @ExcelProperty(value = "站码",index = 1) + private String stcd; + + /** + * 年 + */ + @ExcelProperty(value = "年",index = 5) + private String yr; + + /** + * 月 + */ + @ExcelProperty(value = "月",index = 6) + private String mth; + + /** + * 平均高潮潮位 + */ + @ExcelProperty(value = "平均高潮潮位",index = 7) + private String avhtdz; + + /** + * 平均高潮潮位注解码 + */ + @ExcelProperty(value = "平均高潮潮位注解码",index = 8) + private String avhtdzrcd; + + /** + * 最高高潮位 + */ + @ExcelProperty(value = "最高高潮位",index = 9) + private String hthtdz; + + /** + * 最高高潮位注解码 + */ + @ExcelProperty(value = "最高高潮位注解码",index = 10) + private String hthtdzrcd; + + /** + * 最高高潮位出现时间 + */ + @ExcelProperty(value = "最高高潮位出现时间",index = 11) + private String hthtdzotm; + + /** + * 最低高潮位 + */ + @ExcelProperty(value = "最低高潮位",index = 12) + private String lthtdz; + + /** + * 最低高潮位注解码 + */ + @ExcelProperty(value = "最低高潮位注解码",index = 13) + private String lthtdzrcd; + + /** + * 最低高潮位出现时间 + */ + @ExcelProperty(value = "最低高潮位出现时间",index = 14) + private String lthtdzotm; + + /** + * 平均低潮潮位 + */ + @ExcelProperty(value = "平均低潮潮位",index = 15) + private String avltdz; + + /** + * 平均低潮潮位注解码 + */ + @ExcelProperty(value = "平均低潮潮位注解码",index = 16) + private String avltdzrcd; + + /** + * 最高低潮位 + */ + @ExcelProperty(value = "最高低潮位",index = 17) + private String htltdz; + + /** + * 最高低潮位注解码 + */ + @ExcelProperty(value = "最高低潮位注解码",index = 18) + private String htltdzrcd; + + /** + * 最高低潮潮位出现时间 + */ + @ExcelProperty(value = "最高低潮潮位出现时间",index = 19) + private String htltdzotm; + + /** + * 最低低潮位 + */ + @ExcelProperty(value = "最低低潮位",index = 20) + private String ltltdz; + + /** + * 最低低潮潮位注解码 + */ + @ExcelProperty(value = "最低低潮潮位注解码",index = 21) + private String ltltdzrcd; + + /** + * 最低地潮位出现时间 + */ + @ExcelProperty(value = "最低地潮位出现时间",index = 22) + private String ltltdzotm; + + /** + * 平均涨潮潮差 + */ + @ExcelProperty(value = "平均涨潮潮差",index = 23) + private String avftdr; + + /** + * 平均涨潮潮差注解码 + */ + @ExcelProperty(value = "平均涨潮潮差注解码",index = 24) + private String avftdrrcd; + + /** + * 最大涨潮潮差 + */ + @ExcelProperty(value = "最大涨潮潮差",index = 25) + private String mxfltdr; + + /** + * 最大涨潮潮差注解码 + */ + @ExcelProperty(value = "最大涨潮潮差注解码",index = 26) + private String mxfltdrrcd; + + /** + * 最大涨潮潮差（高潮）时间 + */ + @ExcelProperty(value = "最大涨潮潮差（高潮）时间",index = 27) + private String mxfltdrhtm; + + /** + * 最小潮潮差 + */ + @ExcelProperty(value = "最小潮潮差",index = 28) + private String mnfltdr; + + /** + * 最小涨潮潮差注解码 + */ + @ExcelProperty(value = "最小涨潮潮差注解码",index = 29) + private String mnfltdrrcd; + + /** + * 最小涨潮潮差（高潮）时间 + */ + @ExcelProperty(value = "最小涨潮潮差（高潮）时间",index = 30) + private String mnfltdrhtm; + + /** + * 平均涨潮潮差 + */ + @ExcelProperty(value = "平均涨潮潮差",index = 31) + private String aver; + + /** + * 平均涨潮潮差注解码 + */ + @ExcelProperty(value = "平均涨潮潮差注解码",index = 32) + private String averbbrrcd; + + /** + * 最大落潮潮差 + */ + @ExcelProperty(value = "最大落潮潮差",index = 33) + private String mxebtdr; + + /** + * 最大落潮潮差注解码 + */ + @ExcelProperty(value = "最大落潮潮差注解码",index = 34) + private String mxebtdrrcd; + + /** + * 最大落潮潮差(高潮)时间 + */ + @ExcelProperty(value = "最大落潮潮差(高潮)时间",index = 35) + private String mxebtdrht; + + /** + * 最小落潮潮差 + */ + @ExcelProperty(value = "最小落潮潮差",index = 36) + private String mnebtdr; + + /** + * 最小落潮潮差注解码 + */ + @ExcelProperty(value = "最小落潮潮差注解码",index = 37) + private String mnebtdrrcd; + + /** + * 最小落潮潮差（高潮）时间 + */ + @ExcelProperty(value = "最小落潮潮差（高潮）时间",index = 38) + private String mnebtdrhtm; + + /** + * 平均涨潮历时 + */ + @ExcelProperty(value = "平均涨潮历时",index = 39) + private String avftd; + + /** + * 平均涨潮历时注解码 + */ + @ExcelProperty(value = "平均涨潮历时注解码",index = 40) + private String avftdrcd; + + /** + * 最长涨潮历时 + */ + @ExcelProperty(value = "最长涨潮历时",index = 41) + private String mxfltddr; + + /** + * 最长涨潮历时注解码 + */ + @ExcelProperty(value = "最长涨潮历时注解码",index = 42) + private String mxfltddrrcd; + + /** + * 最长涨潮历时（高潮）时间 + */ + @ExcelProperty(value = "最长涨潮历时（高潮）时间",index = 43) + private String mxfltddrhtm; + + /** + * 最短涨潮历时 + */ + @ExcelProperty(value = "最短涨潮历时",index = 44) + private String mnfltddr; + + /** + * 最短涨潮历时注解码 + */ + @ExcelProperty(value = "最短涨潮历时注解码",index = 45) + private String mnfltddrrcd; + + /** + * 最短涨潮历时（高潮）时间 + */ + @ExcelProperty(value = "最短涨潮历时（高潮）时间",index = 46) + private String mnfltddrhtm; + + /** + * 平均落潮历时 + */ + @ExcelProperty(value = "平均落潮历时",index = 47) + private String avebbdr; + + /** + * 平均落潮历时注解码 + */ + @ExcelProperty(value = "平均落潮历时注解码",index = 48) + private String avedrc; + + /** + * 最长落潮历时 + */ + @ExcelProperty(value = "最长落潮历时",index = 49) + private String mxebtddr; + + /** + * 最长落潮历时注解码 + */ + @ExcelProperty(value = "最长落潮历时注解码",index = 50) + private String mxebtddrrcd; + + /** + * 最长落潮历时（高潮）时间 + */ + @ExcelProperty(value = "最长落潮历时（高潮）时间",index = 51) + private String mxebtddrhtm; + + /** + * 最短落潮历时 + */ + @ExcelProperty(value = "最短落潮历时",index = 52) + private String mnbtddr; + + /** + * 最短落潮历时注解码 + */ + @ExcelProperty(value = "最短落潮历时注解码",index = 53) + private String mnebtddrrcd; + + /** + * 最短落潮历时（高潮）时间 + */ + @ExcelProperty(value = "最短落潮历时（高潮）时间",index = 54) + private String mnebtddrhtm; + + /** + * 逐时平均潮位 + */ + @ExcelProperty(value = "逐时平均潮位",index = 55) + private String hravtdz; + + /** + * 逐时平均潮位注解码 + */ + @ExcelProperty(value = "逐时平均潮位注解码",index = 56) + private String hravtdzrcd; + + /** + * 平均潮差 + */ + @ExcelProperty(value = "平均潮差",index = 57) + private String avtdr; + + /** + * 平均潮差注解码 + */ + @ExcelProperty(value = "平均潮差注解码",index = 58) + private String avtdrrcd; + + /** + * 平均历时 + */ + @ExcelProperty(value = "平均历时",index = 59) + private String avtddr; + + /** + * 平均历时注解码 + */ + @ExcelProperty(value = "平均历时注解码",index = 60) + private String avtddrrcd; + + private static final long serialVersionUID = 1L; +} \ No newline at end of file diff --git a/swlscx/src/main/java/com/ruoyi/swlscx/month/domain/bo/HyMtweEBo.java b/swlscx/src/main/java/com/ruoyi/swlscx/month/domain/bo/HyMtweEBo.java new file mode 100644 index 0000000..7719a55 --- /dev/null +++ b/swlscx/src/main/java/com/ruoyi/swlscx/month/domain/bo/HyMtweEBo.java @@ -0,0 +1,79 @@ +package com.ruoyi.swlscx.month.domain.bo; + +import com.alibaba.excel.annotation.ExcelProperty; +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.math.BigDecimal; + +/** + * 月水面蒸发量表 + * @TableName hy_mtwe_e + */ +@Data +public class HyMtweEBo implements Serializable { + /** + * 站码 + */ + @ExcelProperty(value = "站码",index = 1) + private String stcd; + + /** + * 蒸发器型式 + */ + @ExcelProperty(value = "蒸发器型式",index = 5) + private String eetp; + + /** + * 年 + */ + @ExcelProperty(value = "年",index = 6) + private String yr; + + /** + * 月 + */ + @ExcelProperty(value = "月",index = 7) + private String mth; + + /** + * 水面蒸发量(毫米) + */ + @ExcelProperty(value = "水面蒸发量",index = 8) + private String wsfe; + + /** + * 水面蒸发量注解码 + */ + @ExcelProperty(value = "水面蒸发量注解码",index = 9) + private String wsfercd; + + /** + * 最大日水面蒸发量 + */ + @ExcelProperty(value = "最大日水面蒸发量",index = 10) + private String mxdye; + + /** + * 最大日水面蒸发量注解码 + */ + @ExcelProperty(value = "最大日水面蒸发量注解码",index = 11) + private String mxdyercd; + + /** + * 最小日水面蒸发量 + */ + @ExcelProperty(value = "最小日水面蒸发量",index = 12) + private String mndye; + + /** + * 最小日水面蒸发量注解码 + */ + @ExcelProperty(value = "最小日水面蒸发量注解码",index = 13) + private String mndyercd; + + private static final long serialVersionUID = 1L; +} \ No newline at end of file diff --git a/swlscx/src/main/java/com/ruoyi/swlscx/month/domain/bo/HyMtwtEBo.java b/swlscx/src/main/java/com/ruoyi/swlscx/month/domain/bo/HyMtwtEBo.java new file mode 100644 index 0000000..14774bc --- /dev/null +++ b/swlscx/src/main/java/com/ruoyi/swlscx/month/domain/bo/HyMtwtEBo.java @@ -0,0 +1,85 @@ +package com.ruoyi.swlscx.month.domain.bo; + +import com.alibaba.excel.annotation.ExcelProperty; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + +import java.io.Serializable; +import java.math.BigDecimal; +import java.util.Date; + +/** + * 月水温表字段定义 + * @TableName hy_mtwt_e + */ +@Data +public class HyMtwtEBo implements Serializable { + /** + * 站码 + */ + @ExcelProperty(value = "站码",index = 1) + private String stcd; + + /** + * 年 + */ + @ExcelProperty(value = "年",index = 5) + private String yr; + + /** + * 月 + */ + @ExcelProperty(value = "月",index = 6) + private String mth; + + /** + * 平均水温(摄氏度) + */ + @ExcelProperty(value = "平均水温",index = 7) + private String avwtmp; + + /** + * 平均水温注解码 + */ + @ExcelProperty(value = "平均水温注解码",index = 8) + private String avwtmprcd; + + /** + * 最高水温(摄氏度) + */ + @ExcelProperty(value = "最高水温",index = 9) + private String mxwtmp; + + /** + * 最高水温注解码 + */ + @ExcelProperty(value = "最高水温注解码",index = 10) + private String mxwtmprcd; + + /** + * 最高水温日期 + */ + @ExcelProperty(value = "最高水温日期",index = 11) + private String mxwtmpdt; + + /** + * 最低水温(摄氏度) + */ + @ExcelProperty(value = "最低水温",index = 12) + private String mnwtmp; + + /** + * 最低水温注解码 + */ + @ExcelProperty(value = "最低水温注解码",index = 13) + private String mnwtmprcd; + + /** + * 最低水温日期 + */ + @ExcelProperty(value = "最低水温日期",index = 14) + private String mnwtmpdt; + + private static final long serialVersionUID = 1L; +} \ No newline at end of file diff --git a/swlscx/src/main/java/com/ruoyi/swlscx/month/domain/bo/HyMtzEBo.java b/swlscx/src/main/java/com/ruoyi/swlscx/month/domain/bo/HyMtzEBo.java new file mode 100644 index 0000000..b42deeb --- /dev/null +++ b/swlscx/src/main/java/com/ruoyi/swlscx/month/domain/bo/HyMtzEBo.java @@ -0,0 +1,87 @@ +package com.ruoyi.swlscx.month.domain.bo; + + +import com.alibaba.excel.annotation.ExcelProperty; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + +import java.io.Serializable; +import java.math.BigDecimal; +import java.util.Date; + +/** + * + * @TableName 月水位表 + */ +@Data +public class HyMtzEBo implements Serializable { + /** + * 站码 + */ + @ExcelProperty(value = "站码",index = 1) + private String stcd; + + /** + * 年 + */ + @ExcelProperty(value = "年",index = 5) + private String yr; + + /** + * 月 + */ + @ExcelProperty(value = "月",index = 6) + private String mth; + + /** + * 平均水位 + */ + @ExcelProperty(value = "平均水位",index = 7) + private String avz; + + /** + * 平均水位注解码 + */ + @ExcelProperty(value = "平均水位注解码",index = 8) + private String avzrcd; + + /** + * 最高水位 + */ + @ExcelProperty(value = "最高水位",index = 9) + private String htz; + + /** + * 最高水位注解码 + */ + @ExcelProperty(value = "最高水位注解码",index = 10) + private String htzrcd; + + /** + * 最高水位日期 + */ + @ExcelProperty(value = "最高水位日期",index = 11) + private String htzdt; + + /** + * 最低水位 + */ + @ExcelProperty(value = "最低水位",index = 12) + private String mnz; + + /** + * 最低水位注解码 + */ + @ExcelProperty(value = "最低水位注解码",index = 13) + private String mnzrcd; + + /** + * 最低水位日期 + */ + @ExcelProperty(value = "最低水位日期",index = 14) + private String mnzdt; + + private static final long serialVersionUID = 1L; + +} \ No newline at end of file diff --git a/swlscx/src/main/java/com/ruoyi/swlscx/month/domain/po/HyMtchpdE.java b/swlscx/src/main/java/com/ruoyi/swlscx/month/domain/po/HyMtchpdE.java new file mode 100644 index 0000000..1e6b8ba --- /dev/null +++ b/swlscx/src/main/java/com/ruoyi/swlscx/month/domain/po/HyMtchpdE.java @@ -0,0 +1,60 @@ +package com.ruoyi.swlscx.month.domain.po; + +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 java.io.Serializable; +import java.math.BigDecimal; +import lombok.Data; + +/** + * 月泥沙特征粒径表字段定义 + * @TableName hy_mtchpd_e + */ +@TableName(value ="hy_mtchpd_e") +@Data +public class HyMtchpdE implements Serializable { + /** + * 站码 + */ + private String stcd; + + /** + * 泥沙类型 + */ + private String sdtp; + + /** + * 年 + */ + private Integer yr; + + /** + * 月 + */ + private Integer mth; + + /** + * 中数粒径(毫米) + */ + private BigDecimal mdpd; + + /** + * 平均粒径(毫米) + */ + private BigDecimal avpd; + + /** + * 最大粒径(毫米) + */ + private BigDecimal mxpd; + + /** + * 备注 + */ + private String nt; + + @TableField(exist = false) + private static final long serialVersionUID = 1L; +} \ No newline at end of file diff --git a/swlscx/src/main/java/com/ruoyi/swlscx/month/domain/po/HyMtcsE.java b/swlscx/src/main/java/com/ruoyi/swlscx/month/domain/po/HyMtcsE.java new file mode 100644 index 0000000..9920613 --- /dev/null +++ b/swlscx/src/main/java/com/ruoyi/swlscx/month/domain/po/HyMtcsE.java @@ -0,0 +1,76 @@ +package com.ruoyi.swlscx.month.domain.po; + +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 java.io.Serializable; +import java.math.BigDecimal; +import java.util.Date; +import lombok.Data; + +/** + * 月含沙量表 + * @TableName hy_mtcs_e + */ +@TableName(value ="hy_mtcs_e") +@Data +public class HyMtcsE implements Serializable { + /** + * 站码 + */ + private String stcd; + + /** + * 年 + */ + private Integer yr; + + /** + * 月 + */ + private Integer mth; + + /** + * 平均含沙量(千克每立方米) + */ + private BigDecimal avcs; + + /** + * 平均含沙量注解码 + */ + private String avcsrcd; + + /** + * 最大含沙量(千克每立方米) + */ + private BigDecimal mxs; + + /** + * 最大含沙量注解码 + */ + private String mxsrcd; + + /** + * 最大含沙量日期 + */ + private Date mxsdt; + + /** + * 最小含沙量(千克每立方米) + */ + private BigDecimal mns; + + /** + * 最小含沙量注解码 + */ + private String mnsrcd; + + /** + * 最小含沙量日期 + */ + private Date mnsdt; + + @TableField(exist = false) + private static final long serialVersionUID = 1L; +} \ No newline at end of file diff --git a/swlscx/src/main/java/com/ruoyi/swlscx/month/domain/po/HyMtiqE.java b/swlscx/src/main/java/com/ruoyi/swlscx/month/domain/po/HyMtiqE.java new file mode 100644 index 0000000..678566a --- /dev/null +++ b/swlscx/src/main/java/com/ruoyi/swlscx/month/domain/po/HyMtiqE.java @@ -0,0 +1,61 @@ +package com.ruoyi.swlscx.month.domain.po; + +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 java.io.Serializable; +import java.math.BigDecimal; +import java.util.Date; +import lombok.Data; + +/** + * 月冰流量表 + * @TableName hy_mtiq_e + */ +@TableName(value ="hy_mtiq_e") +@Data +public class HyMtiqE implements Serializable { + /** + * 站码 + */ + private String stcd; + + /** + * 年 + */ + private Integer yr; + + /** + * 月 + */ + private Integer mth; + + /** + * 总冰流量(万立方米) + */ + private BigDecimal tiq; + + /** + * 总冰流量注解码 + */ + private String tiqrcd; + + /** + * 最大冰流量(万立方米) + */ + private BigDecimal mxiq; + + /** + * 最大冰流量注解码 + */ + private String mxiqrcd; + + /** + * 最大冰流量日期 + */ + private Date mxiqdt; + + @TableField(exist = false) + private static final long serialVersionUID = 1L; +} \ No newline at end of file diff --git a/swlscx/src/main/java/com/ruoyi/swlscx/month/domain/po/HyMtpE.java b/swlscx/src/main/java/com/ruoyi/swlscx/month/domain/po/HyMtpE.java new file mode 100644 index 0000000..76eb858 --- /dev/null +++ b/swlscx/src/main/java/com/ruoyi/swlscx/month/domain/po/HyMtpE.java @@ -0,0 +1,270 @@ +package com.ruoyi.swlscx.month.domain.po; + + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import java.io.Serializable; +import java.math.BigDecimal; +import java.util.Date; + +/** + * 月降水表 + * @TableName hy_mtp_e + */ +@TableName(value ="hy_mtp_e") +public class HyMtpE implements Serializable { + /** + * 站码 + */ + private String stcd; + + /** + * 年 + */ + private Integer yr; + + /** + * 月 + */ + private Integer mth; + + /** + * 降水量(毫米) + */ + private BigDecimal p; + + /** + * 降水量注解码 + */ + private String prcd; + + /** + * 降水日数 + */ + private String pdynum; + + /** + * 降水日数注解码 + */ + private String pdynumrcd; + + /** + * 最大降水量(毫米) + */ + private BigDecimal mxdyp; + + /** + * 最大降水量注解码 + */ + private String mxdyprcd; + + /** + * 最大日降水量出现日期 + */ + private Date mxdypodt; + + @TableField(exist = false) + private static final long serialVersionUID = 1L; + + /** + * 站码 + */ + public String getStcd() { + return stcd; + } + + /** + * 站码 + */ + public void setStcd(String stcd) { + this.stcd = stcd; + } + + /** + * 年 + */ + public Integer getYr() { + return yr; + } + + /** + * 年 + */ + public void setYr(Integer yr) { + this.yr = yr; + } + + /** + * 月 + */ + public Integer getMth() { + return mth; + } + + /** + * 月 + */ + public void setMth(Integer mth) { + this.mth = mth; + } + + /** + * 降水量(毫米) + */ + public BigDecimal getP() { + return p; + } + + /** + * 降水量(毫米) + */ + public void setP(BigDecimal p) { + this.p = p; + } + + /** + * 降水量注解码 + */ + public String getPrcd() { + return prcd; + } + + /** + * 降水量注解码 + */ + public void setPrcd(String prcd) { + this.prcd = prcd; + } + + /** + * 降水日数 + */ + public String getPdynum() { + return pdynum; + } + + /** + * 降水日数 + */ + public void setPdynum(String pdynum) { + this.pdynum = pdynum; + } + + /** + * 降水日数注解码 + */ + public String getPdynumrcd() { + return pdynumrcd; + } + + /** + * 降水日数注解码 + */ + public void setPdynumrcd(String pdynumrcd) { + this.pdynumrcd = pdynumrcd; + } + + /** + * 最大降水量(毫米) + */ + public BigDecimal getMxdyp() { + return mxdyp; + } + + /** + * 最大降水量(毫米) + */ + public void setMxdyp(BigDecimal mxdyp) { + this.mxdyp = mxdyp; + } + + /** + * 最大降水量注解码 + */ + public String getMxdyprcd() { + return mxdyprcd; + } + + /** + * 最大降水量注解码 + */ + public void setMxdyprcd(String mxdyprcd) { + this.mxdyprcd = mxdyprcd; + } + + /** + * 最大日降水量出现日期 + */ + public Date getMxdypodt() { + return mxdypodt; + } + + /** + * 最大日降水量出现日期 + */ + public void setMxdypodt(Date mxdypodt) { + this.mxdypodt = mxdypodt; + } + + @Override + public boolean equals(Object that) { + if (this == that) { + return true; + } + if (that == null) { + return false; + } + if (getClass() != that.getClass()) { + return false; + } + HyMtpE other = (HyMtpE) that; + return (this.getStcd() == null ? other.getStcd() == null : this.getStcd().equals(other.getStcd())) + && (this.getYr() == null ? other.getYr() == null : this.getYr().equals(other.getYr())) + && (this.getMth() == null ? other.getMth() == null : this.getMth().equals(other.getMth())) + && (this.getP() == null ? other.getP() == null : this.getP().equals(other.getP())) + && (this.getPrcd() == null ? other.getPrcd() == null : this.getPrcd().equals(other.getPrcd())) + && (this.getPdynum() == null ? other.getPdynum() == null : this.getPdynum().equals(other.getPdynum())) + && (this.getPdynumrcd() == null ? other.getPdynumrcd() == null : this.getPdynumrcd().equals(other.getPdynumrcd())) + && (this.getMxdyp() == null ? other.getMxdyp() == null : this.getMxdyp().equals(other.getMxdyp())) + && (this.getMxdyprcd() == null ? other.getMxdyprcd() == null : this.getMxdyprcd().equals(other.getMxdyprcd())) + && (this.getMxdypodt() == null ? other.getMxdypodt() == null : this.getMxdypodt().equals(other.getMxdypodt())); + } + + @Override + public int hashCode() { + final int prime = 31; + int result = 1; + result = prime * result + ((getStcd() == null) ? 0 : getStcd().hashCode()); + result = prime * result + ((getYr() == null) ? 0 : getYr().hashCode()); + result = prime * result + ((getMth() == null) ? 0 : getMth().hashCode()); + result = prime * result + ((getP() == null) ? 0 : getP().hashCode()); + result = prime * result + ((getPrcd() == null) ? 0 : getPrcd().hashCode()); + result = prime * result + ((getPdynum() == null) ? 0 : getPdynum().hashCode()); + result = prime * result + ((getPdynumrcd() == null) ? 0 : getPdynumrcd().hashCode()); + result = prime * result + ((getMxdyp() == null) ? 0 : getMxdyp().hashCode()); + result = prime * result + ((getMxdyprcd() == null) ? 0 : getMxdyprcd().hashCode()); + result = prime * result + ((getMxdypodt() == null) ? 0 : getMxdypodt().hashCode()); + return result; + } + + @Override + public String toString() { + StringBuilder sb = new StringBuilder(); + sb.append(getClass().getSimpleName()); + sb.append(" ["); + sb.append("Hash = ").append(hashCode()); + sb.append(", stcd=").append(stcd); + sb.append(", yr=").append(yr); + sb.append(", mth=").append(mth); + sb.append(", p=").append(p); + sb.append(", prcd=").append(prcd); + sb.append(", pdynum=").append(pdynum); + sb.append(", pdynumrcd=").append(pdynumrcd); + sb.append(", mxdyp=").append(mxdyp); + sb.append(", mxdyprcd=").append(mxdyprcd); + sb.append(", mxdypodt=").append(mxdypodt); + sb.append(", serialVersionUID=").append(serialVersionUID); + sb.append("]"); + return sb.toString(); + } +} \ No newline at end of file diff --git a/swlscx/src/main/java/com/ruoyi/swlscx/month/domain/po/HyMtpddbE.java b/swlscx/src/main/java/com/ruoyi/swlscx/month/domain/po/HyMtpddbE.java new file mode 100644 index 0000000..3a73edb --- /dev/null +++ b/swlscx/src/main/java/com/ruoyi/swlscx/month/domain/po/HyMtpddbE.java @@ -0,0 +1,49 @@ +package com.ruoyi.swlscx.month.domain.po; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import java.io.Serializable; +import java.math.BigDecimal; +import lombok.Data; + +/** + * 月平均泥沙颗粒级配表 + * @TableName hy_mtpddb_e + */ +@TableName(value ="hy_mtpddb_e") +@Data +public class HyMtpddbE implements Serializable { + /** + * 站码 + */ + private String stcd; + + /** + * 泥沙类型 + */ + private String sdtp; + + /** + * 年 + */ + private Integer yr; + + /** + * 月 + */ + private Integer mth; + + /** + * 上限粒径(毫米) + */ + private BigDecimal ltpd; + + /** + * 平均沙重百分数 + */ + private BigDecimal avswpct; + + @TableField(exist = false) + private static final long serialVersionUID = 1L; +} \ No newline at end of file diff --git a/swlscx/src/main/java/com/ruoyi/swlscx/month/domain/po/HyMtqE.java b/swlscx/src/main/java/com/ruoyi/swlscx/month/domain/po/HyMtqE.java new file mode 100644 index 0000000..92009fc --- /dev/null +++ b/swlscx/src/main/java/com/ruoyi/swlscx/month/domain/po/HyMtqE.java @@ -0,0 +1,76 @@ +package com.ruoyi.swlscx.month.domain.po; + +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 java.io.Serializable; +import java.math.BigDecimal; +import java.util.Date; +import lombok.Data; + +/** + * 月流量表 + * @TableName hy_mtq_e + */ +@TableName(value ="hy_mtq_e") +@Data +public class HyMtqE implements Serializable { + /** + * 站码 + */ + private String stcd; + + /** + * 年 + */ + private Integer yr; + + /** + * 月 + */ + private Integer mth; + + /** + * 平均流量 + */ + private BigDecimal avq; + + /** + * 平均流量注解码 + */ + private String avqrcd; + + /** + * 最高流量 + */ + private BigDecimal mxq; + + /** + * 最高流量注解码 + */ + private String mxqrcd; + + /** + * 最高流量日期 + */ + private Date mxqdt; + + /** + * 最小流量 + */ + private BigDecimal mnq; + + /** + * 最小流量注解码 + */ + private String mnqrcd; + + /** + * 最小流量日期 + */ + private Date mnqdt; + + @TableField(exist = false) + private static final long serialVersionUID = 1L; +} \ No newline at end of file diff --git a/swlscx/src/main/java/com/ruoyi/swlscx/month/domain/po/HyMtqsE.java b/swlscx/src/main/java/com/ruoyi/swlscx/month/domain/po/HyMtqsE.java new file mode 100644 index 0000000..0bfde30 --- /dev/null +++ b/swlscx/src/main/java/com/ruoyi/swlscx/month/domain/po/HyMtqsE.java @@ -0,0 +1,66 @@ +package com.ruoyi.swlscx.month.domain.po; + +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 java.io.Serializable; +import java.math.BigDecimal; +import java.util.Date; +import lombok.Data; + +/** + * 月输沙率表 + * @TableName hy_mtqs_e + */ +@TableName(value ="hy_mtqs_e") +@Data +public class HyMtqsE implements Serializable { + /** + * 站码 + */ + private String stcd; + + /** + * 泥沙类型 + */ + private String sdtp; + + /** + * 年 + */ + private Integer yr; + + /** + * 月 + */ + private Integer mth; + + /** + * 平均输沙率(千克每秒) + */ + private BigDecimal avqs; + + /** + * 平均输沙率注解码 + */ + private String avqsrcd; + + /** + * 最大日平均沙率(千克每秒) + */ + private BigDecimal mxdyqs; + + /** + * 最大日平均沙率注解码 + */ + private String mxdyqsrcd; + + /** + * 最大日平均沙率出现日期 + */ + private Date mxdyqsodt; + + @TableField(exist = false) + private static final long serialVersionUID = 1L; +} \ No newline at end of file diff --git a/swlscx/src/main/java/com/ruoyi/swlscx/month/domain/po/HyMttdzE.java b/swlscx/src/main/java/com/ruoyi/swlscx/month/domain/po/HyMttdzE.java new file mode 100644 index 0000000..6c79dea --- /dev/null +++ b/swlscx/src/main/java/com/ruoyi/swlscx/month/domain/po/HyMttdzE.java @@ -0,0 +1,306 @@ +package com.ruoyi.swlscx.month.domain.po; + +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 java.io.Serializable; +import java.math.BigDecimal; +import java.util.Date; +import lombok.Data; + +/** + * + * @TableName hy_mttdz_e + */ +@TableName(value ="hy_mttdz_e") +@Data +public class HyMttdzE implements Serializable { + /** + * 站码 + */ + private String stcd; + + /** + * 年 + */ + private Integer yr; + + /** + * 月 + */ + private Integer mth; + + /** + * 平均高潮潮位 + */ + private BigDecimal avhtdz; + + /** + * 平均高潮潮位注解码 + */ + private String avhtdzrcd; + + /** + * 最高高潮位 + */ + private BigDecimal hthtdz; + + /** + * 最高高潮位注解码 + */ + private String hthtdzrcd; + + /** + * 最高高潮位出现时间 + */ + private Date hthtdzotm; + + /** + * 最低高潮位 + */ + private BigDecimal lthtdz; + + /** + * 最低高潮位注解码 + */ + private String lthtdzrcd; + + /** + * 最低高潮位出现时间 + */ + private Date lthtdzotm; + + /** + * 平均低潮潮位 + */ + private BigDecimal avltdz; + + /** + * 平均低潮潮位注解码 + */ + private String avltdzrcd; + + /** + * 最高低潮位 + */ + private BigDecimal htltdz; + + /** + * 最高低潮位注解码 + */ + private String htltdzrcd; + + /** + * 最高低潮潮位出现时间 + */ + private Date htltdzotm; + + /** + * 最低低潮位 + */ + private BigDecimal ltltdz; + + /** + * 最低低潮潮位注解码 + */ + private String ltltdzrcd; + + /** + * 最低地潮位出现时间 + */ + private Date ltltdzotm; + + /** + * 平均涨潮潮差 + */ + private BigDecimal avftdr; + + /** + * 平均涨潮潮差注解码 + */ + private String avftdrrcd; + + /** + * 最大涨潮潮差 + */ + private BigDecimal mxfltdr; + + /** + * 最大涨潮潮差注解码 + */ + private String mxfltdrrcd; + + /** + * 最大涨潮潮差（高潮）时间 + */ + private Date mxfltdrhtm; + + /** + * 最小潮潮差 + */ + private BigDecimal mnfltdr; + + /** + * 最小涨潮潮差注解码 + */ + private String mnfltdrrcd; + + /** + * 最小涨潮潮差（高潮）时间 + */ + private Date mnfltdrhtm; + + /** + * 平均涨潮潮差 + */ + private BigDecimal aver; + + /** + * 平均涨潮潮差注解码 + */ + private String averbbrrcd; + + /** + * 最大落潮潮差 + */ + private BigDecimal mxebtdr; + + /** + * 最大落潮潮差注解码 + */ + private String mxebtdrrcd; + + /** + * 最大落潮潮差(高潮)时间 + */ + private Date mxebtdrht; + + /** + * 最小落潮潮差 + */ + private BigDecimal mnebtdr; + + /** + * 最小落潮潮差注解码 + */ + private String mnebtdrrcd; + + /** + * 最小落潮潮差（高潮）时间 + */ + private Date mnebtdrhtm; + + /** + * 平均涨潮历时 + */ + private Integer avftd; + + /** + * 平均涨潮历时注解码 + */ + private String avftdrcd; + + /** + * 最长涨潮历时 + */ + private Integer mxfltddr; + + /** + * 最长涨潮历时注解码 + */ + private String mxfltddrrcd; + + /** + * 最长涨潮历时（高潮）时间 + */ + private Date mxfltddrhtm; + + /** + * 最短涨潮历时 + */ + private Integer mnfltddr; + + /** + * 最短涨潮历时注解码 + */ + private String mnfltddrrcd; + + /** + * 最短涨潮历时（高潮）时间 + */ + private Date mnfltddrhtm; + + /** + * 平均落潮历时 + */ + private Integer avebbdr; + + /** + * 平均落潮历时注解码 + */ + private String avedrc; + + /** + * 最长落潮历时 + */ + private Integer mxebtddr; + + /** + * 最长落潮历时注解码 + */ + private String mxebtddrrcd; + + /** + * 最长落潮历时（高潮）时间 + */ + private Date mxebtddrhtm; + + /** + * 最短落潮历时 + */ + private Integer mnbtddr; + + /** + * 最短落潮历时注解码 + */ + private String mnebtddrrcd; + + /** + * 最短落潮历时（高潮）时间 + */ + private Date mnebtddrhtm; + + /** + * 逐时平均潮位 + */ + private BigDecimal hravtdz; + + /** + * 逐时平均潮位注解码 + */ + private String hravtdzrcd; + + /** + * 平均潮差 + */ + private BigDecimal avtdr; + + /** + * 平均潮差注解码 + */ + private String avtdrrcd; + + /** + * 平均历时 + */ + private Integer avtddr; + + /** + * 平均历时注解码 + */ + private String avtddrrcd; + + @TableField(exist = false) + private static final long serialVersionUID = 1L; +} \ No newline at end of file diff --git a/swlscx/src/main/java/com/ruoyi/swlscx/month/domain/po/HyMtweE.java b/swlscx/src/main/java/com/ruoyi/swlscx/month/domain/po/HyMtweE.java new file mode 100644 index 0000000..b02d188 --- /dev/null +++ b/swlscx/src/main/java/com/ruoyi/swlscx/month/domain/po/HyMtweE.java @@ -0,0 +1,70 @@ +package com.ruoyi.swlscx.month.domain.po; + +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 java.io.Serializable; +import java.math.BigDecimal; +import lombok.Data; + +/** + * 月水面蒸发量表 + * @TableName hy_mtwe_e + */ +@TableName(value ="hy_mtwe_e") +@Data +public class HyMtweE implements Serializable { + /** + * 站码 + */ + private String stcd; + + /** + * 蒸发器型式 + */ + private String eetp; + + /** + * 年 + */ + private Integer yr; + + /** + * 月 + */ + private Integer mth; + + /** + * 水面蒸发量(毫米) + */ + private BigDecimal wsfe; + + /** + * 水面蒸发量注解码 + */ + private String wsfercd; + + /** + * 最大日水面蒸发量 + */ + private BigDecimal mxdye; + + /** + * 最大日水面蒸发量注解码 + */ + private String mxdyercd; + + /** + * 最小日水面蒸发量 + */ + private BigDecimal mndye; + + /** + * 最小日水面蒸发量注解码 + */ + private String mndyercd; + + @TableField(exist = false) + private static final long serialVersionUID = 1L; +} \ No newline at end of file diff --git a/swlscx/src/main/java/com/ruoyi/swlscx/month/domain/po/HyMtwtE.java b/swlscx/src/main/java/com/ruoyi/swlscx/month/domain/po/HyMtwtE.java new file mode 100644 index 0000000..8bbfec1 --- /dev/null +++ b/swlscx/src/main/java/com/ruoyi/swlscx/month/domain/po/HyMtwtE.java @@ -0,0 +1,76 @@ +package com.ruoyi.swlscx.month.domain.po; + +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 java.io.Serializable; +import java.math.BigDecimal; +import java.util.Date; +import lombok.Data; + +/** + * 月水温表字段定义 + * @TableName hy_mtwt_e + */ +@TableName(value ="hy_mtwt_e") +@Data +public class HyMtwtE implements Serializable { + /** + * 站码 + */ + private String stcd; + + /** + * 年 + */ + private Integer yr; + + /** + * 月 + */ + private Integer mth; + + /** + * 平均水温(摄氏度) + */ + private BigDecimal avwtmp; + + /** + * 平均水温注解码 + */ + private String avwtmprcd; + + /** + * 最高水温(摄氏度) + */ + private BigDecimal mxwtmp; + + /** + * 最高水温注解码 + */ + private String mxwtmprcd; + + /** + * 最高水温日期 + */ + private Date mxwtmpdt; + + /** + * 最低水温(摄氏度) + */ + private BigDecimal mnwtmp; + + /** + * 最低水温注解码 + */ + private String mnwtmprcd; + + /** + * 最低水温日期 + */ + private Date mnwtmpdt; + + @TableField(exist = false) + private static final long serialVersionUID = 1L; +} \ No newline at end of file diff --git a/swlscx/src/main/java/com/ruoyi/swlscx/month/domain/po/HyMtzE.java b/swlscx/src/main/java/com/ruoyi/swlscx/month/domain/po/HyMtzE.java new file mode 100644 index 0000000..3f008b2 --- /dev/null +++ b/swlscx/src/main/java/com/ruoyi/swlscx/month/domain/po/HyMtzE.java @@ -0,0 +1,292 @@ +package com.ruoyi.swlscx.month.domain.po; + + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import java.io.Serializable; +import java.math.BigDecimal; +import java.util.Date; + +/** + * + * @TableName 月水位表 + */ +@TableName(value ="hy_mtz_e") +public class HyMtzE implements Serializable { + /** + * 站码 + */ + private String stcd; + + /** + * 年 + */ + private Integer yr; + + /** + * 月 + */ + private Integer mth; + + /** + * 平均水位 + */ + private BigDecimal avz; + + /** + * 平均水位注解码 + */ + private String avzrcd; + + /** + * 最高水位 + */ + private BigDecimal htz; + + /** + * 最高水位注解码 + */ + private String htzrcd; + + /** + * 最高水位日期 + */ + private Date htzdt; + + /** + * 最低水位 + */ + private BigDecimal mnz; + + /** + * 最低水位注解码 + */ + private String mnzrcd; + + /** + * 最低水位日期 + */ + private Date mnzdt; + + @TableField(exist = false) + private static final long serialVersionUID = 1L; + + /** + * 站码 + */ + public String getStcd() { + return stcd; + } + + /** + * 站码 + */ + public void setStcd(String stcd) { + this.stcd = stcd; + } + + /** + * 年 + */ + public Integer getYr() { + return yr; + } + + /** + * 年 + */ + public void setYr(Integer yr) { + this.yr = yr; + } + + /** + * 月 + */ + public Integer getMth() { + return mth; + } + + /** + * 月 + */ + public void setMth(Integer mth) { + this.mth = mth; + } + + /** + * 平均水位 + */ + public BigDecimal getAvz() { + return avz; + } + + /** + * 平均水位 + */ + public void setAvz(BigDecimal avz) { + this.avz = avz; + } + + /** + * 平均水位注解码 + */ + public String getAvzrcd() { + return avzrcd; + } + + /** + * 平均水位注解码 + */ + public void setAvzrcd(String avzrcd) { + this.avzrcd = avzrcd; + } + + /** + * 最高水位 + */ + public BigDecimal getHtz() { + return htz; + } + + /** + * 最高水位 + */ + public void setHtz(BigDecimal htz) { + this.htz = htz; + } + + /** + * 最高水位注解码 + */ + public String getHtzrcd() { + return htzrcd; + } + + /** + * 最高水位注解码 + */ + public void setHtzrcd(String htzrcd) { + this.htzrcd = htzrcd; + } + + /** + * 最高水位日期 + */ + public Date getHtzdt() { + return htzdt; + } + + /** + * 最高水位日期 + */ + public void setHtzdt(Date htzdt) { + this.htzdt = htzdt; + } + + /** + * 最低水位 + */ + public BigDecimal getMnz() { + return mnz; + } + + /** + * 最低水位 + */ + public void setMnz(BigDecimal mnz) { + this.mnz = mnz; + } + + /** + * 最低水位注解码 + */ + public String getMnzrcd() { + return mnzrcd; + } + + /** + * 最低水位注解码 + */ + public void setMnzrcd(String mnzrcd) { + this.mnzrcd = mnzrcd; + } + + /** + * 最低水位日期 + */ + public Date getMnzdt() { + return mnzdt; + } + + /** + * 最低水位日期 + */ + public void setMnzdt(Date mnzdt) { + this.mnzdt = mnzdt; + } + + @Override + public boolean equals(Object that) { + if (this == that) { + return true; + } + if (that == null) { + return false; + } + if (getClass() != that.getClass()) { + return false; + } + HyMtzE other = (HyMtzE) that; + return (this.getStcd() == null ? other.getStcd() == null : this.getStcd().equals(other.getStcd())) + && (this.getYr() == null ? other.getYr() == null : this.getYr().equals(other.getYr())) + && (this.getMth() == null ? other.getMth() == null : this.getMth().equals(other.getMth())) + && (this.getAvz() == null ? other.getAvz() == null : this.getAvz().equals(other.getAvz())) + && (this.getAvzrcd() == null ? other.getAvzrcd() == null : this.getAvzrcd().equals(other.getAvzrcd())) + && (this.getHtz() == null ? other.getHtz() == null : this.getHtz().equals(other.getHtz())) + && (this.getHtzrcd() == null ? other.getHtzrcd() == null : this.getHtzrcd().equals(other.getHtzrcd())) + && (this.getHtzdt() == null ? other.getHtzdt() == null : this.getHtzdt().equals(other.getHtzdt())) + && (this.getMnz() == null ? other.getMnz() == null : this.getMnz().equals(other.getMnz())) + && (this.getMnzrcd() == null ? other.getMnzrcd() == null : this.getMnzrcd().equals(other.getMnzrcd())) + && (this.getMnzdt() == null ? other.getMnzdt() == null : this.getMnzdt().equals(other.getMnzdt())); + } + + @Override + public int hashCode() { + final int prime = 31; + int result = 1; + result = prime * result + ((getStcd() == null) ? 0 : getStcd().hashCode()); + result = prime * result + ((getYr() == null) ? 0 : getYr().hashCode()); + result = prime * result + ((getMth() == null) ? 0 : getMth().hashCode()); + result = prime * result + ((getAvz() == null) ? 0 : getAvz().hashCode()); + result = prime * result + ((getAvzrcd() == null) ? 0 : getAvzrcd().hashCode()); + result = prime * result + ((getHtz() == null) ? 0 : getHtz().hashCode()); + result = prime * result + ((getHtzrcd() == null) ? 0 : getHtzrcd().hashCode()); + result = prime * result + ((getHtzdt() == null) ? 0 : getHtzdt().hashCode()); + result = prime * result + ((getMnz() == null) ? 0 : getMnz().hashCode()); + result = prime * result + ((getMnzrcd() == null) ? 0 : getMnzrcd().hashCode()); + result = prime * result + ((getMnzdt() == null) ? 0 : getMnzdt().hashCode()); + return result; + } + + @Override + public String toString() { + StringBuilder sb = new StringBuilder(); + sb.append(getClass().getSimpleName()); + sb.append(" ["); + sb.append("Hash = ").append(hashCode()); + sb.append(", stcd=").append(stcd); + sb.append(", yr=").append(yr); + sb.append(", mth=").append(mth); + sb.append(", avz=").append(avz); + sb.append(", avzrcd=").append(avzrcd); + sb.append(", htz=").append(htz); + sb.append(", htzrcd=").append(htzrcd); + sb.append(", htzdt=").append(htzdt); + sb.append(", mnz=").append(mnz); + sb.append(", mnzrcd=").append(mnzrcd); + sb.append(", mnzdt=").append(mnzdt); + sb.append(", serialVersionUID=").append(serialVersionUID); + sb.append("]"); + return sb.toString(); + } +} \ No newline at end of file diff --git a/swlscx/src/main/java/com/ruoyi/swlscx/month/domain/vo/HyMptEVo.java b/swlscx/src/main/java/com/ruoyi/swlscx/month/domain/vo/HyMptEVo.java new file mode 100644 index 0000000..15dc337 --- /dev/null +++ b/swlscx/src/main/java/com/ruoyi/swlscx/month/domain/vo/HyMptEVo.java @@ -0,0 +1,39 @@ +package com.ruoyi.swlscx.month.domain.vo; + +import lombok.Data; + +/** + * @Author al + * @Date 2024/7/31 14:50 + * @Description: TODO + * @Version + */ + +@Data +public class HyMptEVo { + + private String stcd; + + private String stnm; + + private String addvcd; + + private String yr; + + private String mth; + + private String p; + + private String prcd; + + private String pdynum; + + private String pdynumrcd; + + private String mxdyp; + + private String mxdyprcd; + + private String mxdypodt; + +} diff --git a/swlscx/src/main/java/com/ruoyi/swlscx/month/domain/vo/HyMtcsEVo.java b/swlscx/src/main/java/com/ruoyi/swlscx/month/domain/vo/HyMtcsEVo.java new file mode 100644 index 0000000..b63f3f8 --- /dev/null +++ b/swlscx/src/main/java/com/ruoyi/swlscx/month/domain/vo/HyMtcsEVo.java @@ -0,0 +1,87 @@ +package com.ruoyi.swlscx.month.domain.vo; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + +import java.io.Serializable; +import java.math.BigDecimal; +import java.util.Date; + +/** + * 月含沙量表 + * @TableName hy_mtcs_e + */ +@Data +public class HyMtcsEVo implements Serializable { + /** + * 站码 + */ + private String stcd; + + /** + * 年 + */ + private Integer yr; + + /** + * 月 + */ + private Integer mth; + + /** + * 平均含沙量(千克每立方米) + */ + private BigDecimal avcs; + + /** + * 平均含沙量注解码 + */ + private String avcsrcd; + + /** + * 最大含沙量(千克每立方米) + */ + private BigDecimal mxs; + + /** + * 最大含沙量注解码 + */ + private String mxsrcd; + + /** + * 最大含沙量日期 + */ + private String mxsdt; + + /** + * 最小含沙量(千克每立方米) + */ + private BigDecimal mns; + + /** + * 最小含沙量注解码 + */ + private String mnsrcd; + + /** + * 最小含沙量日期 + */ + private String mnsdt; + + /** + * 流域水系码 + */ + private String lysxm; + + /**站名**/ + private String stnm; + + /** + * 行政区划码 + */ + private String addvcd; + + + private static final long serialVersionUID = 1L; +} \ No newline at end of file diff --git a/swlscx/src/main/java/com/ruoyi/swlscx/month/domain/vo/HyMtpEVo.java b/swlscx/src/main/java/com/ruoyi/swlscx/month/domain/vo/HyMtpEVo.java new file mode 100644 index 0000000..3f0c35c --- /dev/null +++ b/swlscx/src/main/java/com/ruoyi/swlscx/month/domain/vo/HyMtpEVo.java @@ -0,0 +1,85 @@ +package com.ruoyi.swlscx.month.domain.vo; + +import com.alibaba.excel.annotation.ExcelProperty; +import com.baomidou.mybatisplus.annotation.TableField; +import lombok.Data; + +import java.math.BigDecimal; +import java.util.Date; + +/** + * + * @Author al + * @Date 2024/8/1 10:24 + * @Description: TODO + * @Version + */ + +@Data +public class HyMtpEVo { + + /** + * 站码 + */ + private String stcd; + + + /**站名**/ + private String stnm; + + /** + * 年 + */ + private Integer yr; + + /** + * 行政区划码 + */ + private String addvcd; + + /** + * 月 + */ + private Integer mth; + + /** + * 降水量(毫米) + */ + private BigDecimal p; + + /** + * 降水量注解码 + */ + private String prcd; + + /** + * 降水日数 + */ + private String pdynum; + + /** + * 降水日数注解码 + */ + private String pdynumrcd; + + /** + * 最大降水量(毫米) + */ + private BigDecimal mxdyp; + + /** + * 最大降水量注解码 + */ + private String mxdyprcd; + + /** + * 最大日降水量出现日期 + */ + private Date mxdypodt; + + /** + * 流域水系码 + */ + private String lysxm; + +} diff --git a/swlscx/src/main/java/com/ruoyi/swlscx/month/domain/vo/HyMtqEVo.java b/swlscx/src/main/java/com/ruoyi/swlscx/month/domain/vo/HyMtqEVo.java new file mode 100644 index 0000000..0f94d65 --- /dev/null +++ b/swlscx/src/main/java/com/ruoyi/swlscx/month/domain/vo/HyMtqEVo.java @@ -0,0 +1,86 @@ +package com.ruoyi.swlscx.month.domain.vo; + +import com.alibaba.excel.annotation.ExcelProperty; +import lombok.Data; + +import java.io.Serializable; + +/** + * 月流量表 + * @TableName hy_mtq_e + */ +@Data +public class HyMtqEVo implements Serializable { + /** + * 站码 + */ + private String stcd; + + /** + * 年 + */ + private String yr; + + /** + * 月 + */ + private String mth; + + /** + * 平均流量 + */ + private String avq; + + /** + * 平均流量注解码 + */ + private String avqrcd; + + /** + * 最高流量 + */ + private String mxq; + + /** + * 最高流量注解码 + */ + private String mxqrcd; + + /** + * 最高流量日期 + */ + private String mxqdt; + + /** + * 最小流量 + */ + private String mnq; + + /** + * 最小流量注解码 + */ + private String mnqrcd; + + /** + * 最小流量日期 + */ + private String mnqdt; + + + /** + * 站名 + */ + private String stnm; + + + private String addvcd; + + + /** + * 流域水系码 + */ + private String lysxm; + + + private static final long serialVersionUID = 1L; +} \ No newline at end of file diff --git a/swlscx/src/main/java/com/ruoyi/swlscx/month/domain/vo/HyMtqsEVo.java b/swlscx/src/main/java/com/ruoyi/swlscx/month/domain/vo/HyMtqsEVo.java new file mode 100644 index 0000000..7a4ce72 --- /dev/null +++ b/swlscx/src/main/java/com/ruoyi/swlscx/month/domain/vo/HyMtqsEVo.java @@ -0,0 +1,79 @@ +package com.ruoyi.swlscx.month.domain.vo; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + +import java.io.Serializable; +import java.math.BigDecimal; +import java.util.Date; + +/** + * 月输沙率表 + * @TableName hy_mtqs_e + */ +@TableName(value ="hy_mtqs_e") +@Data +public class HyMtqsEVo implements Serializable { + /** + * 站码 + */ + private String stcd; + + /** + * 泥沙类型 + */ + private String sdtp; + + /** + * 年 + */ + private Integer yr; + + /** + * 月 + */ + private Integer mth; + + /** + * 平均输沙率(千克每秒) + */ + private BigDecimal avqs; + + /** + * 平均输沙率注解码 + */ + private String avqsrcd; + + /** + * 最大日平均沙率(千克每秒) + */ + private BigDecimal mxdyqs; + + /** + * 最大日平均沙率注解码 + */ + private String mxdyqsrcd; + + /** + * 最大日平均沙率出现日期 + */ + private String mxdyqsodt; + + + /** + * 站名 + */ + private String stnm; + + + private String addvcd; + + + /** + * 流域水系码 + */ + private String lysxm; + + private static final long serialVersionUID = 1L; +} \ No newline at end of file diff --git a/swlscx/src/main/java/com/ruoyi/swlscx/month/domain/vo/HyMttdzEVo.java b/swlscx/src/main/java/com/ruoyi/swlscx/month/domain/vo/HyMttdzEVo.java new file mode 100644 index 0000000..823130b --- /dev/null +++ b/swlscx/src/main/java/com/ruoyi/swlscx/month/domain/vo/HyMttdzEVo.java @@ -0,0 +1,317 @@ +package com.ruoyi.swlscx.month.domain.vo; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + +import java.io.Serializable; +import java.math.BigDecimal; +import java.util.Date; + +/** + * + * @TableName hy_mttdz_e + */ +@Data +public class HyMttdzEVo implements Serializable { + /** + * 站码 + */ + private String stcd; + + /** + * 年 + */ + private Integer yr; + + /** + * 月 + */ + private Integer mth; + + /** + * 平均高潮潮位 + */ + private BigDecimal avhtdz; + + /** + * 平均高潮潮位注解码 + */ + private String avhtdzrcd; + + /** + * 最高高潮位 + */ + private BigDecimal hthtdz; + + /** + * 最高高潮位注解码 + */ + private String hthtdzrcd; + + /** + * 最高高潮位出现时间 + */ + private String hthtdzotm; + + /** + * 最低高潮位 + */ + private BigDecimal lthtdz; + + /** + * 最低高潮位注解码 + */ + private String lthtdzrcd; + + /** + * 最低高潮位出现时间 + */ + private String lthtdzotm; + + /** + * 平均低潮潮位 + */ + private BigDecimal avltdz; + + /** + * 平均低潮潮位注解码 + */ + private String avltdzrcd; + + /** + * 最高低潮位 + */ + private BigDecimal htltdz; + + /** + * 最高低潮位注解码 + */ + private String htltdzrcd; + + /** + * 最高低潮潮位出现时间 + */ + private String htltdzotm; + + /** + * 最低低潮位 + */ + private BigDecimal ltltdz; + + /** + * 最低低潮潮位注解码 + */ + private String ltltdzrcd; + + /** + * 最低地潮位出现时间 + */ + private String ltltdzotm; + + /** + * 平均涨潮潮差 + */ + private BigDecimal avftdr; + + /** + * 平均涨潮潮差注解码 + */ + private String avftdrrcd; + + /** + * 最大涨潮潮差 + */ + private BigDecimal mxfltdr; + + /** + * 最大涨潮潮差注解码 + */ + private String mxfltdrrcd; + + /** + * 最大涨潮潮差（高潮）时间 + */ + private String mxfltdrhtm; + + /** + * 最小潮潮差 + */ + private BigDecimal mnfltdr; + + /** + * 最小涨潮潮差注解码 + */ + private String mnfltdrrcd; + + /** + * 最小涨潮潮差（高潮）时间 + */ + private String mnfltdrhtm; + + /** + * 平均涨潮潮差 + */ + private BigDecimal aver; + + /** + * 平均涨潮潮差注解码 + */ + private String averbbrrcd; + + /** + * 最大落潮潮差 + */ + private BigDecimal mxebtdr; + + /** + * 最大落潮潮差注解码 + */ + private String mxebtdrrcd; + + /** + * 最大落潮潮差(高潮)时间 + */ + private String mxebtdrht; + + /** + * 最小落潮潮差 + */ + private BigDecimal mnebtdr; + + /** + * 最小落潮潮差注解码 + */ + private String mnebtdrrcd; + + /** + * 最小落潮潮差（高潮）时间 + */ + private String mnebtdrhtm; + + /** + * 平均涨潮历时 + */ + private Integer avftd; + + /** + * 平均涨潮历时注解码 + */ + private String avftdrcd; + + /** + * 最长涨潮历时 + */ + private Integer mxfltddr; + + /** + * 最长涨潮历时注解码 + */ + private String mxfltddrrcd; + + /** + * 最长涨潮历时（高潮）时间 + */ + private String mxfltddrhtm; + + /** + * 最短涨潮历时 + */ + private Integer mnfltddr; + + /** + * 最短涨潮历时注解码 + */ + private String mnfltddrrcd; + + /** + * 最短涨潮历时（高潮）时间 + */ + private String mnfltddrhtm; + + /** + * 平均落潮历时 + */ + private Integer avebbdr; + + /** + * 平均落潮历时注解码 + */ + private String avedrc; + + /** + * 最长落潮历时 + */ + private Integer mxebtddr; + + /** + * 最长落潮历时注解码 + */ + private String mxebtddrrcd; + + /** + * 最长落潮历时（高潮）时间 + */ + private String mxebtddrhtm; + + /** + * 最短落潮历时 + */ + private Integer mnbtddr; + + /** + * 最短落潮历时注解码 + */ + private String mnebtddrrcd; + + /** + * 最短落潮历时（高潮）时间 + */ + private String mnebtddrhtm; + + /** + * 逐时平均潮位 + */ + private BigDecimal hravtdz; + + /** + * 逐时平均潮位注解码 + */ + private String hravtdzrcd; + + /** + * 平均潮差 + */ + private BigDecimal avtdr; + + /** + * 平均潮差注解码 + */ + private String avtdrrcd; + + /** + * 平均历时 + */ + private Integer avtddr; + + /** + * 平均历时注解码 + */ + private String avtddrrcd; + + /** + * 站名 + */ + private String stnm; + + + private String addvcd; + + + /** + * 流域水系码 + */ + private String lysxm; + + private static final long serialVersionUID = 1L; +} \ No newline at end of file diff --git a/swlscx/src/main/java/com/ruoyi/swlscx/month/domain/vo/HyMtweEVo.java b/swlscx/src/main/java/com/ruoyi/swlscx/month/domain/vo/HyMtweEVo.java new file mode 100644 index 0000000..bae855b --- /dev/null +++ b/swlscx/src/main/java/com/ruoyi/swlscx/month/domain/vo/HyMtweEVo.java @@ -0,0 +1,81 @@ +package com.ruoyi.swlscx.month.domain.vo; + +import lombok.Data; + +import java.math.BigDecimal; + +/** + * 月水面蒸发量表 + * @Author al + * @Date 2024/8/27 10:13 + * @Description: TODO + * @Version + */ + +@Data +public class HyMtweEVo { + + /** + * 站码 + */ + private String stcd; + + /** + * 蒸发器型式 + */ + private String eetp; + + /** + * 年 + */ + private Integer yr; + + /** + * 月 + */ + private Integer mth; + + /** + * 水面蒸发量(毫米) + */ + private BigDecimal wsfe; + + /** + * 水面蒸发量注解码 + */ + private String wsfercd; + + /** + * 最大日水面蒸发量 + */ + private BigDecimal mxdye; + + /** + * 最大日水面蒸发量注解码 + */ + private String mxdyercd; + + /** + * 最小日水面蒸发量 + */ + private BigDecimal mndye; + + /** + * 最小日水面蒸发量注解码 + */ + private String mndyercd; + + /** + * 行政区划码 + */ + private String addvcd; + + /** + * 流域水系码 + */ + private String lysxm; + + + /**站名**/ + private String stnm; +} diff --git a/swlscx/src/main/java/com/ruoyi/swlscx/month/domain/vo/HyMtwtEVo.java b/swlscx/src/main/java/com/ruoyi/swlscx/month/domain/vo/HyMtwtEVo.java new file mode 100644 index 0000000..4f90214 --- /dev/null +++ b/swlscx/src/main/java/com/ruoyi/swlscx/month/domain/vo/HyMtwtEVo.java @@ -0,0 +1,89 @@ +package com.ruoyi.swlscx.month.domain.vo; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + +import java.io.Serializable; +import java.math.BigDecimal; +import java.util.Date; + +/** + * 月水温表字段定义 + * @TableName hy_mtwt_e + */ +@Data +public class HyMtwtEVo implements Serializable { + /** + * 站码 + */ + private String stcd; + + /** + * 年 + */ + private Integer yr; + + /** + * 月 + */ + private Integer mth; + + /** + * 平均水温(摄氏度) + */ + private BigDecimal avwtmp; + + /** + * 平均水温注解码 + */ + private String avwtmprcd; + + /** + * 最高水温(摄氏度) + */ + private BigDecimal mxwtmp; + + /** + * 最高水温注解码 + */ + private String mxwtmprcd; + + /** + * 最高水温日期 + */ + private String mxwtmpdt; + + /** + * 最低水温(摄氏度) + */ + private BigDecimal mnwtmp; + + /** + * 最低水温注解码 + */ + private String mnwtmprcd; + + /** + * 最低水温日期 + */ + private String mnwtmpdt; + + + + /** + * 行政区划码 + */ + private String addvcd; + + /** + * 流域水系码 + */ + private String lysxm; + + + /**站名**/ + private String stnm; + + private static final long serialVersionUID = 1L; +} \ No newline at end of file diff --git a/swlscx/src/main/java/com/ruoyi/swlscx/month/domain/vo/HyMtzEVo.java b/swlscx/src/main/java/com/ruoyi/swlscx/month/domain/vo/HyMtzEVo.java new file mode 100644 index 0000000..15b1677 --- /dev/null +++ b/swlscx/src/main/java/com/ruoyi/swlscx/month/domain/vo/HyMtzEVo.java @@ -0,0 +1,87 @@ +package com.ruoyi.swlscx.month.domain.vo; + + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + +import java.io.Serializable; +import java.math.BigDecimal; +import java.util.Date; + +/** + * + * @TableName 月水位表 + */ +@Data +public class HyMtzEVo { + /** + * 站码 + */ + private String stcd; + + /** + * 年 + */ + private Integer yr; + + /** + * 月 + */ + private Integer mth; + + /** + * 平均水位 + */ + private BigDecimal avz; + + /** + * 平均水位注解码 + */ + private String avzrcd; + + /** + * 最高水位 + */ + private BigDecimal htz; + + /** + * 最高水位注解码 + */ + private String htzrcd; + + /** + * 最高水位日期 + */ + private String htzdt; + + /** + * 最低水位 + */ + private BigDecimal mnz; + + /** + * 最低水位注解码 + */ + private String mnzrcd; + + /** + * 最低水位日期 + */ + private String mnzdt; + + + /** + * 行政区划码 + */ + private String addvcd; + + /** + * 流域水系码 + */ + private String lysxm; + + + /**站名**/ + private String stnm; +} \ No newline at end of file diff --git a/swlscx/src/main/java/com/ruoyi/swlscx/month/mapper/HyMtchpdEMapper.java b/swlscx/src/main/java/com/ruoyi/swlscx/month/mapper/HyMtchpdEMapper.java new file mode 100644 index 0000000..de0ee30 --- /dev/null +++ b/swlscx/src/main/java/com/ruoyi/swlscx/month/mapper/HyMtchpdEMapper.java @@ -0,0 +1,20 @@ +package com.ruoyi.swlscx.month.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.ruoyi.swlscx.month.domain.po.HyMtchpdE; +import org.apache.ibatis.annotations.Mapper; + +/** +* @author 12974 +* @description 针对表【hy_mtchpd_e(月泥沙特征粒径表字段定义)】的数据库操作Mapper +* @createDate 2024-08-06 13:42:04 +* @Entity com.ruoyi.swlscx.domain.po.HyMtchpdE +*/ +@Mapper +public interface HyMtchpdEMapper extends BaseMapper { + +} + + + + diff --git a/swlscx/src/main/java/com/ruoyi/swlscx/month/mapper/HyMtcsEMapper.java b/swlscx/src/main/java/com/ruoyi/swlscx/month/mapper/HyMtcsEMapper.java new file mode 100644 index 0000000..510b67e --- /dev/null +++ b/swlscx/src/main/java/com/ruoyi/swlscx/month/mapper/HyMtcsEMapper.java @@ -0,0 +1,34 @@ +package com.ruoyi.swlscx.month.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.ruoyi.swlscx.month.domain.po.HyMtcsE; +import com.ruoyi.swlscx.month.domain.vo.HyMtcsEVo; +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; + +import java.util.List; +import java.util.Map; + +/** +* @author 12974 +* @description 针对表【hy_mtcs_e(月含沙量表)】的数据库操作Mapper +* @createDate 2024-08-05 14:26:28 +* @Entity com.ruoyi.swlscx.domain.po.HyMtcsE +*/ +@Mapper +public interface HyMtcsEMapper extends BaseMapper { + + IPage selectHyMtcsEDataByPageAndInfo(Page page,@Param("map") Map map); + + void deleteTempData(); + + void insertTempData(List batch); + + void mergeToData(); +} + + + + diff --git a/swlscx/src/main/java/com/ruoyi/swlscx/month/mapper/HyMtiqEMapper.java b/swlscx/src/main/java/com/ruoyi/swlscx/month/mapper/HyMtiqEMapper.java new file mode 100644 index 0000000..f04defc --- /dev/null +++ b/swlscx/src/main/java/com/ruoyi/swlscx/month/mapper/HyMtiqEMapper.java @@ -0,0 +1,20 @@ +package com.ruoyi.swlscx.month.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.ruoyi.swlscx.month.domain.po.HyMtiqE; +import org.apache.ibatis.annotations.Mapper; + +/** +* @author 12974 +* @description 针对表【hy_mtiq_e(月冰流量表)】的数据库操作Mapper +* @createDate 2024-08-06 13:42:04 +* @Entity com.ruoyi.swlscx.domain.po.HyMtiqE +*/ +@Mapper +public interface HyMtiqEMapper extends BaseMapper { + +} + + + + diff --git a/swlscx/src/main/java/com/ruoyi/swlscx/month/mapper/HyMtpEMapper.java b/swlscx/src/main/java/com/ruoyi/swlscx/month/mapper/HyMtpEMapper.java new file mode 100644 index 0000000..d2c6ac1 --- /dev/null +++ b/swlscx/src/main/java/com/ruoyi/swlscx/month/mapper/HyMtpEMapper.java @@ -0,0 +1,39 @@ +package com.ruoyi.swlscx.month.mapper; + + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.ruoyi.swlscx.month.domain.po.HyMtpE; +import com.ruoyi.swlscx.month.domain.vo.HyMptEVo; +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; + +import java.util.List; +import java.util.Map; + +/** +* @author 12974 +* @description 针对表【hy_mtp_e(月降水表)】的数据库操作Mapper +* @createDate 2024-07-23 14:15:25 +* @Entity com/ruoyi/swlscx/domain/po.po.HyMtpE +*/ +@Mapper +public interface HyMtpEMapper extends BaseMapper { + + /**查询月降水表数据**/ + IPage selectHyMtpDataByPageAndInfo(Page page,@Param("map") Map map); + + /**查询月降水表数据**/ + List selectHyMtpData(@Param("map") Map map); + + void deleteTempData(); + + void insertTempData(@Param("list") List batch); + + void mergeToData(); +} + + + + diff --git a/swlscx/src/main/java/com/ruoyi/swlscx/month/mapper/HyMtpddbEMapper.java b/swlscx/src/main/java/com/ruoyi/swlscx/month/mapper/HyMtpddbEMapper.java new file mode 100644 index 0000000..31a51d9 --- /dev/null +++ b/swlscx/src/main/java/com/ruoyi/swlscx/month/mapper/HyMtpddbEMapper.java @@ -0,0 +1,20 @@ +package com.ruoyi.swlscx.month.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.ruoyi.swlscx.month.domain.po.HyMtpddbE; +import org.apache.ibatis.annotations.Mapper; + +/** +* @author 12974 +* @description 针对表【hy_mtpddb_e(月平均泥沙颗粒级配表)】的数据库操作Mapper +* @createDate 2024-08-06 13:42:04 +* @Entity com.ruoyi.swlscx.domain.po.HyMtpddbE +*/ +@Mapper +public interface HyMtpddbEMapper extends BaseMapper { + +} + + + + diff --git a/swlscx/src/main/java/com/ruoyi/swlscx/month/mapper/HyMtqEMapper.java b/swlscx/src/main/java/com/ruoyi/swlscx/month/mapper/HyMtqEMapper.java new file mode 100644 index 0000000..8e7e0fe --- /dev/null +++ b/swlscx/src/main/java/com/ruoyi/swlscx/month/mapper/HyMtqEMapper.java @@ -0,0 +1,35 @@ +package com.ruoyi.swlscx.month.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.ruoyi.swlscx.month.domain.po.HyMtqE; +import com.ruoyi.swlscx.month.domain.vo.HyMtqEVo; +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; + +import java.util.List; +import java.util.Map; + +/** +* @author 12974 +* @description 针对表【hy_mtq_e(月流量表)】的数据库操作Mapper +* @createDate 2024-08-04 12:45:25 +* @Entity com.ruoyi.swlscx.domain.po.HyMtqE +*/ +@Mapper +public interface HyMtqEMapper extends BaseMapper { + + + IPage selectHyMtqEPageByInfo(Page page,@Param("map") Map map); + + void deleteTempData(); + + void insertTempData(@Param("list") List batch); + + void mergeToData(); +} + + + + diff --git a/swlscx/src/main/java/com/ruoyi/swlscx/month/mapper/HyMtqsEMapper.java b/swlscx/src/main/java/com/ruoyi/swlscx/month/mapper/HyMtqsEMapper.java new file mode 100644 index 0000000..bbdad08 --- /dev/null +++ b/swlscx/src/main/java/com/ruoyi/swlscx/month/mapper/HyMtqsEMapper.java @@ -0,0 +1,34 @@ +package com.ruoyi.swlscx.month.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.ruoyi.swlscx.month.domain.po.HyMtqsE; +import com.ruoyi.swlscx.month.domain.vo.HyMtqsEVo; +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; + +import java.util.List; +import java.util.Map; + +/** +* @author 12974 +* @description 针对表【hy_mtqs_e(月输沙率表)】的数据库操作Mapper +* @createDate 2024-08-05 16:03:07 +* @Entity com.ruoyi.swlscx.domain.po.HyMtqsE +*/ +@Mapper +public interface HyMtqsEMapper extends BaseMapper { + + IPage selectHyMtqsEByPageAndInfo(Page page,@Param("map") Map map); + + void deleteTempData(); + + void insertTempData(@Param("list") List batch); + + void mergeToData(); +} + + + + diff --git a/swlscx/src/main/java/com/ruoyi/swlscx/month/mapper/HyMttdzEMapper.java b/swlscx/src/main/java/com/ruoyi/swlscx/month/mapper/HyMttdzEMapper.java new file mode 100644 index 0000000..00537d4 --- /dev/null +++ b/swlscx/src/main/java/com/ruoyi/swlscx/month/mapper/HyMttdzEMapper.java @@ -0,0 +1,27 @@ +package com.ruoyi.swlscx.month.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.ruoyi.swlscx.month.domain.po.HyMttdzE; +import com.ruoyi.swlscx.month.domain.vo.HyMttdzEVo; +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; + +import java.util.Map; + +/** +* @author 12974 +* @description 针对表【hy_mttdz_e】的数据库操作Mapper +* @createDate 2024-08-04 12:45:25 +* @Entity com.ruoyi.swlscx.domain.po.HyMttdzE +*/ +@Mapper +public interface HyMttdzEMapper extends BaseMapper { + + IPage selectHyMttdzListPageByInfo(Page page, @Param("map") Map map); +} + + + + diff --git a/swlscx/src/main/java/com/ruoyi/swlscx/month/mapper/HyMtweEMapper.java b/swlscx/src/main/java/com/ruoyi/swlscx/month/mapper/HyMtweEMapper.java new file mode 100644 index 0000000..4dc9618 --- /dev/null +++ b/swlscx/src/main/java/com/ruoyi/swlscx/month/mapper/HyMtweEMapper.java @@ -0,0 +1,37 @@ +package com.ruoyi.swlscx.month.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.ruoyi.swlscx.month.domain.po.HyMtweE; +import com.ruoyi.swlscx.month.domain.vo.HyMtweEVo; +import com.ruoyi.swlscx.year.domain.po.HyHmxpF; +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; + +import java.util.List; +import java.util.Map; + +/** +* @author 12974 +* @description 针对表【hy_mtwe_e(月水面蒸发量表)】的数据库操作Mapper +* @createDate 2024-08-01 09:38:45 +* @Entity com.ruoyi.swlscx.domain.po.HyMtweE +*/ +@Mapper +public interface HyMtweEMapper extends BaseMapper { + + + /**查询月水面蒸发量表数据**/ + IPage selectHyMtweEListPageByInfo(Page page, @Param("map") Map map); + + void deleteTempData(); + + void insertTempData(@Param("list") List batch); + + void mergeToData(); +} + + + + diff --git a/swlscx/src/main/java/com/ruoyi/swlscx/month/mapper/HyMtwtEMapper.java b/swlscx/src/main/java/com/ruoyi/swlscx/month/mapper/HyMtwtEMapper.java new file mode 100644 index 0000000..5b47910 --- /dev/null +++ b/swlscx/src/main/java/com/ruoyi/swlscx/month/mapper/HyMtwtEMapper.java @@ -0,0 +1,37 @@ +package com.ruoyi.swlscx.month.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.ruoyi.swlscx.month.domain.po.HyMtwtE; +import com.ruoyi.swlscx.month.domain.vo.HyMtwtEVo; +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; + +import java.util.List; +import java.util.Map; + +/** +* @author 12974 +* @description 针对表【hy_mtwt_e(月水温表字段定义)】的数据库操作Mapper +* @createDate 2024-08-06 13:42:04 +* @Entity com.ruoyi.swlscx.domain.po.HyMtwtE +*/ +@Mapper +public interface HyMtwtEMapper extends BaseMapper { + + /** + * 查询月水温表数据 + */ + IPage selectHyMtzEListPageByInfo(Page page, @Param("map") Map map); + + void deleteTempData(); + + void insertTempData(List batch); + + void mergeToData(); +} + + + + diff --git a/swlscx/src/main/java/com/ruoyi/swlscx/month/mapper/HyMtzEMapper.java b/swlscx/src/main/java/com/ruoyi/swlscx/month/mapper/HyMtzEMapper.java new file mode 100644 index 0000000..f10473f --- /dev/null +++ b/swlscx/src/main/java/com/ruoyi/swlscx/month/mapper/HyMtzEMapper.java @@ -0,0 +1,40 @@ +package com.ruoyi.swlscx.month.mapper; + + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.ruoyi.swlscx.month.domain.po.HyMtzE; +import com.ruoyi.swlscx.month.domain.vo.HyMtzEVo; +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; + +import java.util.List; +import java.util.Map; + +/** +* @author 12974 +* @description 针对表【hy_mtz_e】的数据库操作Mapper +* @createDate 2024-07-23 14:15:25 +* @Entity com/ruoyi/swlscx/domain/po.po.HyMtzE +*/ +@Mapper +public interface HyMtzEMapper extends BaseMapper { + + void batchInsert(@Param("list") List batchList); + + /** + * 查询月水位表 + */ + IPage selectHyMtzEPageByInfo(Page page, @Param("map") Map map); + + void deleteTempData(); + + void insertTempData(List batch); + + void mergeToData(); +} + + + + diff --git a/swlscx/src/main/java/com/ruoyi/swlscx/month/service/HyMtchpdEService.java b/swlscx/src/main/java/com/ruoyi/swlscx/month/service/HyMtchpdEService.java new file mode 100644 index 0000000..95d03c7 --- /dev/null +++ b/swlscx/src/main/java/com/ruoyi/swlscx/month/service/HyMtchpdEService.java @@ -0,0 +1,13 @@ +package com.ruoyi.swlscx.month.service; + +import com.baomidou.mybatisplus.extension.service.IService; +import com.ruoyi.swlscx.month.domain.po.HyMtchpdE; + +/** +* @author 12974 +* @description 针对表【hy_mtchpd_e(月泥沙特征粒径表字段定义)】的数据库操作Service +* @createDate 2024-08-06 13:42:04 +*/ +public interface HyMtchpdEService extends IService { + +} diff --git a/swlscx/src/main/java/com/ruoyi/swlscx/month/service/HyMtcsEService.java b/swlscx/src/main/java/com/ruoyi/swlscx/month/service/HyMtcsEService.java new file mode 100644 index 0000000..7b0f17f --- /dev/null +++ b/swlscx/src/main/java/com/ruoyi/swlscx/month/service/HyMtcsEService.java @@ -0,0 +1,36 @@ +package com.ruoyi.swlscx.month.service; + +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.service.IService; +import com.ruoyi.common.core.page.R; +import com.ruoyi.swlscx.common.PageParams; +import com.ruoyi.swlscx.month.domain.po.HyMtcsE; +import com.ruoyi.swlscx.month.domain.vo.HyMtcsEVo; +import org.springframework.web.multipart.MultipartFile; + +import javax.servlet.http.HttpServletResponse; + +/** +* @author 12974 +* @description 针对表【hy_mtcs_e(月含沙量表)】的数据库操作Service +* @createDate 2024-08-05 14:26:28 +*/ +public interface HyMtcsEService extends IService { + + /** + * 导入月含沙量表数据 + */ + void importHyMtcsEData(MultipartFile file); + + /** + * 查询月含沙量表数据 + */ + IPage selectHyMtcsEByPageAndInfo(PageParams pageParams, String stcdIds, String startTime, String endTime, String stcd, String stnm); + + /** + * 导出月含沙量表 + */ + R exportMonthSedimentContentList(HttpServletResponse response, String startTime, String endTime, String stcd, String stnm); + + R importDateTosoft(String startTime, String endTime); +} diff --git a/swlscx/src/main/java/com/ruoyi/swlscx/month/service/HyMtiqEService.java b/swlscx/src/main/java/com/ruoyi/swlscx/month/service/HyMtiqEService.java new file mode 100644 index 0000000..18393fe --- /dev/null +++ b/swlscx/src/main/java/com/ruoyi/swlscx/month/service/HyMtiqEService.java @@ -0,0 +1,13 @@ +package com.ruoyi.swlscx.month.service; + +import com.baomidou.mybatisplus.extension.service.IService; +import com.ruoyi.swlscx.month.domain.po.HyMtiqE; + +/** +* @author 12974 +* @description 针对表【hy_mtiq_e(月冰流量表)】的数据库操作Service +* @createDate 2024-08-06 13:42:04 +*/ +public interface HyMtiqEService extends IService { + +} diff --git a/swlscx/src/main/java/com/ruoyi/swlscx/month/service/HyMtpEService.java b/swlscx/src/main/java/com/ruoyi/swlscx/month/service/HyMtpEService.java new file mode 100644 index 0000000..8ecb70a --- /dev/null +++ b/swlscx/src/main/java/com/ruoyi/swlscx/month/service/HyMtpEService.java @@ -0,0 +1,38 @@ +package com.ruoyi.swlscx.month.service; + + +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.service.IService; +import com.ruoyi.common.core.page.R; +import com.ruoyi.swlscx.common.PageParams; +import com.ruoyi.swlscx.month.domain.po.HyMtpE; +import com.ruoyi.swlscx.month.domain.vo.HyMptEVo; +import org.springframework.web.multipart.MultipartFile; + +import javax.servlet.http.HttpServletResponse; + +/** +* @author 12974 +* @description 针对表【hy_mtp_e】的数据库操作Service +* @createDate 2024-07-23 14:15:25 +*/ +public interface HyMtpEService extends IService { + + /** + * 导入月降水表数据 + */ + void importHyMtpEData(MultipartFile file); + + + /** + * 查询月降水表数据 + */ + IPage selectHyMtpDataByPageAndInfo(PageParams pageParams, String startTime, String endTime, String stcd, String stnm); + + /** + * 导出月降水表数据 + */ + R exportHyMtpData(HttpServletResponse response, String startTime, String endTime, String stcd, String stnm); + + R importDateTosoft(String startTime, String endTime); +} diff --git a/swlscx/src/main/java/com/ruoyi/swlscx/month/service/HyMtpddbEService.java b/swlscx/src/main/java/com/ruoyi/swlscx/month/service/HyMtpddbEService.java new file mode 100644 index 0000000..5dbd438 --- /dev/null +++ b/swlscx/src/main/java/com/ruoyi/swlscx/month/service/HyMtpddbEService.java @@ -0,0 +1,19 @@ +package com.ruoyi.swlscx.month.service; + +import com.baomidou.mybatisplus.extension.service.IService; +import com.ruoyi.swlscx.month.domain.po.HyMtpddbE; +import org.springframework.web.multipart.MultipartFile; + +/** +* @author 12974 +* @description 针对表【hy_mtpddb_e(月平均泥沙颗粒级配表)】的数据库操作Service +* @createDate 2024-08-06 13:42:04 +*/ +public interface HyMtpddbEService extends IService { + + /** + * 导入月平均泥沙颗粒级配表数据 + */ + void importHyMtpddbEData(MultipartFile file); + +} diff --git a/swlscx/src/main/java/com/ruoyi/swlscx/month/service/HyMtqEService.java b/swlscx/src/main/java/com/ruoyi/swlscx/month/service/HyMtqEService.java new file mode 100644 index 0000000..ee3d155 --- /dev/null +++ b/swlscx/src/main/java/com/ruoyi/swlscx/month/service/HyMtqEService.java @@ -0,0 +1,31 @@ +package com.ruoyi.swlscx.month.service; + +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.service.IService; +import com.ruoyi.common.core.page.R; +import com.ruoyi.swlscx.common.PageParams; +import com.ruoyi.swlscx.month.domain.po.HyMtqE; +import com.ruoyi.swlscx.month.domain.vo.HyMtqEVo; +import org.springframework.web.multipart.MultipartFile; + +import javax.servlet.http.HttpServletResponse; + +/** +* @author 12974 +* @description 针对表【hy_mtq_e(月流量表)】的数据库操作Service +* @createDate 2024-08-04 12:45:25 +*/ +public interface HyMtqEService extends IService { + + + /** 导入月流量表数据*/ + void importHyMtqEData(MultipartFile file); + + /**查询月流量表数据*/ + IPage selectHyMtqEListPageByInfo(PageParams pageParams, String stcdIds, String startTime, String endTime, String stcd, String stnm); + + /**导出月流量表数据*/ + R exportMonthFlowList(HttpServletResponse response, String startTime, String endTime, String stcd, String stnm); + + R importDateTosoft(String startTime, String endTime); +} diff --git a/swlscx/src/main/java/com/ruoyi/swlscx/month/service/HyMtqsEService.java b/swlscx/src/main/java/com/ruoyi/swlscx/month/service/HyMtqsEService.java new file mode 100644 index 0000000..1081dd3 --- /dev/null +++ b/swlscx/src/main/java/com/ruoyi/swlscx/month/service/HyMtqsEService.java @@ -0,0 +1,37 @@ +package com.ruoyi.swlscx.month.service; + +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.service.IService; +import com.ruoyi.common.core.page.R; +import com.ruoyi.swlscx.common.PageParams; +import com.ruoyi.swlscx.month.domain.po.HyMtqsE; +import com.ruoyi.swlscx.month.domain.vo.HyMtqsEVo; +import org.springframework.web.multipart.MultipartFile; + +import javax.servlet.http.HttpServletResponse; + +/** +* @author 12974 +* @description 针对表【hy_mtqs_e(月输沙率表)】的数据库操作Service +* @createDate 2024-08-05 16:03:07 +*/ +public interface HyMtqsEService extends IService { + + + /** + * 导入月输沙率表数据 + */ + void importHyMtqsEData(MultipartFile file); + + /** + * 查询月输沙率表数据 + */ + IPage selectHyMtqsEDataByPageAndInfo(PageParams pageParams, String stcdIds, String startTime, String endTime, String stcd, String stnm); + + /** + * 导出月输沙率表 + */ + R exportMonthSedimentDischargeList(HttpServletResponse response, String startTime, String endTime, String stcd, String stnm); + + R importDateTosoft(String startTime, String endTime); +} diff --git a/swlscx/src/main/java/com/ruoyi/swlscx/month/service/HyMttdzEService.java b/swlscx/src/main/java/com/ruoyi/swlscx/month/service/HyMttdzEService.java new file mode 100644 index 0000000..a549802 --- /dev/null +++ b/swlscx/src/main/java/com/ruoyi/swlscx/month/service/HyMttdzEService.java @@ -0,0 +1,32 @@ +package com.ruoyi.swlscx.month.service; + +import com.baomidou.mybatisplus.extension.service.IService; +import com.ruoyi.common.core.page.R; +import com.ruoyi.swlscx.common.PageParams; +import com.ruoyi.swlscx.month.domain.po.HyMttdzE; +import org.springframework.web.multipart.MultipartFile; + +import javax.servlet.http.HttpServletResponse; + +/** +* @author 12974 +* @description 针对表【hy_mttdz_e】的数据库操作Service +* @createDate 2024-08-04 12:45:25 +*/ +public interface HyMttdzEService extends IService { + + + + /** + * 导入月潮位数据 + */ + void importHyMttdzEData(MultipartFile file); + + /**查询月潮位表数据*/ + R selectHyMttdzEListPageByInfo(PageParams pageParams, String stcdIds, String startTime, String endTime,String stcd,String stnm); + + /** + * 导出月潮位表数据 + */ + R exportMonthTideLeverList(HttpServletResponse response, String startTime, String endTime, String stcd, String stnm); +} diff --git a/swlscx/src/main/java/com/ruoyi/swlscx/month/service/HyMtweEService.java b/swlscx/src/main/java/com/ruoyi/swlscx/month/service/HyMtweEService.java new file mode 100644 index 0000000..edb1d37 --- /dev/null +++ b/swlscx/src/main/java/com/ruoyi/swlscx/month/service/HyMtweEService.java @@ -0,0 +1,36 @@ +package com.ruoyi.swlscx.month.service; + +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.service.IService; +import com.ruoyi.common.core.page.R; +import com.ruoyi.swlscx.common.PageParams; +import com.ruoyi.swlscx.month.domain.po.HyMtweE; +import com.ruoyi.swlscx.month.domain.vo.HyMtweEVo; +import org.springframework.web.multipart.MultipartFile; + +import javax.servlet.http.HttpServletResponse; + +/** +* @author 12974 +* @description 针对表【hy_mtwe_e(月水面蒸发量表)】的数据库操作Service +* @createDate 2024-08-01 09:38:45 +*/ +public interface HyMtweEService extends IService { + + + /**导入月水面蒸发量表数据*/ + void importHyMtweEDate(MultipartFile file); + + + + /**查询月水面蒸发量表数据*/ + IPage selectHyMtweEListPageByInfo(PageParams pageParams, String stcdIds, String startTime, String endTime, String stcd, String stnm); + + + /** + * 导出月水面蒸发量表 + */ + R exportMonthEvaporationWaterList(HttpServletResponse response, String startTime, String endTime, String stcd, String stnm); + + R importDateTosoft(String startTime, String endTime); +} diff --git a/swlscx/src/main/java/com/ruoyi/swlscx/month/service/HyMtwtEService.java b/swlscx/src/main/java/com/ruoyi/swlscx/month/service/HyMtwtEService.java new file mode 100644 index 0000000..33dae20 --- /dev/null +++ b/swlscx/src/main/java/com/ruoyi/swlscx/month/service/HyMtwtEService.java @@ -0,0 +1,37 @@ +package com.ruoyi.swlscx.month.service; + +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.service.IService; +import com.ruoyi.common.core.page.R; +import com.ruoyi.swlscx.common.PageParams; +import com.ruoyi.swlscx.month.domain.po.HyMtwtE; +import com.ruoyi.swlscx.month.domain.vo.HyMtwtEVo; +import org.springframework.web.multipart.MultipartFile; + +import javax.servlet.http.HttpServletResponse; + +/** + * @author 12974 + * @description 针对表【hy_mtwt_e(月水温表字段定义)】的数据库操作Service + * @createDate 2024-08-06 13:42:04 + */ +public interface HyMtwtEService extends IService { + + + /** + * 查询月水温表数据 + */ + IPage selectHyMtweEDataByPageAndInfo(PageParams pageParams, String stcdIds, String startTime, String endTime, String stcd, String stnm); + + /** + * 导入月水温表数据 + */ + void importHyMtwtEData(MultipartFile file); + + /** + * 导出月水温表 + */ + R exportMonthWaterTemperatureList(HttpServletResponse response, String startTime, String endTime, String stcd, String stnm); + + R importDateTosoft(String startTime, String endTime); +} diff --git a/swlscx/src/main/java/com/ruoyi/swlscx/month/service/HyMtzEService.java b/swlscx/src/main/java/com/ruoyi/swlscx/month/service/HyMtzEService.java new file mode 100644 index 0000000..2c51ded --- /dev/null +++ b/swlscx/src/main/java/com/ruoyi/swlscx/month/service/HyMtzEService.java @@ -0,0 +1,34 @@ +package com.ruoyi.swlscx.month.service; + + +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.service.IService; +import com.ruoyi.common.core.page.R; +import com.ruoyi.swlscx.common.PageParams; +import com.ruoyi.swlscx.month.domain.po.HyMtzE; +import com.ruoyi.swlscx.month.domain.vo.HyMtzEVo; +import org.springframework.web.multipart.MultipartFile; + +import javax.servlet.http.HttpServletResponse; + +/** +* @author 12974 +* @description 针对表【hy_mtz_e】的数据库操作Service +* @createDate 2024-07-23 14:15:25 +*/ +public interface HyMtzEService extends IService { + + + /**导入月水位表**/ + void importHyMtzEData(MultipartFile file); + + /**查询月水位表**/ + IPage selectHyMtzEPageByInfo(PageParams pageParams, String stcdIds, String startTime, String endTime, String stnm, String stcd); + + /** + * 导出月水位表 + */ + R exportMonthWaterLeverList(HttpServletResponse response, String startTime, String endTime, String stcd, String stnm); + + R importDateTosoft(String startTime, String endTime); +} diff --git a/swlscx/src/main/java/com/ruoyi/swlscx/month/service/impl/HyMtchpdEServiceImpl.java b/swlscx/src/main/java/com/ruoyi/swlscx/month/service/impl/HyMtchpdEServiceImpl.java new file mode 100644 index 0000000..f484230 --- /dev/null +++ b/swlscx/src/main/java/com/ruoyi/swlscx/month/service/impl/HyMtchpdEServiceImpl.java @@ -0,0 +1,22 @@ +package com.ruoyi.swlscx.month.service.impl; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.ruoyi.swlscx.month.domain.po.HyMtchpdE; +import com.ruoyi.swlscx.month.mapper.HyMtchpdEMapper; +import com.ruoyi.swlscx.month.service.HyMtchpdEService; +import org.springframework.stereotype.Service; + +/** +* @author 12974 +* @description 针对表【hy_mtchpd_e(月泥沙特征粒径表字段定义)】的数据库操作Service实现 +* @createDate 2024-08-06 13:42:04 +*/ +@Service +public class HyMtchpdEServiceImpl extends ServiceImpl + implements HyMtchpdEService{ + +} + + + + diff --git a/swlscx/src/main/java/com/ruoyi/swlscx/month/service/impl/HyMtcsEServiceImpl.java b/swlscx/src/main/java/com/ruoyi/swlscx/month/service/impl/HyMtcsEServiceImpl.java new file mode 100644 index 0000000..22475ca --- /dev/null +++ b/swlscx/src/main/java/com/ruoyi/swlscx/month/service/impl/HyMtcsEServiceImpl.java @@ -0,0 +1,363 @@ +package com.ruoyi.swlscx.month.service.impl; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.ruoyi.common.annotation.DataSource; +import com.ruoyi.common.config.RuoYiConfig; +import com.ruoyi.common.core.page.R; +import com.ruoyi.common.core.text.Convert; +import com.ruoyi.common.enums.DataSourceType; +import com.ruoyi.common.utils.DateUtils; +import com.ruoyi.common.utils.SecurityUtils; +import com.ruoyi.common.utils.bean.BeanUtils; +import com.ruoyi.swlscx.basic.domain.po.YcExportTask; +import com.ruoyi.swlscx.basic.service.YcExportTaskService; +import com.ruoyi.swlscx.common.PageParams; +import com.ruoyi.swlscx.month.domain.bo.HyMtcsEBo; +import com.ruoyi.swlscx.month.domain.po.HyMtcsE; +import com.ruoyi.swlscx.month.domain.po.HyMtweE; +import com.ruoyi.swlscx.month.domain.vo.HyMtcsEVo; +import com.ruoyi.swlscx.month.domain.vo.HyMtweEVo; +import com.ruoyi.swlscx.month.mapper.HyMtcsEMapper; +import com.ruoyi.swlscx.month.service.HyMtcsEService; +import com.ruoyi.swlscx.common.utils.CommonUtils; +import com.ruoyi.swlscx.common.utils.ExcelUtils; +import com.ruoyi.swlscx.common.utils.Query; +import com.ruoyi.swlscx.year.domain.vo.HyHmxpFVo; +import org.apache.commons.lang3.ObjectUtils; +import org.apache.poi.ss.usermodel.CellStyle; +import org.apache.poi.ss.usermodel.Row; +import org.apache.poi.ss.usermodel.Sheet; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.context.ApplicationContext; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; +import org.springframework.web.multipart.MultipartFile; + +import javax.annotation.Resource; +import javax.servlet.http.HttpServletResponse; +import java.io.File; +import java.util.*; +import java.util.concurrent.CompletableFuture; +import java.util.concurrent.ThreadPoolExecutor; +import java.util.stream.Collectors; + +/** +* @author 12974 +* @description 针对表【hy_mtcs_e(月含沙量表)】的数据库操作Service实现 +* @createDate 2024-08-05 14:26:28 +*/ +@Service +public class HyMtcsEServiceImpl extends ServiceImpl + implements HyMtcsEService{ + + @Resource + private ThreadPoolExecutor labelThreadPool; + + @Resource + private YcExportTaskService ycExportTaskService; + + + + + /** + * 导入月含沙量表数据 + */ + @Override + public void importHyMtcsEData(MultipartFile file) { + try { + List hyMtcsEBos = ExcelUtils.readExcel(file.getInputStream(), HyMtcsEBo.class, 2); + // 获取数据 + List dataList = hyMtcsEBos.parallelStream().map(i -> { + HyMtcsE hyMtcsE = new HyMtcsE(); + BeanUtils.copyProperties(i, hyMtcsE); + hyMtcsE.setAvcs(Convert.toBigDecimal(i.getAvcs())); + hyMtcsE.setMth(Convert.toInt(i.getMth())); + hyMtcsE.setMns(Convert.toBigDecimal(i.getMns())); + hyMtcsE.setMnsdt(DateUtils.parseDate(i.getMnsdt())); + hyMtcsE.setYr(Convert.toInt(i.getYr())); + hyMtcsE.setMxs(Convert.toBigDecimal(i.getMxs())); + hyMtcsE.setMxsdt(DateUtils.parseDate(i.getMxsdt())); + return hyMtcsE; + }).collect(Collectors.toList()); + this.saveBatch(dataList,10000); + } catch (Exception e) { + throw new RuntimeException(e); + } + } + + @Override + public IPage selectHyMtcsEByPageAndInfo(PageParams pageParams, String stcdIds, String startTime, String endTime,String stcd,String stnm) { + Map map = CommonUtils.getMonthDataMap(pageParams, startTime, endTime, stcd, stnm); + return this.baseMapper.selectHyMtcsEDataByPageAndInfo(new Query().getPage(map), map); + + } + + /** + * 导出月含沙量表 + */ + @Override + public R exportMonthSedimentContentList(HttpServletResponse response, String startTime, String endTime, String stcd, String stnm) { + + Long userId = SecurityUtils.getUserId(); + String tableName = "月含沙量表"; + return taskAndExport(tableName,startTime, endTime, stcd, stnm, userId); + } + + + @Resource + private ThreadPoolExecutor importThreadPool; + + @Autowired + private ApplicationContext context; + + /** + * 从mysql导入到sqlserver中 + */ + @Transactional(rollbackFor = Exception.class) + @DataSource(DataSourceType.SHARDING) + public void importMysqlToSqlserver(List hyMtweEVoList) { + List records = hyMtweEVoList.stream().map(i->{ + HyMtcsE hyMtcsE = new HyMtcsE(); + BeanUtils.copyProperties(i, hyMtcsE); + hyMtcsE.setAvcs(Convert.toBigDecimal(i.getAvcs())); + hyMtcsE.setMth(Convert.toInt(i.getMth())); + hyMtcsE.setMns(Convert.toBigDecimal(i.getMns())); + hyMtcsE.setMnsdt(DateUtils.parseDate(i.getMnsdt())); + hyMtcsE.setYr(Convert.toInt(i.getYr())); + hyMtcsE.setMxs(Convert.toBigDecimal(i.getMxs())); + hyMtcsE.setMxsdt(DateUtils.parseDate(i.getMxsdt())); + return hyMtcsE; + }).collect(Collectors.toList()); + //先清空临时表的数据 + this.baseMapper.deleteTempData(); + //插入临时表数据 + int batchSize = 50; + for (int i = 0; i < records.size(); i += batchSize) { + int end = Math.min(i + batchSize, records.size()); + List batch = records.subList(i, end); + // 执行批量插入 + this.baseMapper.insertTempData(batch); + } + //从临时表增或修改主表 + this.baseMapper.mergeToData(); + } + + @Override + public R importDateTosoft(String startTime, String endTime) { + Long userId = SecurityUtils.getUserId(); + String filename = "月含沙量表" + startTime + "-" + endTime+"导入到南方片"; + // 查询是否已存在相同条件且未完成的任务 + List ongoingTasks = ycExportTaskService.list( + new QueryWrapper() + .eq("user_id", userId) + .eq("status", 0) // 状态为0表示任务未完成 + .like("filename", "月含沙量表")); + if (!ongoingTasks.isEmpty()) { + return R.error("当前任务正在下载中，请稍后重试"); + } + YcExportTask ycExportTask = new YcExportTask(); + ycExportTask.setFilename(filename); + ycExportTask.setUserId(userId); + ycExportTask.setStartTime(new Date()); + ycExportTask.setStatus(0); + ycExportTaskService.save(ycExportTask); + CompletableFuture.runAsync(() -> { + try { + IPage pageByInfo = this.selectHyMtcsEByPageAndInfo(new PageParams(0L, 1000000000L), null, startTime, endTime, null,null); +// IPage pageByInfo = this.selectMaxHRainListPageByInfo(new PageParams(0L, 1000000000L), null, null, startTime, endTime); + HyMtcsEServiceImpl hyMtcsEService = context.getBean(HyMtcsEServiceImpl.class); + hyMtcsEService.importMysqlToSqlserver(pageByInfo.getRecords()); + ycExportTask.setStatus(2); + } catch (Exception e) { + ycExportTask.setStatus(4); + log.error(e.getMessage()); + R.error("任务下载失败"); + }finally { + ycExportTask.setEndTime(new Date()); + ycExportTaskService.updateById(ycExportTask); + } + }, importThreadPool); + return R.ok("任务已提交"); + } + + + private R taskAndExport(String tableName,String startTime, String endTime, String stcd, String stnm, Long userId) { + String startNewTime=""; + String endNewTime=""; + if (ObjectUtils.isNotEmpty(startTime) ){ + startNewTime=startTime.substring(0,6); + } + if (ObjectUtils.isNotEmpty(endTime)){ + endNewTime=endTime.substring(0,6); + } + String filename = tableName + startNewTime + "-" + endNewTime; + // 查询是否已存在相同条件且未完成的任务 + List ongoingTasks = ycExportTaskService.list( + new QueryWrapper() + .eq("user_id", userId) + .eq("filename", filename) + .eq("status", 0) // 状态为0表示任务未完成 + ); + + if (!ongoingTasks.isEmpty()) { + return R.error("当前任务正在下载中，请稍后重试"); + } + + YcExportTask ycExportTask = new YcExportTask(); + String pathPeffix = RuoYiConfig.getExportPath() + + File.separator + userId + File.separator+ + DateUtils.parseDateToStr("yyyy-MM-dd",DateUtils.getNowDate()) + File.separator + + DateUtils.parseDateToStr("HH_mm",DateUtils.getNowDate())+File.separator; + ycExportTask.setFilename(filename); + ycExportTask.setUserId(userId); + ycExportTask.setStartTime(new Date()); + ycExportTask.setStatus(0); + ycExportTask.setFilepath(pathPeffix); + ycExportTaskService.save(ycExportTask); + CompletableFuture.runAsync(() -> { + try { + File dest = new File(pathPeffix); + if (!dest.exists()) { + dest.mkdirs(); + } + String fullPath = pathPeffix + filename; + exportBlackData(fullPath, startTime, endTime, stcd, stnm); + + ycExportTask.setStatus(1); + ycExportTask.setEndTime(new Date()); + ycExportTaskService.updateById(ycExportTask); + } catch (Exception e) { + log.error(e.getMessage(), e); + R.error("任务下载失败"); + } + }, labelThreadPool); + return R.ok("任务已提交，请稍后下载"); + } + + private void exportBlackData(String tableName, String startTime, String endTime, String stcd, String stnm) { + Map rainMap = CommonUtils.getMonthDataMap(new PageParams(0L, 1000000000L), startTime, endTime, stcd, stnm); + ExcelUtils.excelBackExport2("monthSedimentConcentration.xls", tableName, (Sheet sheet, CellStyle style) -> + dataModel1(rainMap, sheet, style)); + } + + public int dataModel1(Map map, Sheet sheet, CellStyle style) { + // 批量查询数据 + IPage hyMptEVoIPage = this.baseMapper.selectHyMtcsEDataByPageAndInfo(new Query().getPage(map), map); + List records = hyMptEVoIPage.getRecords(); + + // 定义当前sheet的行号 + int rowIndex = 2; // 从第二行开始写入数据 + // 定义全局序号 + int globalIndex = 1; // 从1开始 + + // 定义当前sheet的编号 + int sheetIndex = 1; + + // 最大行数限制 + int maxRowsPerSheet = 65536; // 对于 .xls 文件，最大行数为 65536 + int batchSize = 1000; // 每次批量处理1000行，减少逐行写入的开销 + + // 复制表头到新sheet的逻辑 + ExcelUtils.copyHeader(sheet, style); + + // 批量处理数据 + for (int i = 0; i < records.size(); i += batchSize) { + // 处理一批数据 + int toIndex = Math.min(i + batchSize, records.size()); + List batchList = records.subList(i, toIndex); + + // 批量写入数据 + for (HyMtcsEVo vo : batchList) { + // 如果当前行数达到最大行数，创建新sheet + if (rowIndex >= maxRowsPerSheet) { + sheetIndex++; + sheet = sheet.getWorkbook().createSheet("月含沙量表" + sheetIndex); + rowIndex = 2; // 重置行号 + // 复制表头到新sheet + ExcelUtils.copyHeader(sheet, style); + } + + // 创建新行并写入数据 + Row row = ExcelUtils.createRow(sheet, rowIndex); + + // 使用 globalIndex 作为序号 + ExcelUtils.formatCell(row, 0, String.valueOf(globalIndex), style); + ExcelUtils.formatCell(row, 1, vo.getStcd() != null ? vo.getStcd() : "", style); + ExcelUtils.formatCell(row, 2, vo.getStnm() != null ? vo.getStnm() : "", style); + ExcelUtils.formatCell(row, 3, vo.getAddvcd() != null ? vo.getAddvcd() : "", style); + ExcelUtils.formatCell(row,4,"",style); + ExcelUtils.formatCell(row, 5, vo.getYr() != null ? vo.getYr().toString() : "", style); + ExcelUtils.formatCell(row, 6, vo.getMth() != null ? vo.getMth().toString() : "", style); + ExcelUtils.formatCell(row, 7, vo.getAvcs() != null ? CommonUtils.formatNum(vo.getAvcs()) : "", style); + ExcelUtils.formatCell(row, 8, vo.getAvcsrcd() != null ? vo.getAvcsrcd() : "", style); + ExcelUtils.formatCell(row, 9, vo.getMxs() != null ? CommonUtils.formatNum(vo.getMxs()) : "", style); + ExcelUtils.formatCell(row, 10, vo.getMxsrcd() != null ? vo.getMxsrcd() : "", style); + ExcelUtils.formatCell(row, 11, vo.getMxsdt() != null ? vo.getMxsdt() : "", style); + ExcelUtils.formatCell(row, 12, vo.getMns() != null ? CommonUtils.formatNum(vo.getMns()) : "", style); + ExcelUtils.formatCell(row, 13, vo.getMnsrcd() != null ? vo.getMnsrcd() : "", style); + ExcelUtils.formatCell(row, 14, vo.getMnsdt() != null ? vo.getMnsdt() : "", style); + + // 增加行号和全局序号 + rowIndex++; + globalIndex++; + } + } + return 0; + } + + public void dataModel(Map map, Sheet sheet, CellStyle style) { + + // 批量查询数据 + IPage hyMptEVoIPage = this.baseMapper.selectHyMtcsEDataByPageAndInfo(new Query().getPage(map), map); + List records = hyMptEVoIPage.getRecords(); + // 定义当前sheet的行号 + int rowIndex = 2; + // 定义当前sheet的编号 + int sheetIndex = 1; + Row row; + // 最大行数限制 + int maxRowsPerSheet = 65536; // 对于 .xls 文件，最大行数为 65536 + int batchSize = 1000; // 每次批量处理1000行，减少逐行写入的开销 + // 批量处理数据 + for (int i = 0; i < records.size(); i += batchSize) { + // 处理一批数据 + int toIndex = Math.min(i + batchSize, records.size()); + List batchList = records.subList(i, toIndex); + // 批量写入数据 + for (HyMtcsEVo vo : batchList) { + // 如果当前行数达到最大行数，创建新sheet + if (rowIndex >= maxRowsPerSheet) { + sheetIndex++; + sheet = sheet.getWorkbook().createSheet("月水面蒸发量表" + sheetIndex); + rowIndex = 2; // 重置行号 + } + // 创建新行并写入数据 + row = ExcelUtils.createRow(sheet, rowIndex); + //序号 + ExcelUtils.formatCell(row, 0, String.valueOf(rowIndex - 1), style); + ExcelUtils.formatCell(row, 1, vo.getStcd() != null ? vo.getStcd() : "", style); + ExcelUtils.formatCell(row, 2, vo.getStnm() != null ? vo.getStnm() : "", style); + ExcelUtils.formatCell(row, 3, vo.getAddvcd() != null ? vo.getAddvcd() : "", style); + ExcelUtils.formatCell(row,4,"",style); + ExcelUtils.formatCell(row, 5, vo.getYr() != null ? vo.getYr().toString() : "", style); + ExcelUtils.formatCell(row, 6, vo.getMth() != null ? vo.getMth().toString() : "", style); + ExcelUtils.formatCell(row, 7, vo.getAvcs() != null ? CommonUtils.formatNum(vo.getAvcs()) : "", style); + ExcelUtils.formatCell(row, 8, vo.getAvcsrcd() != null ? vo.getAvcsrcd() : "", style); + ExcelUtils.formatCell(row, 9, vo.getMxs() != null ? CommonUtils.formatNum(vo.getMxs()) : "", style); + ExcelUtils.formatCell(row, 10, vo.getMxsrcd() != null ? vo.getMxsrcd() : "", style); + ExcelUtils.formatCell(row, 11, vo.getMxsdt() != null ? vo.getMxsdt() : "", style); + ExcelUtils.formatCell(row, 12, vo.getMns() != null ? CommonUtils.formatNum(vo.getMns()) : "", style); + ExcelUtils.formatCell(row, 13, vo.getMnsrcd() != null ? vo.getMnsrcd() : "", style); + ExcelUtils.formatCell(row, 14, vo.getMnsdt() != null ? vo.getMnsdt() : "", style); + rowIndex++; + } + } + } + +} + + + + diff --git a/swlscx/src/main/java/com/ruoyi/swlscx/month/service/impl/HyMtiqEServiceImpl.java b/swlscx/src/main/java/com/ruoyi/swlscx/month/service/impl/HyMtiqEServiceImpl.java new file mode 100644 index 0000000..f8fb1de --- /dev/null +++ b/swlscx/src/main/java/com/ruoyi/swlscx/month/service/impl/HyMtiqEServiceImpl.java @@ -0,0 +1,22 @@ +package com.ruoyi.swlscx.month.service.impl; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.ruoyi.swlscx.month.domain.po.HyMtiqE; +import com.ruoyi.swlscx.month.mapper.HyMtiqEMapper; +import com.ruoyi.swlscx.month.service.HyMtiqEService; +import org.springframework.stereotype.Service; + +/** +* @author 12974 +* @description 针对表【hy_mtiq_e(月冰流量表)】的数据库操作Service实现 +* @createDate 2024-08-06 13:42:04 +*/ +@Service +public class HyMtiqEServiceImpl extends ServiceImpl + implements HyMtiqEService{ + +} + + + + diff --git a/swlscx/src/main/java/com/ruoyi/swlscx/month/service/impl/HyMtpEServiceImpl.java b/swlscx/src/main/java/com/ruoyi/swlscx/month/service/impl/HyMtpEServiceImpl.java new file mode 100644 index 0000000..d3acae8 --- /dev/null +++ b/swlscx/src/main/java/com/ruoyi/swlscx/month/service/impl/HyMtpEServiceImpl.java @@ -0,0 +1,359 @@ +package com.ruoyi.swlscx.month.service.impl; + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.ruoyi.common.annotation.DataSource; +import com.ruoyi.common.config.RuoYiConfig; +import com.ruoyi.common.core.page.R; +import com.ruoyi.common.core.text.Convert; +import com.ruoyi.common.enums.DataSourceType; +import com.ruoyi.common.utils.DateUtils; +import com.ruoyi.common.utils.SecurityUtils; +import com.ruoyi.swlscx.basic.domain.po.YcExportTask; +import com.ruoyi.swlscx.basic.service.YcExportTaskService; +import com.ruoyi.swlscx.common.PageParams; +import com.ruoyi.swlscx.month.domain.bo.HyMtpEBo; +import com.ruoyi.swlscx.month.domain.po.HyMtpE; +import com.ruoyi.swlscx.month.domain.vo.HyMptEVo; +import com.ruoyi.swlscx.month.domain.vo.HyMtpEVo; +import com.ruoyi.swlscx.month.mapper.HyMtpEMapper; +import com.ruoyi.swlscx.month.service.HyMtpEService; +import com.ruoyi.swlscx.common.utils.CommonUtils; +import com.ruoyi.swlscx.common.utils.ExcelUtils; +import com.ruoyi.swlscx.common.utils.Query; +import org.apache.commons.lang3.ObjectUtils; +import org.apache.poi.ss.usermodel.*; +import org.springframework.beans.BeanUtils; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.context.ApplicationContext; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; +import org.springframework.web.multipart.MultipartFile; + +import javax.annotation.Resource; +import javax.servlet.http.HttpServletResponse; +import java.io.File; +import java.util.Date; +import java.util.List; +import java.util.Map; +import java.util.concurrent.CompletableFuture; +import java.util.concurrent.ThreadPoolExecutor; +import java.util.stream.Collectors; + +/** + * @author 12974 + * @description 针对表【hy_mtp_e】的数据库操作Service实现 + * @createDate 2024-07-23 14:15:25 + */ +@Service +public class HyMtpEServiceImpl extends ServiceImpl + implements HyMtpEService { + + @Resource + private ThreadPoolExecutor labelThreadPool; + + @Resource + private YcExportTaskService ycExportTaskService; + + + /** + * 导入月降水表数据 + */ + @Override + @Transactional(rollbackFor = Exception.class) + public void importHyMtpEData(MultipartFile file) { + try { + List hyMtpEBos = ExcelUtils.readExcel(file.getInputStream(), HyMtpEBo.class, 3); + List hyMtpEList = hyMtpEBos.stream().map(i -> { + HyMtpE hyMtpE = new HyMtpE(); + BeanUtils.copyProperties(i, hyMtpE); + hyMtpE.setMth(Convert.toInt(i.getMth())); + hyMtpE.setMxdypodt(DateUtils.parseDate(i.getMxdypodt())); + hyMtpE.setMxdyp(Convert.toBigDecimal(i.getMxdyp())); + hyMtpE.setMxdyp(Convert.toBigDecimal(i.getMxdyp())); + hyMtpE.setYr(Convert.toInt(i.getYr())); + hyMtpE.setP(Convert.toBigDecimal(i.getP())); + return hyMtpE; + }).collect(Collectors.toList()); + this.saveBatch(hyMtpEList, 10000); + } catch (Exception e) { + e.printStackTrace(); + } + } + + /** + * 查询月降水表数据 + */ + @Override + public IPage selectHyMtpDataByPageAndInfo(PageParams pageParams, String startTime, String endTime, String stcd, String stnm) { + Map map = CommonUtils.getMonthDataMap(pageParams, startTime, endTime, stcd, stnm); + return this.baseMapper.selectHyMtpDataByPageAndInfo(new Query().getPage(map), map); + } + + + + @Override + public R exportHyMtpData(HttpServletResponse response, String startTime, String endTime, String stcd, String stnm) { + + Long userId = SecurityUtils.getUserId(); + String tableName = "月降水表"; + return taskAndExport(tableName,startTime, endTime, stcd, stnm, userId); +// +// Map rainMap = CommonUtils.getMonthDataMap(new PageParams(0L,100000L), startTime, endTime, stcd, stnm); +// ExcelUtils.excelExport(response,"monthRain.xls","月降水表",(Sheet sheet, CellStyle style) ->{ +// rainModel(rainMap, sheet, style); +// }); + } + + @Resource + private ThreadPoolExecutor importThreadPool; + + @Autowired + private ApplicationContext context; + + /** + * 从mysql导入到sqlserver中 + */ + @Transactional(rollbackFor = Exception.class) + @DataSource(DataSourceType.SHARDING) + public void importMysqlToSqlserver(List hyMtpEVoList) { + List records = hyMtpEVoList.stream().map(i->{ + HyMtpE hyMtpE = new HyMtpE(); + BeanUtils.copyProperties(i, hyMtpE); + hyMtpE.setMth(Convert.toInt(i.getMth())); + hyMtpE.setMxdypodt(DateUtils.parseDate(i.getMxdypodt())); + hyMtpE.setMxdyp(Convert.toBigDecimal(i.getMxdyp())); + hyMtpE.setMxdyp(Convert.toBigDecimal(i.getMxdyp())); + hyMtpE.setYr(Convert.toInt(i.getYr())); + hyMtpE.setP(Convert.toBigDecimal(i.getP())); + return hyMtpE; + }).collect(Collectors.toList()); + //先清空临时表的数据 + this.baseMapper.deleteTempData(); + //插入临时表数据 + int batchSize = 50; + for (int i = 0; i < records.size(); i += batchSize) { + int end = Math.min(i + batchSize, records.size()); + List batch = records.subList(i, end); + // 执行批量插入 + this.baseMapper.insertTempData(batch); + } + //从临时表增或修改主表 + this.baseMapper.mergeToData(); + } + + + @Override + public R importDateTosoft(String startTime, String endTime) { + Long userId = SecurityUtils.getUserId(); + String filename = "月降水表" + startTime + "-" + endTime+"导入到南方片"; + // 查询是否已存在相同条件且未完成的任务 + List ongoingTasks = ycExportTaskService.list( + new QueryWrapper() + .eq("user_id", userId) + .eq("status", 0) // 状态为0表示任务未完成 + .like("filename", "月降水表")); + if (!ongoingTasks.isEmpty()) { + return R.error("当前任务正在下载中，请稍后重试"); + } + YcExportTask ycExportTask = new YcExportTask(); + ycExportTask.setFilename(filename); + ycExportTask.setUserId(userId); + ycExportTask.setStartTime(new Date()); + ycExportTask.setStatus(0); + ycExportTaskService.save(ycExportTask); + CompletableFuture.runAsync(() -> { + try { + IPage pageByInfo = this.selectHyMtpDataByPageAndInfo(new PageParams(0L, 1000000000L), startTime, endTime, null, null); +// IPage pageByInfo = this.selectMaxHRainListPageByInfo(new PageParams(0L, 1000000000L), null, null, startTime, endTime); + HyMtpEServiceImpl hyMtpEService = context.getBean(HyMtpEServiceImpl.class); + hyMtpEService.importMysqlToSqlserver(pageByInfo.getRecords()); + ycExportTask.setStatus(2); + } catch (Exception e) { + ycExportTask.setStatus(4); + log.error(e.getMessage()); + R.error("任务下载失败"); + }finally { + ycExportTask.setEndTime(new Date()); + ycExportTaskService.updateById(ycExportTask); + } + }, importThreadPool); + return R.ok("任务已提交"); + } + + + private R taskAndExport(String tableName,String startTime, String endTime, String stcd, String stnm, Long userId) { + String startNewTime=""; + String endNewTime=""; + if (ObjectUtils.isNotEmpty(startTime) ){ + startNewTime=startTime.substring(0,6); + } + if (ObjectUtils.isNotEmpty(endTime)){ + endNewTime=endTime.substring(0,6); + } + String filename = tableName + startNewTime + "-" + endNewTime; + // 查询是否已存在相同条件且未完成的任务 + List ongoingTasks = ycExportTaskService.list( + new QueryWrapper() + .eq("user_id", userId) + .eq("filename", filename) + .eq("status", 0) // 状态为0表示任务未完成 + ); + + if (!ongoingTasks.isEmpty()) { + return R.error("当前任务正在下载中，请稍后重试"); + } + + YcExportTask ycExportTask = new YcExportTask(); + String pathPeffix = RuoYiConfig.getExportPath() + + File.separator + userId + File.separator+ + DateUtils.parseDateToStr("yyyy-MM-dd",DateUtils.getNowDate()) + File.separator + + DateUtils.parseDateToStr("HH_mm",DateUtils.getNowDate())+File.separator; + ycExportTask.setFilename(filename); + ycExportTask.setUserId(userId); + ycExportTask.setStartTime(new Date()); + ycExportTask.setStatus(0); + ycExportTask.setFilepath(pathPeffix); + ycExportTaskService.save(ycExportTask); + CompletableFuture.runAsync(() -> { + try { + File dest = new File(pathPeffix); + if (!dest.exists()) { + dest.mkdirs(); + } + String fullPath = pathPeffix + filename; + exportBlackData(fullPath, startTime, endTime, stcd, stnm); + + ycExportTask.setStatus(1); + ycExportTask.setEndTime(new Date()); + ycExportTaskService.updateById(ycExportTask); + } catch (Exception e) { + log.error(e.getMessage(), e); + R.error("任务下载失败"); + } + }, labelThreadPool); + return R.ok("任务已提交，请稍后下载"); + } + + + private void exportBlackData(String tableName, String startTime, String endTime, String stcd, String stnm) { + Map rainMap = CommonUtils.getMonthDataMap(new PageParams(0L, 1000000000L), startTime, endTime, stcd, stnm); + ExcelUtils.excelBackExport2("monthRain.xls", tableName, (Sheet sheet, CellStyle style) -> + dataModel1(rainMap, sheet, style)); + } + + public int dataModel1(Map map, Sheet sheet, CellStyle style) { + // 批量查询数据 + List hyMptEVos = this.baseMapper.selectHyMtpData(map); + + // 定义当前sheet的行号 + int rowIndex = 2; // 从第二行开始写入数据 + // 定义全局序号 + int globalIndex = 1; // 从1开始 + + // 定义当前sheet的编号 + int sheetIndex = 1; + + // 最大行数限制 + int maxRowsPerSheet = 65536; // 对于 .xls 文件，最大行数为 65536 + int batchSize = 1000; // 每次批量处理1000行，减少逐行写入的开销 + + // 复制表头到新sheet的逻辑 + ExcelUtils.copyHeader(sheet, style); + + // 批量处理数据 + for (int i = 0; i < hyMptEVos.size(); i += batchSize) { + // 处理一批数据 + int toIndex = Math.min(i + batchSize, hyMptEVos.size()); + List batchList = hyMptEVos.subList(i, toIndex); + + // 批量写入数据 + for (HyMptEVo vo : batchList) { + // 如果当前行数达到最大行数，创建新sheet + if (rowIndex >= maxRowsPerSheet) { + sheetIndex++; + sheet = sheet.getWorkbook().createSheet("月降水表" + sheetIndex); + rowIndex = 2; // 重置行号 + // 复制表头到新sheet + ExcelUtils.copyHeader(sheet, style); + } + + // 创建新行并写入数据 + Row row = ExcelUtils.createRow(sheet, rowIndex); + + // 使用 globalIndex 作为序号 + ExcelUtils.formatCell(row, 0, String.valueOf(globalIndex), style); + ExcelUtils.formatCell(row, 1, vo.getStcd() != null ? vo.getStcd() : "", style); + ExcelUtils.formatCell(row, 2, vo.getStnm() != null ? vo.getStnm() : "", style); + ExcelUtils.formatCell(row, 3, vo.getAddvcd() != null ? vo.getAddvcd() : "", style); + ExcelUtils.formatCell(row, 4, vo.getYr() != null ? vo.getYr() : "", style); + ExcelUtils.formatCell(row, 5, vo.getMth() != null ? vo.getMth() : "", style); + ExcelUtils.formatCell(row, 6, vo.getP() != null ? vo.getP() : "", style); + ExcelUtils.formatCell(row, 7, vo.getPrcd() != null ? vo.getPrcd() : "", style); + ExcelUtils.formatCell(row, 8, vo.getPdynum() != null ? vo.getPdynum() : "", style); + ExcelUtils.formatCell(row, 9, vo.getPdynumrcd() != null ? vo.getPdynumrcd() : "", style); + ExcelUtils.formatCell(row, 10, vo.getMxdyp() != null ? vo.getMxdyp() : "", style); + ExcelUtils.formatCell(row, 11, vo.getMxdyprcd() != null ? vo.getMxdyprcd() : "", style); + ExcelUtils.formatCell(row, 12, vo.getMxdypodt() != null ? vo.getMxdypodt() : "", style); + + // 增加行号和全局序号 + rowIndex++; + globalIndex++; + } + } + return 0; + } + + + public void rainModel(Map map, Sheet sheet, CellStyle style) { + // 批量查询数据 + List hyMptEVoIPage = this.baseMapper.selectHyMtpData(map); + // 定义当前sheet的行号 + int rowIndex = 2; + // 定义当前sheet的编号 + int sheetIndex = 1; + Row row; + // 最大行数限制 + int maxRowsPerSheet = 65536; // 对于 .xls 文件，最大行数为 65536 + int batchSize = 1000; // 每次批量处理1000行，减少逐行写入的开销 + // 批量处理数据 + for (int i = 0; i < hyMptEVoIPage.size(); i += batchSize) { + // 处理一批数据 + int toIndex = Math.min(i + batchSize, hyMptEVoIPage.size()); + List batchList = hyMptEVoIPage.subList(i, toIndex); + // 批量写入数据 + for (HyMptEVo vo : batchList) { + // 如果当前行数达到最大行数，创建新sheet + if (rowIndex >= maxRowsPerSheet) { + sheetIndex++; + sheet = sheet.getWorkbook().createSheet("月降水表_" + sheetIndex); + rowIndex = 2; // 重置行号 + } + // 创建新行并写入数据 + row = ExcelUtils.createRow(sheet, rowIndex); + //序号 + ExcelUtils.formatCell(row, 0, String.valueOf(rowIndex - 1), style); + ExcelUtils.formatCell(row, 1, vo.getStcd() != null ? vo.getStcd() : "", style); + ExcelUtils.formatCell(row, 2, vo.getStnm() != null ? vo.getStnm() : "", style); + ExcelUtils.formatCell(row, 3, vo.getAddvcd() != null ? vo.getAddvcd() : "", style); + ExcelUtils.formatCell(row, 4, vo.getYr() != null ? vo.getYr() : "", style); + ExcelUtils.formatCell(row, 5, vo.getMth() != null ? vo.getMth() : "", style); + ExcelUtils.formatCell(row, 6, vo.getP() != null ? vo.getP() : "", style); + ExcelUtils.formatCell(row, 7, vo.getPrcd() != null ? vo.getPrcd() : "", style); + ExcelUtils.formatCell(row, 8, vo.getPdynum() != null ? vo.getPdynum() : "", style); + ExcelUtils.formatCell(row, 9, vo.getPdynumrcd() != null ? vo.getPdynumrcd() : "", style); + ExcelUtils.formatCell(row, 10, vo.getMxdyp() != null ? vo.getMxdyp() : "", style); + ExcelUtils.formatCell(row, 11, vo.getMxdyprcd() != null ? vo.getMxdyprcd() : "", style); + ExcelUtils.formatCell(row, 12, vo.getMxdypodt() != null ? vo.getMxdypodt() : "", style); + rowIndex++; + } + } + } + +} + + + + diff --git a/swlscx/src/main/java/com/ruoyi/swlscx/month/service/impl/HyMtpddbEServiceImpl.java b/swlscx/src/main/java/com/ruoyi/swlscx/month/service/impl/HyMtpddbEServiceImpl.java new file mode 100644 index 0000000..4df7fd2 --- /dev/null +++ b/swlscx/src/main/java/com/ruoyi/swlscx/month/service/impl/HyMtpddbEServiceImpl.java @@ -0,0 +1,54 @@ +package com.ruoyi.swlscx.month.service.impl; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.ruoyi.common.core.text.Convert; +import com.ruoyi.common.utils.bean.BeanUtils; +import com.ruoyi.swlscx.month.domain.bo.HyMtpddbEBo; +import com.ruoyi.swlscx.month.domain.po.HyMtpddbE; +import com.ruoyi.swlscx.month.mapper.HyMtpddbEMapper; +import com.ruoyi.swlscx.month.service.HyMtpddbEService; +import com.ruoyi.swlscx.common.utils.ExcelUtils; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; +import org.springframework.web.multipart.MultipartFile; + +import java.util.List; +import java.util.stream.Collectors; + +/** +* @author 12974 +* @description 针对表【hy_mtpddb_e(月平均泥沙颗粒级配表)】的数据库操作Service实现 +* @createDate 2024-08-06 13:42:04 +*/ +@Service +public class HyMtpddbEServiceImpl extends ServiceImpl + implements HyMtpddbEService{ + + /** + * 导入月平均泥沙颗粒级配表数据 + */ + @Override + @Transactional(rollbackFor = Exception.class) + public void importHyMtpddbEData(MultipartFile file) { + try { + List hyMtpddbEBos = ExcelUtils.readExcel(file.getInputStream(), HyMtpddbEBo.class, 2); + // 获取数据 + List dataList = hyMtpddbEBos.parallelStream().map(i -> { + HyMtpddbE hyMtpddbE = new HyMtpddbE(); + BeanUtils.copyProperties(i, hyMtpddbE); + hyMtpddbE.setAvswpct(Convert.toBigDecimal(i.getAvswpct())); + hyMtpddbE.setYr(Convert.toInt(i.getYr())); + hyMtpddbE.setMth(Convert.toInt(i.getMth())); + hyMtpddbE.setLtpd(Convert.toBigDecimal(i.getLtpd())); + return hyMtpddbE; + }).collect(Collectors.toList()); + this.saveBatch(dataList,10000); + } catch (Exception e) { + throw new RuntimeException(e); + } + } +} + + + + diff --git a/swlscx/src/main/java/com/ruoyi/swlscx/month/service/impl/HyMtqEServiceImpl.java b/swlscx/src/main/java/com/ruoyi/swlscx/month/service/impl/HyMtqEServiceImpl.java new file mode 100644 index 0000000..ddf3ec0 --- /dev/null +++ b/swlscx/src/main/java/com/ruoyi/swlscx/month/service/impl/HyMtqEServiceImpl.java @@ -0,0 +1,368 @@ +package com.ruoyi.swlscx.month.service.impl; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.ruoyi.common.annotation.DataSource; +import com.ruoyi.common.config.RuoYiConfig; +import com.ruoyi.common.core.page.R; +import com.ruoyi.common.core.text.Convert; +import com.ruoyi.common.enums.DataSourceType; +import com.ruoyi.common.utils.DateUtils; +import com.ruoyi.common.utils.SecurityUtils; +import com.ruoyi.common.utils.bean.BeanUtils; +import com.ruoyi.swlscx.basic.domain.po.YcExportTask; +import com.ruoyi.swlscx.basic.service.YcExportTaskService; +import com.ruoyi.swlscx.common.PageParams; +import com.ruoyi.swlscx.month.domain.bo.HyMtqEBo; +import com.ruoyi.swlscx.month.domain.po.HyMtqE; +import com.ruoyi.swlscx.month.domain.po.HyMtweE; +import com.ruoyi.swlscx.month.domain.vo.HyMtqEVo; +import com.ruoyi.swlscx.month.domain.vo.HyMtweEVo; +import com.ruoyi.swlscx.month.mapper.HyMtqEMapper; +import com.ruoyi.swlscx.month.service.HyMtqEService; +import com.ruoyi.swlscx.common.utils.CommonUtils; +import com.ruoyi.swlscx.common.utils.ExcelUtils; +import com.ruoyi.swlscx.common.utils.Query; +import com.ruoyi.swlscx.year.domain.vo.HyHmxpFVo; +import org.apache.commons.lang3.ObjectUtils; +import org.apache.poi.ss.usermodel.CellStyle; +import org.apache.poi.ss.usermodel.Row; +import org.apache.poi.ss.usermodel.Sheet; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.context.ApplicationContext; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; +import org.springframework.web.multipart.MultipartFile; + +import javax.annotation.Resource; +import javax.servlet.http.HttpServletResponse; +import java.io.File; +import java.util.*; +import java.util.concurrent.CompletableFuture; +import java.util.concurrent.ThreadPoolExecutor; +import java.util.stream.Collectors; + +/** +* @author 12974 +* @description 针对表【hy_mtq_e(月流量表)】的数据库操作Service实现 +* @createDate 2024-08-04 12:45:25 +*/ +@Service +public class HyMtqEServiceImpl extends ServiceImpl + implements HyMtqEService{ + + @Resource + private ThreadPoolExecutor labelThreadPool; + + @Resource + private YcExportTaskService ycExportTaskService; + + + /** + * 导入月流量表数据 + */ + @Override + @Transactional(rollbackFor = Exception.class) + public void importHyMtqEData(MultipartFile file) { + try { + List hyMtqEBos = ExcelUtils.readExcel(file.getInputStream(), HyMtqEBo.class, 2); + // 获取数据 + List dataList = hyMtqEBos.parallelStream().map(i -> { + HyMtqE hyMtqE = new HyMtqE(); + BeanUtils.copyProperties(i, hyMtqE); + hyMtqE.setMth(Convert.toInt(i.getMth())); + hyMtqE.setYr(Convert.toInt(i.getYr())); + hyMtqE.setAvq(Convert.toBigDecimal(i.getAvq())); + hyMtqE.setMnq(Convert.toBigDecimal(i.getMnq())); + hyMtqE.setMxq(Convert.toBigDecimal(i.getMxq())); + hyMtqE.setMnqdt(DateUtils.parseDate(i.getMnqdt())); + hyMtqE.setMxqdt(DateUtils.parseDate(i.getMxqdt())); + return hyMtqE; + }).collect(Collectors.toList()); + this.saveBatch(dataList,10000); + } catch (Exception e) { + throw new RuntimeException(e); + } + } + + /** + * 查询月流量表数据 + */ + @Override + public IPage selectHyMtqEListPageByInfo(PageParams pageParams, String stcdIds, String startTime, String endTime,String stcd,String stnm) { + Map map = CommonUtils.getMonthDataMap(pageParams, startTime, endTime, stcd, stnm); + return this.baseMapper.selectHyMtqEPageByInfo(new Query().getPage(map), map); + + } + + /** + * 导出月流量表数据 + */ + @Override + public R exportMonthFlowList(HttpServletResponse response, String startTime, String endTime, String stcd, String stnm) { + + + Long userId = SecurityUtils.getUserId(); + String tableName = "月流量表"; + return taskAndExport(tableName,startTime, endTime, stcd, stnm, userId); + +// Map map = CommonUtils.getMonthDataMap(new PageParams(0L,100000L), startTime, endTime, stcd, stnm); +// ExcelUtils.excelExport(response,"monthFlow.xls","月流量表",(Sheet sheet, CellStyle style) ->{ +// dataModel(map, sheet, style); +// }); + } + + @Resource + private ThreadPoolExecutor importThreadPool; + + @Autowired + private ApplicationContext context; + + /** + * 从mysql导入到sqlserver中 + */ + @Transactional(rollbackFor = Exception.class) + @DataSource(DataSourceType.SHARDING) + public void importMysqlToSqlserver(List hyMtqEVoList) { + List records = hyMtqEVoList.stream().map(i->{ + HyMtqE hyMtqE = new HyMtqE(); + BeanUtils.copyProperties(i, hyMtqE); + hyMtqE.setMth(Convert.toInt(i.getMth())); + hyMtqE.setYr(Convert.toInt(i.getYr())); + hyMtqE.setAvq(Convert.toBigDecimal(i.getAvq())); + hyMtqE.setMnq(Convert.toBigDecimal(i.getMnq())); + hyMtqE.setMxq(Convert.toBigDecimal(i.getMxq())); + hyMtqE.setMnqdt(DateUtils.parseDate(i.getMnqdt())); + hyMtqE.setMxqdt(DateUtils.parseDate(i.getMxqdt())); + return hyMtqE; + }).collect(Collectors.toList()); + //先清空临时表的数据 + this.baseMapper.deleteTempData(); + //插入临时表数据 + int batchSize = 50; + for (int i = 0; i < records.size(); i += batchSize) { + int end = Math.min(i + batchSize, records.size()); + List batch = records.subList(i, end); + // 执行批量插入 + this.baseMapper.insertTempData(batch); + } + //从临时表增或修改主表 + this.baseMapper.mergeToData(); + } + + @Override + public R importDateTosoft(String startTime, String endTime) { + Long userId = SecurityUtils.getUserId(); + String filename = "月流量表" + startTime + "-" + endTime+"导入到南方片"; + // 查询是否已存在相同条件且未完成的任务 + List ongoingTasks = ycExportTaskService.list( + new QueryWrapper() + .eq("user_id", userId) + .eq("status", 0) // 状态为0表示任务未完成 + .like("filename", "月流量表")); + if (!ongoingTasks.isEmpty()) { + return R.error("当前任务正在下载中，请稍后重试"); + } + YcExportTask ycExportTask = new YcExportTask(); + ycExportTask.setFilename(filename); + ycExportTask.setUserId(userId); + ycExportTask.setStartTime(new Date()); + ycExportTask.setStatus(0); + ycExportTaskService.save(ycExportTask); + CompletableFuture.runAsync(() -> { + try { + IPage pageByInfo = this.selectHyMtqEListPageByInfo(new PageParams(0L, 1000000000L), null, startTime, endTime, null,null); +// IPage pageByInfo = this.selectMaxHRainListPageByInfo(new PageParams(0L, 1000000000L), null, null, startTime, endTime); + HyMtqEServiceImpl hyMtqEService = context.getBean(HyMtqEServiceImpl.class); + hyMtqEService.importMysqlToSqlserver(pageByInfo.getRecords()); + ycExportTask.setStatus(2); + } catch (Exception e) { + ycExportTask.setStatus(4); + log.error(e.getMessage()); + R.error("任务下载失败"); + }finally { + ycExportTask.setEndTime(new Date()); + ycExportTaskService.updateById(ycExportTask); + } + }, importThreadPool); + return R.ok("任务已提交"); + } + + private R taskAndExport(String tableName,String startTime, String endTime, String stcd, String stnm, Long userId) { + String startNewTime=""; + String endNewTime=""; + if (ObjectUtils.isNotEmpty(startTime) ){ + startNewTime=startTime.substring(0,6); + } + if (ObjectUtils.isNotEmpty(endTime)){ + endNewTime=endTime.substring(0,6); + } + String filename = tableName + startNewTime + "-" + endNewTime; + // 查询是否已存在相同条件且未完成的任务 + List ongoingTasks = ycExportTaskService.list( + new QueryWrapper() + .eq("user_id", userId) + .eq("filename", filename) + .eq("status", 0) // 状态为0表示任务未完成 + ); + + if (!ongoingTasks.isEmpty()) { + return R.error("当前任务正在下载中，请稍后重试"); + } + + YcExportTask ycExportTask = new YcExportTask(); + String pathPeffix = RuoYiConfig.getExportPath() + + File.separator + userId + File.separator+ + DateUtils.parseDateToStr("yyyy-MM-dd",DateUtils.getNowDate()) + File.separator + + DateUtils.parseDateToStr("HH_mm",DateUtils.getNowDate())+File.separator; + ycExportTask.setFilename(filename); + ycExportTask.setUserId(userId); + ycExportTask.setStartTime(new Date()); + ycExportTask.setStatus(0); + ycExportTask.setFilepath(pathPeffix); + ycExportTaskService.save(ycExportTask); + CompletableFuture.runAsync(() -> { + try { + File dest = new File(pathPeffix); + if (!dest.exists()) { + dest.mkdirs(); + } + String fullPath = pathPeffix + filename; + exportBlackData(fullPath, startTime, endTime, stcd, stnm); + + ycExportTask.setStatus(1); + ycExportTask.setEndTime(new Date()); + ycExportTaskService.updateById(ycExportTask); + } catch (Exception e) { + log.error(e.getMessage(), e); + R.error("任务下载失败"); + } + }, labelThreadPool); + return R.ok("任务已提交，请稍后下载"); + } + + private void exportBlackData(String tableName, String startTime, String endTime, String stcd, String stnm) { + Map rainMap = CommonUtils.getMonthDataMap(new PageParams(0L, 1000000000L), startTime, endTime, stcd, stnm); + ExcelUtils.excelBackExport2("monthFlow.xls", tableName, (Sheet sheet, CellStyle style) -> + dataModel1(rainMap, sheet, style)); + } + + public int dataModel1(Map map, Sheet sheet, CellStyle style) { + // 批量查询数据 + IPage hyMtqEPageByInfo = this.baseMapper.selectHyMtqEPageByInfo(new Query().getPage(map), map); + List records = hyMtqEPageByInfo.getRecords(); + + // 定义当前sheet的行号 + int rowIndex = 2; // 从第二行开始写入数据 + // 定义全局序号 + int globalIndex = 1; // 从1开始 + + // 定义当前sheet的编号 + int sheetIndex = 1; + + // 最大行数限制 + int maxRowsPerSheet = 65536; // 对于 .xls 文件，最大行数为 65536 + int batchSize = 1000; // 每次批量处理1000行，减少逐行写入的开销 + + // 复制表头到新sheet的逻辑 + ExcelUtils.copyHeader(sheet, style); + + // 批量处理数据 + for (int i = 0; i < records.size(); i += batchSize) { + // 处理一批数据 + int toIndex = Math.min(i + batchSize, records.size()); + List batchList = records.subList(i, toIndex); + + // 批量写入数据 + for (HyMtqEVo vo : batchList) { + // 如果当前行数达到最大行数，创建新sheet + if (rowIndex >= maxRowsPerSheet) { + sheetIndex++; + sheet = sheet.getWorkbook().createSheet("月流量表" + sheetIndex); + rowIndex = 2; // 重置行号 + // 复制表头到新sheet + ExcelUtils.copyHeader(sheet, style); + } + + // 创建新行并写入数据 + Row row = ExcelUtils.createRow(sheet, rowIndex); + + // 使用 globalIndex 作为序号 + ExcelUtils.formatCell(row, 0, String.valueOf(globalIndex), style); + ExcelUtils.formatCell(row, 1, vo.getStcd() != null ? vo.getStcd() : "", style); + ExcelUtils.formatCell(row, 2, vo.getStnm() != null ? vo.getStnm() : "", style); + ExcelUtils.formatCell(row, 3, vo.getAddvcd() != null ? vo.getAddvcd() : "", style); + ExcelUtils.formatCell(row,4,"",style); + ExcelUtils.formatCell(row, 5, vo.getYr() != null ? vo.getYr() : "", style); + ExcelUtils.formatCell(row, 6, vo.getMth() != null ? vo.getMth() : "", style); + ExcelUtils.formatCell(row, 7, vo.getAvq() != null ? vo.getAvq() : "", style); + ExcelUtils.formatCell(row, 8, vo.getAvqrcd() != null ? vo.getAvqrcd() : "", style); + ExcelUtils.formatCell(row, 9, vo.getMxq() != null ? vo.getMxq() : "", style); + ExcelUtils.formatCell(row, 10, vo.getMxqrcd() != null ? vo.getMxqrcd() : "", style); + ExcelUtils.formatCell(row, 11, vo.getMxqdt() != null ? vo.getMxqdt() : "", style); + ExcelUtils.formatCell(row, 12, vo.getMnq() != null ? vo.getMnq() : "", style); + ExcelUtils.formatCell(row, 13, vo.getMnqrcd() != null ? vo.getMnqrcd() : "", style); + ExcelUtils.formatCell(row, 14, vo.getMnqdt() != null ? vo.getMnqdt() : "", style); + + // 增加行号和全局序号 + rowIndex++; + globalIndex++; + } + } + return 0; + } + + public void dataModel(Map map, Sheet sheet, CellStyle style) { + + // 批量查询数据 + IPage hyMtqEPageByInfo = this.baseMapper.selectHyMtqEPageByInfo(new Query().getPage(map), map); + List records = hyMtqEPageByInfo.getRecords(); + // 定义当前sheet的行号 + int rowIndex = 2; + // 定义当前sheet的编号 + int sheetIndex = 1; + Row row; + // 最大行数限制 + int maxRowsPerSheet = 65536; // 对于 .xls 文件，最大行数为 65536 + int batchSize = 1000; // 每次批量处理1000行，减少逐行写入的开销 + // 批量处理数据 + for (int i = 0; i < records.size(); i += batchSize) { + // 处理一批数据 + int toIndex = Math.min(i + batchSize, records.size()); + List batchList = records.subList(i, toIndex); + // 批量写入数据 + for (HyMtqEVo vo : batchList) { + // 如果当前行数达到最大行数，创建新sheet + if (rowIndex >= maxRowsPerSheet) { + sheetIndex++; + sheet = sheet.getWorkbook().createSheet("月流量表" + sheetIndex); + rowIndex = 2; // 重置行号 + } + // 创建新行并写入数据 + row = ExcelUtils.createRow(sheet, rowIndex); + //序号 + ExcelUtils.formatCell(row, 0, String.valueOf(rowIndex - 1), style); + ExcelUtils.formatCell(row, 1, vo.getStcd() != null ? vo.getStcd() : "", style); + ExcelUtils.formatCell(row, 2, vo.getStnm() != null ? vo.getStnm() : "", style); + ExcelUtils.formatCell(row, 3, vo.getAddvcd() != null ? vo.getAddvcd() : "", style); + ExcelUtils.formatCell(row,4,"",style); + ExcelUtils.formatCell(row, 5, vo.getYr() != null ? vo.getYr() : "", style); + ExcelUtils.formatCell(row, 6, vo.getMth() != null ? vo.getMth() : "", style); + ExcelUtils.formatCell(row, 7, vo.getAvq() != null ? vo.getAvq() : "", style); + ExcelUtils.formatCell(row, 8, vo.getAvqrcd() != null ? vo.getAvqrcd() : "", style); + ExcelUtils.formatCell(row, 9, vo.getMxq() != null ? vo.getMxq() : "", style); + ExcelUtils.formatCell(row, 10, vo.getMxqrcd() != null ? vo.getMxqrcd() : "", style); + ExcelUtils.formatCell(row, 11, vo.getMxqdt() != null ? vo.getMxqdt() : "", style); + ExcelUtils.formatCell(row, 12, vo.getMnq() != null ? vo.getMnq() : "", style); + ExcelUtils.formatCell(row, 13, vo.getMnqrcd() != null ? vo.getMnqrcd() : "", style); + ExcelUtils.formatCell(row, 14, vo.getMnqdt() != null ? vo.getMnqdt() : "", style); + rowIndex++; + } + } + } +} + + + + diff --git a/swlscx/src/main/java/com/ruoyi/swlscx/month/service/impl/HyMtqsEServiceImpl.java b/swlscx/src/main/java/com/ruoyi/swlscx/month/service/impl/HyMtqsEServiceImpl.java new file mode 100644 index 0000000..770b9cc --- /dev/null +++ b/swlscx/src/main/java/com/ruoyi/swlscx/month/service/impl/HyMtqsEServiceImpl.java @@ -0,0 +1,354 @@ +package com.ruoyi.swlscx.month.service.impl; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.ruoyi.common.annotation.DataSource; +import com.ruoyi.common.config.RuoYiConfig; +import com.ruoyi.common.core.page.R; +import com.ruoyi.common.core.text.Convert; +import com.ruoyi.common.enums.DataSourceType; +import com.ruoyi.common.utils.DateUtils; +import com.ruoyi.common.utils.SecurityUtils; +import com.ruoyi.common.utils.bean.BeanUtils; +import com.ruoyi.swlscx.basic.domain.po.YcExportTask; +import com.ruoyi.swlscx.basic.service.YcExportTaskService; +import com.ruoyi.swlscx.common.PageParams; +import com.ruoyi.swlscx.month.domain.bo.HyMtqsEBo; +import com.ruoyi.swlscx.month.domain.po.HyMtqsE; +import com.ruoyi.swlscx.month.domain.po.HyMtweE; +import com.ruoyi.swlscx.month.domain.vo.HyMtqsEVo; +import com.ruoyi.swlscx.month.domain.vo.HyMtweEVo; +import com.ruoyi.swlscx.month.mapper.HyMtqsEMapper; +import com.ruoyi.swlscx.month.service.HyMtqsEService; +import com.ruoyi.swlscx.common.utils.CommonUtils; +import com.ruoyi.swlscx.common.utils.ExcelUtils; +import com.ruoyi.swlscx.common.utils.Query; +import com.ruoyi.swlscx.year.domain.vo.HyHmxpFVo; +import org.apache.commons.lang3.ObjectUtils; +import org.apache.poi.ss.usermodel.CellStyle; +import org.apache.poi.ss.usermodel.Row; +import org.apache.poi.ss.usermodel.Sheet; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.context.ApplicationContext; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; +import org.springframework.web.multipart.MultipartFile; + +import javax.annotation.Resource; +import javax.servlet.http.HttpServletResponse; +import java.io.File; +import java.util.*; +import java.util.concurrent.CompletableFuture; +import java.util.concurrent.ThreadPoolExecutor; +import java.util.stream.Collectors; + +/** +* @author 12974 +* @description 针对表【hy_mtqs_e(月输沙率表)】的数据库操作Service实现 +* @createDate 2024-08-05 16:03:07 +*/ +@Service +public class HyMtqsEServiceImpl extends ServiceImpl + implements HyMtqsEService{ + + @Resource + private ThreadPoolExecutor labelThreadPool; + + @Resource + private YcExportTaskService ycExportTaskService; + + @Override + @Transactional(rollbackFor = Exception.class) + public void importHyMtqsEData(MultipartFile file) { + try { + List hyMtqsEBos = ExcelUtils.readExcel(file.getInputStream(), HyMtqsEBo.class, 2); + // 获取数据 + List dataList = hyMtqsEBos.parallelStream().map(i -> { + HyMtqsE hyMtqE = new HyMtqsE(); + BeanUtils.copyProperties(i, hyMtqE); + hyMtqE.setYr(Convert.toInt(i.getYr())); + hyMtqE.setMth(Convert.toInt(i.getMth())); + hyMtqE.setAvqs(Convert.toBigDecimal(i.getAvqs())); + hyMtqE.setMxdyqs(Convert.toBigDecimal(i.getMxdyqs())); + hyMtqE.setMxdyqsodt(DateUtils.parseDate(i.getMxdyqsodt())); + return hyMtqE; + }).collect(Collectors.toList()); + this.saveBatch(dataList,10000); + } catch (Exception e) { + throw new RuntimeException(e); + } + } + + /** + * 查询月输沙率表数据 + */ + @Override + public IPage selectHyMtqsEDataByPageAndInfo(PageParams pageParams, String stcdIds, String startTime, String endTime,String stcd,String stnm) { + Map map = CommonUtils.getMonthDataMap(pageParams, startTime, endTime, stcd, stnm); + return this.baseMapper.selectHyMtqsEByPageAndInfo(new Query().getPage(map), map); + } + + /** + * 导出月输沙率表 + */ + @Override + public R exportMonthSedimentDischargeList(HttpServletResponse response, String startTime, String endTime, String stcd, String stnm) { + + Long userId = SecurityUtils.getUserId(); + String tableName = "月输沙率表"; + return taskAndExport(tableName,startTime, endTime, stcd, stnm, userId); + +// Map map = CommonUtils.getMonthDataMap(new PageParams(0L,100000L), startTime, endTime, stcd, stnm); +// ExcelUtils.excelExport(response,"momthSedimentTransportRate.xls","月输沙率表",(Sheet sheet, CellStyle style) ->{ +// dataModel(map, sheet, style); +// }); + } + + + @Resource + private ThreadPoolExecutor importThreadPool; + + @Autowired + private ApplicationContext context; + + /** + * 从mysql导入到sqlserver中 + */ + @Transactional(rollbackFor = Exception.class) + @DataSource(DataSourceType.SHARDING) + public void importMysqlToSqlserver(List hyMtqsEVoList) { + List records = hyMtqsEVoList.stream().map(i->{ + HyMtqsE hyMtqE = new HyMtqsE(); + BeanUtils.copyProperties(i, hyMtqE); + hyMtqE.setYr(Convert.toInt(i.getYr())); + hyMtqE.setMth(Convert.toInt(i.getMth())); + hyMtqE.setAvqs(Convert.toBigDecimal(i.getAvqs())); + hyMtqE.setMxdyqs(Convert.toBigDecimal(i.getMxdyqs())); + hyMtqE.setMxdyqsodt(DateUtils.parseDate(i.getMxdyqsodt())); + return hyMtqE; + }).collect(Collectors.toList()); + //先清空临时表的数据 + this.baseMapper.deleteTempData(); + //插入临时表数据 + int batchSize = 50; + for (int i = 0; i < records.size(); i += batchSize) { + int end = Math.min(i + batchSize, records.size()); + List batch = records.subList(i, end); + // 执行批量插入 + this.baseMapper.insertTempData(batch); + } + //从临时表增或修改主表 + this.baseMapper.mergeToData(); + } + + @Override + public R importDateTosoft(String startTime, String endTime) { + Long userId = SecurityUtils.getUserId(); + String filename = "月输沙率表" + startTime + "-" + endTime+"导入到南方片"; + // 查询是否已存在相同条件且未完成的任务 + List ongoingTasks = ycExportTaskService.list( + new QueryWrapper() + .eq("user_id", userId) + .eq("status", 0) // 状态为0表示任务未完成 + .like("filename", "月输沙率表")); + if (!ongoingTasks.isEmpty()) { + return R.error("当前任务正在下载中，请稍后重试"); + } + YcExportTask ycExportTask = new YcExportTask(); + ycExportTask.setFilename(filename); + ycExportTask.setUserId(userId); + ycExportTask.setStartTime(new Date()); + ycExportTask.setStatus(0); + ycExportTaskService.save(ycExportTask); + CompletableFuture.runAsync(() -> { + try { + IPage pageByInfo = this.selectHyMtqsEDataByPageAndInfo(new PageParams(0L, 1000000000L), null, startTime, endTime, null,null); +// IPage pageByInfo = this.selectMaxHRainListPageByInfo(new PageParams(0L, 1000000000L), null, null, startTime, endTime); + HyMtqsEServiceImpl hyMtqsEService = context.getBean(HyMtqsEServiceImpl.class); + hyMtqsEService.importMysqlToSqlserver(pageByInfo.getRecords()); + ycExportTask.setStatus(2); + } catch (Exception e) { + ycExportTask.setStatus(4); + log.error(e.getMessage()); + R.error("任务下载失败"); + }finally { + ycExportTask.setEndTime(new Date()); + ycExportTaskService.updateById(ycExportTask); + } + }, importThreadPool); + return R.ok("任务已提交"); + } + + private R taskAndExport(String tableName,String startTime, String endTime, String stcd, String stnm, Long userId) { + String startNewTime=""; + String endNewTime=""; + if (ObjectUtils.isNotEmpty(startTime) ){ + startNewTime=startTime.substring(0,6); + } + if (ObjectUtils.isNotEmpty(endTime)){ + endNewTime=endTime.substring(0,6); + } + String filename = tableName + startNewTime + "-" + endNewTime; + // 查询是否已存在相同条件且未完成的任务 + List ongoingTasks = ycExportTaskService.list( + new QueryWrapper() + .eq("user_id", userId) + .eq("filename", filename) + .eq("status", 0) // 状态为0表示任务未完成 + ); + + if (!ongoingTasks.isEmpty()) { + return R.error("当前任务正在下载中，请稍后重试"); + } + + YcExportTask ycExportTask = new YcExportTask(); + String pathPeffix = RuoYiConfig.getExportPath() + + File.separator + userId + File.separator+ + DateUtils.parseDateToStr("yyyy-MM-dd",DateUtils.getNowDate()) + File.separator + + DateUtils.parseDateToStr("HH_mm",DateUtils.getNowDate())+File.separator; + ycExportTask.setFilename(filename); + ycExportTask.setUserId(userId); + ycExportTask.setStartTime(new Date()); + ycExportTask.setStatus(0); + ycExportTask.setFilepath(pathPeffix); + ycExportTaskService.save(ycExportTask); + CompletableFuture.runAsync(() -> { + try { + File dest = new File(pathPeffix); + if (!dest.exists()) { + dest.mkdirs(); + } + String fullPath = pathPeffix + filename; + exportBlackData(fullPath, startTime, endTime, stcd, stnm); + + ycExportTask.setStatus(1); + ycExportTask.setEndTime(new Date()); + ycExportTaskService.updateById(ycExportTask); + } catch (Exception e) { + log.error(e.getMessage(), e); + R.error("任务下载失败"); + } + }, labelThreadPool); + return R.ok("任务已提交，请稍后下载"); + } + + private void exportBlackData(String tableName, String startTime, String endTime, String stcd, String stnm) { + Map rainMap = CommonUtils.getMonthDataMap(new PageParams(0L, 1000000000L), startTime, endTime, stcd, stnm); + ExcelUtils.excelBackExport2("momthSedimentTransportRate.xls", tableName, (Sheet sheet, CellStyle style) -> + dataModel1(rainMap, sheet, style)); + } + + public int dataModel1(Map map, Sheet sheet, CellStyle style) { + // 批量查询数据 + IPage hyMtqsEVoIPage = this.baseMapper.selectHyMtqsEByPageAndInfo(new Query().getPage(map), map); + List records = hyMtqsEVoIPage.getRecords(); + + // 定义当前sheet的行号 + int rowIndex = 2; // 从第二行开始写入数据 + // 定义全局序号 + int globalIndex = 1; // 从1开始 + + // 定义当前sheet的编号 + int sheetIndex = 1; + + // 最大行数限制 + int maxRowsPerSheet = 65536; // 对于 .xls 文件，最大行数为 65536 + int batchSize = 1000; // 每次批量处理1000行，减少逐行写入的开销 + + // 复制表头到新sheet的逻辑 + ExcelUtils.copyHeader(sheet, style); + + // 批量处理数据 + for (int i = 0; i < records.size(); i += batchSize) { + // 处理一批数据 + int toIndex = Math.min(i + batchSize, records.size()); + List batchList = records.subList(i, toIndex); + + // 批量写入数据 + for (HyMtqsEVo vo : batchList) { + // 如果当前行数达到最大行数，创建新sheet + if (rowIndex >= maxRowsPerSheet) { + sheetIndex++; + sheet = sheet.getWorkbook().createSheet("月水面蒸发量表" + sheetIndex); + rowIndex = 2; // 重置行号 + // 复制表头到新sheet + ExcelUtils.copyHeader(sheet, style); + } + + // 创建新行并写入数据 + Row row = ExcelUtils.createRow(sheet, rowIndex); + + // 使用 globalIndex 作为序号 + ExcelUtils.formatCell(row, 0, String.valueOf(globalIndex), style); + ExcelUtils.formatCell(row, 1, vo.getStcd() != null ? vo.getStcd() : "", style); + ExcelUtils.formatCell(row, 2, vo.getStnm() != null ? vo.getStnm() : "", style); + ExcelUtils.formatCell(row, 3, vo.getAddvcd() != null ? vo.getAddvcd() : "", style); + ExcelUtils.formatCell(row,4,"",style); + ExcelUtils.formatCell(row, 5, vo.getYr() != null ? vo.getYr().toString() : "", style); + ExcelUtils.formatCell(row, 6, vo.getMth() != null ? vo.getMth().toString() : "", style); + ExcelUtils.formatCell(row, 7, vo.getSdtp() != null ? vo.getSdtp() : "", style); + ExcelUtils.formatCell(row, 8, vo.getAvqs() != null ? CommonUtils.formatNum(vo.getAvqs()) : "", style); + ExcelUtils.formatCell(row, 9, vo.getAvqsrcd() != null ? vo.getAvqsrcd() : "", style); + ExcelUtils.formatCell(row, 10, vo.getMxdyqs() != null ? CommonUtils.formatNum(vo.getMxdyqs()) : "", style); + ExcelUtils.formatCell(row, 11, vo.getMxdyqsrcd() != null ? vo.getMxdyqsrcd() : "", style); + ExcelUtils.formatCell(row, 12, vo.getMxdyqsodt() != null ? vo.getMxdyqsodt() : "", style); + + // 增加行号和全局序号 + rowIndex++; + globalIndex++; + } + } + return 0; + } + + public void dataModel(Map map, Sheet sheet, CellStyle style) { + // 批量查询数据 + IPage hyMtqsEVoIPage = this.baseMapper.selectHyMtqsEByPageAndInfo(new Query().getPage(map), map); + List records = hyMtqsEVoIPage.getRecords(); + // 定义当前sheet的行号 + int rowIndex = 2; + // 定义当前sheet的编号 + int sheetIndex = 1; + Row row; + // 最大行数限制 + int maxRowsPerSheet = 65536; // 对于 .xls 文件，最大行数为 65536 + int batchSize = 1000; // 每次批量处理1000行，减少逐行写入的开销 + // 批量处理数据 + for (int i = 0; i < records.size(); i += batchSize) { + // 处理一批数据 + int toIndex = Math.min(i + batchSize, records.size()); + List batchList = records.subList(i, toIndex); + // 批量写入数据 + for (HyMtqsEVo vo : batchList) { + // 如果当前行数达到最大行数，创建新sheet + if (rowIndex >= maxRowsPerSheet) { + sheetIndex++; + sheet = sheet.getWorkbook().createSheet("月水面蒸发量表" + sheetIndex); + rowIndex = 2; // 重置行号 + } + // 创建新行并写入数据 + row = ExcelUtils.createRow(sheet, rowIndex); + //序号 + ExcelUtils.formatCell(row, 0, String.valueOf(rowIndex - 1), style); + ExcelUtils.formatCell(row, 1, vo.getStcd() != null ? vo.getStcd() : "", style); + ExcelUtils.formatCell(row, 2, vo.getStnm() != null ? vo.getStnm() : "", style); + ExcelUtils.formatCell(row, 3, vo.getAddvcd() != null ? vo.getAddvcd() : "", style); + ExcelUtils.formatCell(row,4,"",style); + ExcelUtils.formatCell(row, 5, vo.getYr() != null ? vo.getYr().toString() : "", style); + ExcelUtils.formatCell(row, 6, vo.getMth() != null ? vo.getMth().toString() : "", style); + ExcelUtils.formatCell(row, 7, vo.getSdtp() != null ? vo.getSdtp() : "", style); + ExcelUtils.formatCell(row, 8, vo.getAvqs() != null ? CommonUtils.formatNum(vo.getAvqs()) : "", style); + ExcelUtils.formatCell(row, 9, vo.getAvqsrcd() != null ? vo.getAvqsrcd() : "", style); + ExcelUtils.formatCell(row, 10, vo.getMxdyqs() != null ? CommonUtils.formatNum(vo.getMxdyqs()) : "", style); + ExcelUtils.formatCell(row, 11, vo.getMxdyqsrcd() != null ? vo.getMxdyqsrcd() : "", style); + ExcelUtils.formatCell(row, 12, vo.getMxdyqsodt() != null ? vo.getMxdyqsodt() : "", style); + rowIndex++; + } + } + } +} + + + + diff --git a/swlscx/src/main/java/com/ruoyi/swlscx/month/service/impl/HyMttdzEServiceImpl.java b/swlscx/src/main/java/com/ruoyi/swlscx/month/service/impl/HyMttdzEServiceImpl.java new file mode 100644 index 0000000..3d2d2c9 --- /dev/null +++ b/swlscx/src/main/java/com/ruoyi/swlscx/month/service/impl/HyMttdzEServiceImpl.java @@ -0,0 +1,402 @@ +package com.ruoyi.swlscx.month.service.impl; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.ruoyi.common.config.RuoYiConfig; +import com.ruoyi.common.core.page.R; +import com.ruoyi.common.core.text.Convert; +import com.ruoyi.common.utils.DateUtils; +import com.ruoyi.common.utils.SecurityUtils; +import com.ruoyi.common.utils.bean.BeanUtils; +import com.ruoyi.swlscx.basic.domain.po.YcExportTask; +import com.ruoyi.swlscx.basic.service.YcExportTaskService; +import com.ruoyi.swlscx.common.PageParams; +import com.ruoyi.swlscx.month.domain.bo.HyMttdzEBo; +import com.ruoyi.swlscx.month.domain.po.HyMttdzE; +import com.ruoyi.swlscx.month.domain.vo.HyMttdzEVo; +import com.ruoyi.swlscx.month.mapper.HyMttdzEMapper; +import com.ruoyi.swlscx.month.service.HyMttdzEService; +import com.ruoyi.swlscx.common.utils.CommonUtils; +import com.ruoyi.swlscx.common.utils.ExcelUtils; +import com.ruoyi.swlscx.common.utils.Query; +import com.ruoyi.swlscx.year.domain.vo.HyHmxpFVo; +import org.apache.commons.lang3.ObjectUtils; +import org.apache.poi.ss.usermodel.CellStyle; +import org.apache.poi.ss.usermodel.Row; +import org.apache.poi.ss.usermodel.Sheet; +import org.springframework.stereotype.Service; +import org.springframework.web.multipart.MultipartFile; + +import javax.annotation.Resource; +import javax.servlet.http.HttpServletResponse; +import java.io.File; +import java.util.Date; +import java.util.List; +import java.util.Map; +import java.util.concurrent.CompletableFuture; +import java.util.concurrent.ThreadPoolExecutor; +import java.util.stream.Collectors; + +/** + * @author 12974 + * @description 针对表【hy_mttdz_e】的数据库操作Service实现 + * @createDate 2024-08-04 12:45:25 + */ +@Service +public class HyMttdzEServiceImpl extends ServiceImpl + implements HyMttdzEService { + + @Resource + private ThreadPoolExecutor labelThreadPool; + + @Resource + private YcExportTaskService ycExportTaskService; + /** + * 导入月潮位数据 + */ + @Override + public void importHyMttdzEData(MultipartFile file) { + try { + List hyMttdzEBos = ExcelUtils.readExcel(file.getInputStream(), HyMttdzEBo.class, 2); + // 获取数据 + List dataList = hyMttdzEBos.parallelStream().map(i -> { + HyMttdzE hyMttdzE = new HyMttdzE(); + BeanUtils.copyProperties(i, hyMttdzE); + hyMttdzE.setYr(Convert.toInt(i.getYr())); + hyMttdzE.setMth(Convert.toInt(i.getMth())); + hyMttdzE.setAvhtdz(Convert.toBigDecimal(i.getAvhtdz())); + hyMttdzE.setHthtdz(Convert.toBigDecimal(i.getHthtdz())); + hyMttdzE.setHthtdzotm(DateUtils.parseDate(i.getHthtdzotm())); + hyMttdzE.setLthtdz(Convert.toBigDecimal(i.getLthtdz())); + hyMttdzE.setLthtdzotm(DateUtils.parseDate(i.getLthtdzotm())); + hyMttdzE.setAvltdz(Convert.toBigDecimal(i.getAvltdz())); + hyMttdzE.setHtltdz(Convert.toBigDecimal(i.getHtltdz())); + hyMttdzE.setHtltdzotm(DateUtils.parseDate(i.getHtltdzotm())); + hyMttdzE.setLtltdz(Convert.toBigDecimal(i.getLtltdz())); + hyMttdzE.setLtltdzotm(DateUtils.parseDate(i.getLtltdzotm())); + hyMttdzE.setAvftdr(Convert.toBigDecimal(i.getAvftdr())); + hyMttdzE.setMxfltdr(Convert.toBigDecimal(i.getMxfltdr())); + hyMttdzE.setMxfltdrhtm(DateUtils.parseDate(i.getMxfltdrhtm())); + hyMttdzE.setMnfltdr(Convert.toBigDecimal(i.getMnfltdr())); + hyMttdzE.setMnfltdrhtm(DateUtils.parseDate(i.getMnfltdrhtm())); + hyMttdzE.setAver(Convert.toBigDecimal(i.getAver())); + hyMttdzE.setMxebtdr(Convert.toBigDecimal(i.getMxebtdr())); + hyMttdzE.setMxebtdrht(DateUtils.parseDate(i.getMxebtdrht())); + hyMttdzE.setMnebtdr(Convert.toBigDecimal(i.getMnebtdr())); + hyMttdzE.setMnebtdrhtm(DateUtils.parseDate(i.getMnebtdrhtm())); + hyMttdzE.setAvftd(Convert.toInt(i.getAvftd())); + hyMttdzE.setMxfltddr(Convert.toInt(i.getMxfltddr())); + hyMttdzE.setMxfltddrhtm(DateUtils.parseDate(i.getMxfltddrhtm())); + hyMttdzE.setMnfltddr(Convert.toInt(i.getMnfltddr())); + hyMttdzE.setMnfltddrhtm(DateUtils.parseDate(i.getMnfltddrhtm())); + hyMttdzE.setAvebbdr(Convert.toInt(i.getAvebbdr())); + hyMttdzE.setMxebtddr(Convert.toInt(i.getMxebtddr())); + hyMttdzE.setMxebtddrhtm(DateUtils.parseDate(i.getMxebtddrhtm())); + hyMttdzE.setMnbtddr(Convert.toInt(i.getMnbtddr())); + hyMttdzE.setMnebtddrhtm(DateUtils.parseDate(i.getMnebtddrhtm())); + hyMttdzE.setHravtdz(Convert.toBigDecimal(i.getHravtdz())); + hyMttdzE.setAvtdr(Convert.toBigDecimal(i.getAvtdr())); + hyMttdzE.setAvtddr(Convert.toInt(i.getAvtddr())); + return hyMttdzE; + }).collect(Collectors.toList()); + this.saveBatch(dataList, 10000); + } catch (Exception e) { + throw new RuntimeException(e); + } + } + + @Override + public R selectHyMttdzEListPageByInfo(PageParams pageParams, String stcdIds, String startTime, String endTime, String stcd, String stnm) { + Map map = CommonUtils.getMonthDataMap(pageParams, startTime, endTime, stcd, stnm); + IPage hyMtweEListPageByInfo = this.baseMapper.selectHyMttdzListPageByInfo(new Query().getPage(map), map); + return R.ok().put("data", hyMtweEListPageByInfo.getRecords()).put("count", hyMtweEListPageByInfo.getTotal()); + } + + /** + * 导出月潮位表数据 + */ + @Override + public R exportMonthTideLeverList(HttpServletResponse response, String startTime, String endTime, String stcd, String stnm) { + Long userId = SecurityUtils.getUserId(); + String tableName = "月潮位表"; + return taskAndExport(tableName,startTime, endTime, stcd, stnm, userId); + + + +// Map map = CommonUtils.getMonthDataMap(new PageParams(0L, 100000L), startTime, endTime, stcd, stnm); +// ExcelUtils.excelExport(response, "monthTideLever.xls", "月潮位表", (Sheet sheet, CellStyle style) -> { +// dataModel(map, sheet, style); +// }); + } + + private R taskAndExport(String tableName,String startTime, String endTime, String stcd, String stnm, Long userId) { + String startNewTime=""; + String endNewTime=""; + if (ObjectUtils.isNotEmpty(startTime) ){ + startNewTime=startTime.substring(0,6); + } + if (ObjectUtils.isNotEmpty(endTime)){ + endNewTime=endTime.substring(0,6); + } + String filename = tableName + startNewTime + "-" + endNewTime; + // 查询是否已存在相同条件且未完成的任务 + List ongoingTasks = ycExportTaskService.list( + new QueryWrapper() + .eq("user_id", userId) + .eq("filename", filename) + .eq("status", 0) // 状态为0表示任务未完成 + ); + + if (!ongoingTasks.isEmpty()) { + return R.error("当前任务正在下载中，请稍后重试"); + } + + YcExportTask ycExportTask = new YcExportTask(); + String pathPeffix = RuoYiConfig.getExportPath() + + File.separator + userId + File.separator+ + DateUtils.parseDateToStr("yyyy-MM-dd",DateUtils.getNowDate()) + File.separator + + DateUtils.parseDateToStr("HH_mm",DateUtils.getNowDate())+File.separator; + ycExportTask.setFilename(filename); + ycExportTask.setUserId(userId); + ycExportTask.setStartTime(new Date()); + ycExportTask.setStatus(0); + ycExportTask.setFilepath(pathPeffix); + ycExportTaskService.save(ycExportTask); + CompletableFuture.runAsync(() -> { + try { + File dest = new File(pathPeffix); + if (!dest.exists()) { + dest.mkdirs(); + } + String fullPath = pathPeffix + filename; + exportBlackData(fullPath, startTime, endTime, stcd, stnm); + + ycExportTask.setStatus(1); + ycExportTask.setEndTime(new Date()); + ycExportTaskService.updateById(ycExportTask); + } catch (Exception e) { + log.error(e.getMessage(), e); + R.error("任务下载失败"); + } + }, labelThreadPool); + return R.ok("任务已提交，请稍后下载"); + } + + private void exportBlackData(String tableName, String startTime, String endTime, String stcd, String stnm) { + Map rainMap = CommonUtils.getMonthDataMap(new PageParams(0L, 1000000000L), startTime, endTime, stcd, stnm); + ExcelUtils.excelBackExport2("monthTideLever.xls", tableName, (Sheet sheet, CellStyle style) -> + dataModel1(rainMap, sheet, style)); + } + + public int dataModel1(Map map, Sheet sheet, CellStyle style) { + // 批量查询数据 + IPage hyMtweEListPageByInfo = this.baseMapper.selectHyMttdzListPageByInfo(new Query().getPage(map), map); + List records = hyMtweEListPageByInfo.getRecords(); + + // 定义当前sheet的行号 + int rowIndex = 2; // 从第二行开始写入数据 + // 定义全局序号 + int globalIndex = 1; // 从1开始 + + // 定义当前sheet的编号 + int sheetIndex = 1; + + // 最大行数限制 + int maxRowsPerSheet = 65536; // 对于 .xls 文件，最大行数为 65536 + int batchSize = 1000; // 每次批量处理1000行，减少逐行写入的开销 + + // 复制表头到新sheet的逻辑 + ExcelUtils.copyHeader(sheet, style); + + // 批量处理数据 + for (int i = 0; i < records.size(); i += batchSize) { + // 处理一批数据 + int toIndex = Math.min(i + batchSize, records.size()); + List batchList = records.subList(i, toIndex); + + // 批量写入数据 + for (HyMttdzEVo vo : batchList) { + // 如果当前行数达到最大行数，创建新sheet + if (rowIndex >= maxRowsPerSheet) { + sheetIndex++; + sheet = sheet.getWorkbook().createSheet("月潮位表" + sheetIndex); + rowIndex = 2; // 重置行号 + // 复制表头到新sheet + ExcelUtils.copyHeader(sheet, style); + } + + // 创建新行并写入数据 + Row row = ExcelUtils.createRow(sheet, rowIndex); + + // 使用 globalIndex 作为序号 + ExcelUtils.formatCell(row, 0, String.valueOf(globalIndex), style); + ExcelUtils.formatCell(row, 1, vo.getStcd() != null ? vo.getStcd() : "", style); + ExcelUtils.formatCell(row, 2, vo.getStnm() != null ? vo.getStnm() : "", style); + ExcelUtils.formatCell(row, 3, vo.getAddvcd() != null ? vo.getAddvcd() : "", style); + ExcelUtils.formatCell(row, 4, "", style); + ExcelUtils.formatCell(row, 5, vo.getYr() != null ? vo.getYr().toString() : "", style); + ExcelUtils.formatCell(row, 6, vo.getMth() != null ? vo.getMth().toString() : "", style); + ExcelUtils.formatCell(row, 7, vo.getAvhtdz() != null ? CommonUtils.formatNum(vo.getAvhtdz()) : "", style); + ExcelUtils.formatCell(row, 8, vo.getAvhtdzrcd() != null ? vo.getAvhtdzrcd() : "", style); + ExcelUtils.formatCell(row, 9, vo.getHthtdz() != null ? CommonUtils.formatNum(vo.getHthtdz()) : "", style); + ExcelUtils.formatCell(row, 10, vo.getHthtdzrcd() != null ? vo.getHthtdzrcd() : "", style); + ExcelUtils.formatCell(row, 11, vo.getHthtdzotm() != null ? vo.getHthtdzotm() : "", style); + ExcelUtils.formatCell(row, 12, vo.getLthtdz() != null ? CommonUtils.formatNum(vo.getLthtdz()) : "", style); + ExcelUtils.formatCell(row, 13, vo.getLthtdzrcd() != null ? vo.getLthtdzrcd() : "", style); + ExcelUtils.formatCell(row, 14, vo.getLthtdzotm() != null ? vo.getLthtdzotm() : "", style); + ExcelUtils.formatCell(row, 15, vo.getAvltdz() != null ? CommonUtils.formatNum(vo.getAvltdz()) : "", style); + ExcelUtils.formatCell(row, 16, vo.getAvltdzrcd() != null ? vo.getAvltdzrcd() : "", style); + ExcelUtils.formatCell(row, 17, vo.getHtltdz() != null ? CommonUtils.formatNum(vo.getHtltdz()) : "", style); + ExcelUtils.formatCell(row, 18, vo.getHtltdzrcd() != null ? vo.getHtltdzrcd() : "", style); + ExcelUtils.formatCell(row, 19, vo.getHtltdzotm() != null ? vo.getHtltdzotm() : "", style); + ExcelUtils.formatCell(row, 20, vo.getLtltdz() != null ? CommonUtils.formatNum(vo.getLtltdz()) : "", style); + ExcelUtils.formatCell(row, 21, vo.getLtltdzrcd() != null ? vo.getLtltdzrcd() : "", style); + ExcelUtils.formatCell(row, 22, vo.getLtltdzotm() != null ? vo.getLtltdzotm() : "", style); + ExcelUtils.formatCell(row, 23, vo.getAvftdr() != null ? CommonUtils.formatNum(vo.getAvftdr()) : "", style); + ExcelUtils.formatCell(row, 24, vo.getAvftdrrcd() != null ? vo.getAvftdrrcd() : "", style); + ExcelUtils.formatCell(row, 25, vo.getMxfltdr() != null ? CommonUtils.formatNum(vo.getMxfltdr()) : "", style); + ExcelUtils.formatCell(row, 26, vo.getMxfltdrrcd() != null ? vo.getMxfltdrrcd() : "", style); + ExcelUtils.formatCell(row, 27, vo.getMxfltdrhtm() != null ? vo.getMxfltdrhtm() : "", style); + ExcelUtils.formatCell(row, 28, vo.getMnfltdr() != null ? CommonUtils.formatNum(vo.getMnfltdr()) : "", style); + ExcelUtils.formatCell(row, 29, vo.getMnfltdrrcd() != null ? vo.getMnfltdrrcd() : "", style); + ExcelUtils.formatCell(row, 30, vo.getMnfltdrhtm() != null ? vo.getMnfltdrhtm() : "", style); + ExcelUtils.formatCell(row, 31, vo.getAver() != null ? CommonUtils.formatNum(vo.getAver()) : "", style); + ExcelUtils.formatCell(row, 32, vo.getAverbbrrcd() != null ? vo.getAverbbrrcd() : "", style); + ExcelUtils.formatCell(row, 33, vo.getMxebtdr() != null ? CommonUtils.formatNum(vo.getMxebtdr()) : "", style); + ExcelUtils.formatCell(row, 34, vo.getMxebtdrrcd() != null ? vo.getMxebtdrrcd() : "", style); + ExcelUtils.formatCell(row, 35, vo.getMxebtdrht() != null ? vo.getMxebtdrht() : "", style); + ExcelUtils.formatCell(row, 36, vo.getMnebtdr() != null ? CommonUtils.formatNum(vo.getMnebtdr()) : "", style); + ExcelUtils.formatCell(row, 37, vo.getMnebtdrrcd() != null ? vo.getMnebtdrrcd() : "", style); + ExcelUtils.formatCell(row, 38, vo.getMnebtdrhtm() != null ? vo.getMnebtdrhtm() : "", style); + ExcelUtils.formatCell(row, 39, vo.getAvftd() != null ? vo.getAvftd().toString() : "", style); + ExcelUtils.formatCell(row, 40, vo.getAvftdrcd() != null ? vo.getAvftdrcd() : "", style); + ExcelUtils.formatCell(row, 41, vo.getMxfltddr() != null ? vo.getMxfltddr().toString() : "", style); + ExcelUtils.formatCell(row, 42, vo.getMxfltddrrcd() != null ? vo.getMxfltddrrcd() : "", style); + ExcelUtils.formatCell(row, 43, vo.getMxfltddrhtm() != null ? vo.getMxfltddrhtm() : "", style); + ExcelUtils.formatCell(row, 44, vo.getMnfltddr() != null ? vo.getMnfltddr().toString() : "", style); + ExcelUtils.formatCell(row, 45, vo.getMnfltddrrcd() != null ? vo.getMnfltddrrcd() : "", style); + ExcelUtils.formatCell(row, 46, vo.getMnfltddrhtm() != null ? vo.getMnfltddrhtm() : "", style); + ExcelUtils.formatCell(row, 47, vo.getAvebbdr() != null ? vo.getAvebbdr().toString() : "", style); + ExcelUtils.formatCell(row, 48, vo.getAvedrc() != null ? vo.getAvedrc() : "", style); + ExcelUtils.formatCell(row, 49, vo.getMxebtddr() != null ? vo.getMxebtddr().toString() : "", style); + ExcelUtils.formatCell(row, 50, vo.getMxebtddrrcd() != null ? vo.getMxebtddrrcd() : "", style); + ExcelUtils.formatCell(row, 51, vo.getMxebtddrhtm() != null ? vo.getMxebtddrhtm() : "", style); + ExcelUtils.formatCell(row, 52, vo.getMnbtddr() != null ? vo.getMnbtddr().toString() : "", style); + ExcelUtils.formatCell(row, 53, vo.getMnebtddrrcd() != null ? vo.getMnebtddrrcd() : "", style); + ExcelUtils.formatCell(row, 54, vo.getMnebtddrhtm() != null ? vo.getMnebtddrhtm() : "", style); + ExcelUtils.formatCell(row, 55, vo.getHravtdz() != null ? CommonUtils.formatNum(vo.getHravtdz()) : "", style); + ExcelUtils.formatCell(row, 56, vo.getHravtdzrcd() != null ? vo.getHravtdzrcd() : "", style); + ExcelUtils.formatCell(row, 57, vo.getAvtdr() != null ? CommonUtils.formatNum(vo.getAvtdr()) : "", style); + ExcelUtils.formatCell(row, 58, vo.getAvtdrrcd() != null ? vo.getAvtdrrcd() : "", style); + ExcelUtils.formatCell(row, 59, vo.getAvtddr() != null ? vo.getAvtddr().toString() : "", style); + ExcelUtils.formatCell(row, 60, vo.getAvtddrrcd() != null ? vo.getAvtddrrcd() : "", style); + + // 增加行号和全局序号 + rowIndex++; + globalIndex++; + } + } + return 0; + } + + + public void dataModel(Map map, Sheet sheet, CellStyle style) { + // 批量查询数据 + IPage hyMtweEListPageByInfo = this.baseMapper.selectHyMttdzListPageByInfo(new Query().getPage(map), map); + List records = hyMtweEListPageByInfo.getRecords(); + // 定义当前sheet的行号 + int rowIndex = 2; + // 定义当前sheet的编号 + int sheetIndex = 1; + Row row; + // 最大行数限制 + int maxRowsPerSheet = 65536; // 对于 .xls 文件，最大行数为 65536 + int batchSize = 1000; // 每次批量处理1000行，减少逐行写入的开销 + // 批量处理数据 + for (int i = 0; i < records.size(); i += batchSize) { + // 处理一批数据 + int toIndex = Math.min(i + batchSize, records.size()); + List batchList = records.subList(i, toIndex); + // 批量写入数据 + for (HyMttdzEVo vo : batchList) { + // 如果当前行数达到最大行数，创建新sheet + if (rowIndex >= maxRowsPerSheet) { + sheetIndex++; + sheet = sheet.getWorkbook().createSheet("月潮位表" + sheetIndex); + rowIndex = 2; // 重置行号 + } + // 创建新行并写入数据 + row = ExcelUtils.createRow(sheet, rowIndex); + //序号 + ExcelUtils.formatCell(row, 0, String.valueOf(rowIndex - 1), style); + ExcelUtils.formatCell(row, 1, vo.getStcd() != null ? vo.getStcd() : "", style); + ExcelUtils.formatCell(row, 2, vo.getStnm() != null ? vo.getStnm() : "", style); + ExcelUtils.formatCell(row, 3, vo.getAddvcd() != null ? vo.getAddvcd() : "", style); + ExcelUtils.formatCell(row, 4, "", style); + ExcelUtils.formatCell(row, 5, vo.getYr() != null ? vo.getYr().toString() : "", style); + ExcelUtils.formatCell(row, 6, vo.getMth() != null ? vo.getMth().toString() : "", style); + ExcelUtils.formatCell(row, 7, vo.getAvhtdz() != null ? CommonUtils.formatNum(vo.getAvhtdz()) : "", style); + ExcelUtils.formatCell(row, 8, vo.getAvhtdzrcd() != null ? vo.getAvhtdzrcd() : "", style); + ExcelUtils.formatCell(row, 9, vo.getHthtdz() != null ? CommonUtils.formatNum(vo.getHthtdz()) : "", style); + ExcelUtils.formatCell(row, 10, vo.getHthtdzrcd() != null ? vo.getHthtdzrcd() : "", style); + ExcelUtils.formatCell(row, 11, vo.getHthtdzotm() != null ? vo.getHthtdzotm() : "", style); + ExcelUtils.formatCell(row, 12, vo.getLthtdz() != null ? CommonUtils.formatNum(vo.getLthtdz()) : "", style); + ExcelUtils.formatCell(row, 13, vo.getLthtdzrcd() != null ? vo.getLthtdzrcd() : "", style); + ExcelUtils.formatCell(row, 14, vo.getLthtdzotm() != null ? vo.getLthtdzotm() : "", style); + ExcelUtils.formatCell(row, 15, vo.getAvltdz() != null ? CommonUtils.formatNum(vo.getAvltdz()) : "", style); + ExcelUtils.formatCell(row, 16, vo.getAvltdzrcd() != null ? vo.getAvltdzrcd() : "", style); + ExcelUtils.formatCell(row, 17, vo.getHtltdz() != null ? CommonUtils.formatNum(vo.getHtltdz()) : "", style); + ExcelUtils.formatCell(row, 18, vo.getHtltdzrcd() != null ? vo.getHtltdzrcd() : "", style); + ExcelUtils.formatCell(row, 19, vo.getHtltdzotm() != null ? vo.getHtltdzotm() : "", style); + ExcelUtils.formatCell(row, 20, vo.getLtltdz() != null ? CommonUtils.formatNum(vo.getLtltdz()) : "", style); + ExcelUtils.formatCell(row, 21, vo.getLtltdzrcd() != null ? vo.getLtltdzrcd() : "", style); + ExcelUtils.formatCell(row, 22, vo.getLtltdzotm() != null ? vo.getLtltdzotm() : "", style); + ExcelUtils.formatCell(row, 23, vo.getAvftdr() != null ? CommonUtils.formatNum(vo.getAvftdr()) : "", style); + ExcelUtils.formatCell(row, 24, vo.getAvftdrrcd() != null ? vo.getAvftdrrcd() : "", style); + ExcelUtils.formatCell(row, 25, vo.getMxfltdr() != null ? CommonUtils.formatNum(vo.getMxfltdr()) : "", style); + ExcelUtils.formatCell(row, 26, vo.getMxfltdrrcd() != null ? vo.getMxfltdrrcd() : "", style); + ExcelUtils.formatCell(row, 27, vo.getMxfltdrhtm() != null ? vo.getMxfltdrhtm() : "", style); + ExcelUtils.formatCell(row, 28, vo.getMnfltdr() != null ? CommonUtils.formatNum(vo.getMnfltdr()) : "", style); + ExcelUtils.formatCell(row, 29, vo.getMnfltdrrcd() != null ? vo.getMnfltdrrcd() : "", style); + ExcelUtils.formatCell(row, 30, vo.getMnfltdrhtm() != null ? vo.getMnfltdrhtm() : "", style); + ExcelUtils.formatCell(row, 31, vo.getAver() != null ? CommonUtils.formatNum(vo.getAver()) : "", style); + ExcelUtils.formatCell(row, 32, vo.getAverbbrrcd() != null ? vo.getAverbbrrcd() : "", style); + ExcelUtils.formatCell(row, 33, vo.getMxebtdr() != null ? CommonUtils.formatNum(vo.getMxebtdr()) : "", style); + ExcelUtils.formatCell(row, 34, vo.getMxebtdrrcd() != null ? vo.getMxebtdrrcd() : "", style); + ExcelUtils.formatCell(row, 35, vo.getMxebtdrht() != null ? vo.getMxebtdrht() : "", style); + ExcelUtils.formatCell(row, 36, vo.getMnebtdr() != null ? CommonUtils.formatNum(vo.getMnebtdr()) : "", style); + ExcelUtils.formatCell(row, 37, vo.getMnebtdrrcd() != null ? vo.getMnebtdrrcd() : "", style); + ExcelUtils.formatCell(row, 38, vo.getMnebtdrhtm() != null ? vo.getMnebtdrhtm() : "", style); + ExcelUtils.formatCell(row, 39, vo.getAvftd() != null ? vo.getAvftd().toString() : "", style); + ExcelUtils.formatCell(row, 40, vo.getAvftdrcd() != null ? vo.getAvftdrcd() : "", style); + ExcelUtils.formatCell(row, 41, vo.getMxfltddr() != null ? vo.getMxfltddr().toString() : "", style); + ExcelUtils.formatCell(row, 42, vo.getMxfltddrrcd() != null ? vo.getMxfltddrrcd() : "", style); + ExcelUtils.formatCell(row, 43, vo.getMxfltddrhtm() != null ? vo.getMxfltddrhtm() : "", style); + ExcelUtils.formatCell(row, 44, vo.getMnfltddr() != null ? vo.getMnfltddr().toString() : "", style); + ExcelUtils.formatCell(row, 45, vo.getMnfltddrrcd() != null ? vo.getMnfltddrrcd() : "", style); + ExcelUtils.formatCell(row, 46, vo.getMnfltddrhtm() != null ? vo.getMnfltddrhtm() : "", style); + ExcelUtils.formatCell(row, 47, vo.getAvebbdr() != null ? vo.getAvebbdr().toString() : "", style); + ExcelUtils.formatCell(row, 48, vo.getAvedrc() != null ? vo.getAvedrc() : "", style); + ExcelUtils.formatCell(row, 49, vo.getMxebtddr() != null ? vo.getMxebtddr().toString() : "", style); + ExcelUtils.formatCell(row, 50, vo.getMxebtddrrcd() != null ? vo.getMxebtddrrcd() : "", style); + ExcelUtils.formatCell(row, 51, vo.getMxebtddrhtm() != null ? vo.getMxebtddrhtm() : "", style); + ExcelUtils.formatCell(row, 52, vo.getMnbtddr() != null ? vo.getMnbtddr().toString() : "", style); + ExcelUtils.formatCell(row, 53, vo.getMnebtddrrcd() != null ? vo.getMnebtddrrcd() : "", style); + ExcelUtils.formatCell(row, 54, vo.getMnebtddrhtm() != null ? vo.getMnebtddrhtm() : "", style); + ExcelUtils.formatCell(row, 55, vo.getHravtdz() != null ? CommonUtils.formatNum(vo.getHravtdz()) : "", style); + ExcelUtils.formatCell(row, 56, vo.getHravtdzrcd() != null ? vo.getHravtdzrcd() : "", style); + ExcelUtils.formatCell(row, 57, vo.getAvtdr() != null ? CommonUtils.formatNum(vo.getAvtdr()) : "", style); + ExcelUtils.formatCell(row, 58, vo.getAvtdrrcd() != null ? vo.getAvtdrrcd() : "", style); + ExcelUtils.formatCell(row, 59, vo.getAvtddr() != null ? vo.getAvtddr().toString() : "", style); + ExcelUtils.formatCell(row, 60, vo.getAvtddrrcd() != null ? vo.getAvtddrrcd() : "", style); + rowIndex++; + } + } + } + +} + + + + diff --git a/swlscx/src/main/java/com/ruoyi/swlscx/month/service/impl/HyMtweEServiceImpl.java b/swlscx/src/main/java/com/ruoyi/swlscx/month/service/impl/HyMtweEServiceImpl.java new file mode 100644 index 0000000..f5fa951 --- /dev/null +++ b/swlscx/src/main/java/com/ruoyi/swlscx/month/service/impl/HyMtweEServiceImpl.java @@ -0,0 +1,355 @@ +package com.ruoyi.swlscx.month.service.impl; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.ruoyi.common.annotation.DataSource; +import com.ruoyi.common.config.RuoYiConfig; +import com.ruoyi.common.core.page.R; +import com.ruoyi.common.core.text.Convert; +import com.ruoyi.common.enums.DataSourceType; +import com.ruoyi.common.utils.DateUtils; +import com.ruoyi.common.utils.SecurityUtils; +import com.ruoyi.common.utils.bean.BeanUtils; +import com.ruoyi.swlscx.basic.domain.po.YcExportTask; +import com.ruoyi.swlscx.basic.service.YcExportTaskService; +import com.ruoyi.swlscx.common.PageParams; +import com.ruoyi.swlscx.month.domain.bo.HyMtweEBo; +import com.ruoyi.swlscx.month.domain.po.HyMtweE; +import com.ruoyi.swlscx.month.domain.vo.HyMtweEVo; +import com.ruoyi.swlscx.month.mapper.HyMtweEMapper; +import com.ruoyi.swlscx.month.service.HyMtweEService; +import com.ruoyi.swlscx.common.utils.CommonUtils; +import com.ruoyi.swlscx.common.utils.ExcelUtils; +import com.ruoyi.swlscx.common.utils.Query; +import org.apache.commons.lang3.ObjectUtils; +import org.apache.poi.ss.usermodel.CellStyle; +import org.apache.poi.ss.usermodel.Row; +import org.apache.poi.ss.usermodel.Sheet; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.context.ApplicationContext; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; +import org.springframework.web.multipart.MultipartFile; + +import javax.annotation.Resource; +import javax.servlet.http.HttpServletResponse; +import java.io.File; +import java.io.IOException; +import java.util.*; +import java.util.concurrent.CompletableFuture; +import java.util.concurrent.ThreadPoolExecutor; +import java.util.stream.Collectors; + +/** +* @author 12974 +* @description 针对表【hy_mtwe_e(月水面蒸发量表)】的数据库操作Service实现 +* @createDate 2024-08-01 09:38:45 +*/ +@Service +public class HyMtweEServiceImpl extends ServiceImpl + implements HyMtweEService{ + + @Resource + private ThreadPoolExecutor labelThreadPool; + + @Resource + private YcExportTaskService ycExportTaskService; + + /**导入月水面蒸发量表数据*/ + @Override + @Transactional(rollbackFor = Exception.class) + public void importHyMtweEDate(MultipartFile file) { + try { + List hyMtweEBos = ExcelUtils.readExcel(file.getInputStream(), HyMtweEBo.class, 3); + List hyMtweEList = hyMtweEBos.stream().map(i -> { + HyMtweE hyMtweE = new HyMtweE(); + BeanUtils.copyProperties(i, hyMtweE); + hyMtweE.setYr(Integer.valueOf(i.getYr())); + hyMtweE.setMth(Integer.valueOf(i.getMth())); + hyMtweE.setWsfe(Convert.toBigDecimal(i.getWsfe())); + hyMtweE.setMxdye(Convert.toBigDecimal(i.getMxdye())); + hyMtweE.setMndye(Convert.toBigDecimal(i.getMndye())); + return hyMtweE; + }).collect(Collectors.toList()); + this.saveBatch(hyMtweEList); + } catch (IOException e) { + throw new RuntimeException(e); + } + + } + + /**查询月水面蒸发量表数据*/ + @Override + public IPage selectHyMtweEListPageByInfo(PageParams pageParams, String stcdIds, String startTime, String endTime,String stcd,String stnm) { + Map map = CommonUtils.getMonthDataMap(pageParams, startTime, endTime, stcd, stnm); + return this.baseMapper.selectHyMtweEListPageByInfo(new Query().getPage(map), map); + } + + /** + * 导出月水面蒸发量表 + */ + @Override + @Transactional(rollbackFor = Exception.class) + public R exportMonthEvaporationWaterList(HttpServletResponse response, String startTime, String endTime, String stcd, String stnm) { + + Long userId = SecurityUtils.getUserId(); + String tableName = "月水面蒸发量表"; + return taskAndExport(tableName,startTime, endTime, stcd, stnm, userId); +// +// Map map = CommonUtils.getMonthDataMap(new PageParams(0L,100000L), startTime, endTime, stcd, stnm); +// ExcelUtils.excelExport(response,"monthEvaporationWater.xls","月水面蒸发量表",(Sheet sheet, CellStyle style) ->{ +// dataModel(map, sheet, style); +// }); + } + + @Resource + private ThreadPoolExecutor importThreadPool; + + @Autowired + private ApplicationContext context; + + /** + * 从mysql导入到sqlserver中 + */ + @Transactional(rollbackFor = Exception.class) + @DataSource(DataSourceType.SHARDING) + public void importMysqlToSqlserver(List hyMtweEVoList) { + List records = hyMtweEVoList.stream().map(i->{ + HyMtweE hyMtweE = new HyMtweE(); + BeanUtils.copyProperties(i, hyMtweE); + hyMtweE.setYr(i.getYr()); + hyMtweE.setMth(i.getMth()); + hyMtweE.setWsfe(Convert.toBigDecimal(i.getWsfe())); + hyMtweE.setMxdye(Convert.toBigDecimal(i.getMxdye())); + hyMtweE.setMndye(Convert.toBigDecimal(i.getMndye())); + return hyMtweE; + }).collect(Collectors.toList()); + //先清空临时表的数据 + this.baseMapper.deleteTempData(); + //插入临时表数据 + int batchSize = 50; + for (int i = 0; i < records.size(); i += batchSize) { + int end = Math.min(i + batchSize, records.size()); + List batch = records.subList(i, end); + // 执行批量插入 + this.baseMapper.insertTempData(batch); + } + //从临时表增或修改主表 + this.baseMapper.mergeToData(); + } + + @Override + public R importDateTosoft(String startTime, String endTime) { + Long userId = SecurityUtils.getUserId(); + String filename = "月水面蒸发量表" + startTime + "-" + endTime+"导入到南方片"; + // 查询是否已存在相同条件且未完成的任务 + List ongoingTasks = ycExportTaskService.list( + new QueryWrapper() + .eq("user_id", userId) + .eq("status", 0) // 状态为0表示任务未完成 + .like("filename", "月水面蒸发量表")); + if (!ongoingTasks.isEmpty()) { + return R.error("当前任务正在下载中，请稍后重试"); + } + YcExportTask ycExportTask = new YcExportTask(); + ycExportTask.setFilename(filename); + ycExportTask.setUserId(userId); + ycExportTask.setStartTime(new Date()); + ycExportTask.setStatus(0); + ycExportTaskService.save(ycExportTask); + CompletableFuture.runAsync(() -> { + try { + IPage pageByInfo = this.selectHyMtweEListPageByInfo(new PageParams(0L, 1000000000L), null, startTime, endTime, null,null); +// IPage pageByInfo = this.selectMaxHRainListPageByInfo(new PageParams(0L, 1000000000L), null, null, startTime, endTime); + HyMtweEServiceImpl hyMtweEService = context.getBean(HyMtweEServiceImpl.class); + hyMtweEService.importMysqlToSqlserver(pageByInfo.getRecords()); + ycExportTask.setStatus(2); + } catch (Exception e) { + ycExportTask.setStatus(4); + log.error(e.getMessage()); + R.error("任务下载失败"); + }finally { + ycExportTask.setEndTime(new Date()); + ycExportTaskService.updateById(ycExportTask); + } + }, importThreadPool); + return R.ok("任务已提交"); + } + + + private R taskAndExport(String tableName,String startTime, String endTime, String stcd, String stnm, Long userId) { + String startNewTime=""; + String endNewTime=""; + if (ObjectUtils.isNotEmpty(startTime) ){ + startNewTime=startTime.substring(0,6); + } + if (ObjectUtils.isNotEmpty(endTime)){ + endNewTime=endTime.substring(0,6); + } + String filename = tableName + startNewTime + "-" + endNewTime; + // 查询是否已存在相同条件且未完成的任务 + List ongoingTasks = ycExportTaskService.list( + new QueryWrapper() + .eq("user_id", userId) + .eq("filename", filename) + .eq("status", 0) // 状态为0表示任务未完成 + ); + + if (!ongoingTasks.isEmpty()) { + return R.error("当前任务正在下载中，请稍后重试"); + } + + YcExportTask ycExportTask = new YcExportTask(); + String pathPeffix = RuoYiConfig.getExportPath() + + File.separator + userId + File.separator+ + DateUtils.parseDateToStr("yyyy-MM-dd",DateUtils.getNowDate()) + File.separator + + DateUtils.parseDateToStr("HH_mm",DateUtils.getNowDate())+File.separator; + ycExportTask.setFilename(filename); + ycExportTask.setUserId(userId); + ycExportTask.setStartTime(new Date()); + ycExportTask.setStatus(0); + ycExportTask.setFilepath(pathPeffix); + ycExportTaskService.save(ycExportTask); + CompletableFuture.runAsync(() -> { + try { + File dest = new File(pathPeffix); + if (!dest.exists()) { + dest.mkdirs(); + } + String fullPath = pathPeffix + filename; + exportBlackData(fullPath, startTime, endTime, stcd, stnm); + + ycExportTask.setStatus(1); + ycExportTask.setEndTime(new Date()); + ycExportTaskService.updateById(ycExportTask); + } catch (Exception e) { + log.error(e.getMessage(), e); + R.error("任务下载失败"); + } + }, labelThreadPool); + return R.ok("任务已提交，请稍后下载"); + } + + private void exportBlackData(String tableName, String startTime, String endTime, String stcd, String stnm) { + Map rainMap = CommonUtils.getMonthDataMap(new PageParams(0L, 1000000000L), startTime, endTime, stcd, stnm); + ExcelUtils.excelBackExport2("monthEvaporationWater.xls", tableName, (Sheet sheet, CellStyle style) -> + dataModel1(rainMap, sheet, style)); + } + + public int dataModel1(Map map, Sheet sheet, CellStyle style) { + // 批量查询数据 + IPage hyMptEVoIPage = this.baseMapper.selectHyMtweEListPageByInfo(new Query().getPage(map), map); + List records = hyMptEVoIPage.getRecords(); + + // 定义当前sheet的行号 + int rowIndex = 2; // 从第二行开始写入数据 + // 定义全局序号 + int globalIndex = 1; // 从1开始 + + // 定义当前sheet的编号 + int sheetIndex = 1; + + // 最大行数限制 + int maxRowsPerSheet = 65536; // 对于 .xls 文件，最大行数为 65536 + int batchSize = 1000; // 每次批量处理1000行，减少逐行写入的开销 + + // 复制表头到新sheet的逻辑 + ExcelUtils.copyHeader(sheet, style); + + // 批量处理数据 + for (int i = 0; i < records.size(); i += batchSize) { + // 处理一批数据 + int toIndex = Math.min(i + batchSize, records.size()); + List batchList = records.subList(i, toIndex); + + // 批量写入数据 + for (HyMtweEVo vo : batchList) { + // 如果当前行数达到最大行数，创建新sheet + if (rowIndex >= maxRowsPerSheet) { + sheetIndex++; + sheet = sheet.getWorkbook().createSheet("月水面蒸发量表" + sheetIndex); + rowIndex = 2; // 重置行号 + // 复制表头到新sheet + ExcelUtils.copyHeader(sheet, style); + } + + // 创建新行并写入数据 + Row row = ExcelUtils.createRow(sheet, rowIndex); + + // 使用 globalIndex 作为序号 + ExcelUtils.formatCell(row, 0, String.valueOf(globalIndex), style); + ExcelUtils.formatCell(row, 1, vo.getStcd() != null ? vo.getStcd() : "", style); + ExcelUtils.formatCell(row, 2, vo.getStnm() != null ? vo.getStnm() : "", style); + ExcelUtils.formatCell(row, 3, vo.getAddvcd() != null ? vo.getAddvcd() : "", style); + ExcelUtils.formatCell(row,4,"",style); + ExcelUtils.formatCell(row, 5, vo.getEetp() != null ? vo.getEetp() : "", style); + ExcelUtils.formatCell(row, 6, vo.getYr() != null ? vo.getYr().toString() : "", style); + ExcelUtils.formatCell(row, 7, vo.getMth() != null ? vo.getMth().toString() : "", style); + ExcelUtils.formatCell(row,8,vo.getWsfe() != null ? CommonUtils.formatNum(vo.getWsfe()) : "", style); + ExcelUtils.formatCell(row, 9, vo.getWsfercd() != null ? vo.getWsfercd() : "", style); + ExcelUtils.formatCell(row, 10, vo.getMxdye() != null ? CommonUtils.formatNum(vo.getMxdye()) : "", style); + ExcelUtils.formatCell(row, 11, vo.getMxdyercd() != null ? vo.getMxdyercd() : "", style); + ExcelUtils.formatCell(row, 12, vo.getMndye() != null ? CommonUtils.formatNum(vo.getMndye()) : "", style); + ExcelUtils.formatCell(row, 13, vo.getMndyercd() != null ? vo.getMndyercd() : "", style); + + // 增加行号和全局序号 + rowIndex++; + globalIndex++; + } + } + return 0; + } + + public void dataModel(Map map, Sheet sheet, CellStyle style) { + + // 批量查询数据 + IPage hyMptEVoIPage = this.baseMapper.selectHyMtweEListPageByInfo(new Query().getPage(map), map); + List records = hyMptEVoIPage.getRecords(); + // 定义当前sheet的行号 + int rowIndex = 2; + // 定义当前sheet的编号 + int sheetIndex = 1; + Row row; + // 最大行数限制 + int maxRowsPerSheet = 65536; // 对于 .xls 文件，最大行数为 65536 + int batchSize = 1000; // 每次批量处理1000行，减少逐行写入的开销 + // 批量处理数据 + for (int i = 0; i < records.size(); i += batchSize) { + // 处理一批数据 + int toIndex = Math.min(i + batchSize, records.size()); + List batchList = records.subList(i, toIndex); + // 批量写入数据 + for (HyMtweEVo vo : batchList) { + // 如果当前行数达到最大行数，创建新sheet + if (rowIndex >= maxRowsPerSheet) { + sheetIndex++; + sheet = sheet.getWorkbook().createSheet("月水面蒸发量表" + sheetIndex); + rowIndex = 2; // 重置行号 + } + // 创建新行并写入数据 + row = ExcelUtils.createRow(sheet, rowIndex); + //序号 + ExcelUtils.formatCell(row, 0, String.valueOf(rowIndex - 1), style); + ExcelUtils.formatCell(row, 1, vo.getStcd() != null ? vo.getStcd() : "", style); + ExcelUtils.formatCell(row, 2, vo.getStnm() != null ? vo.getStnm() : "", style); + ExcelUtils.formatCell(row, 3, vo.getAddvcd() != null ? vo.getAddvcd() : "", style); + ExcelUtils.formatCell(row,4,"",style); + ExcelUtils.formatCell(row, 5, vo.getEetp() != null ? vo.getEetp() : "", style); + ExcelUtils.formatCell(row, 6, vo.getYr() != null ? vo.getYr().toString() : "", style); + ExcelUtils.formatCell(row, 7, vo.getMth() != null ? vo.getMth().toString() : "", style); + ExcelUtils.formatCell(row,8,vo.getWsfe() != null ? CommonUtils.formatNum(vo.getWsfe()) : "", style); + ExcelUtils.formatCell(row, 9, vo.getWsfercd() != null ? vo.getWsfercd() : "", style); + ExcelUtils.formatCell(row, 10, vo.getMxdye() != null ? CommonUtils.formatNum(vo.getMxdye()) : "", style); + ExcelUtils.formatCell(row, 11, vo.getMxdyercd() != null ? vo.getMxdyercd() : "", style); + ExcelUtils.formatCell(row, 12, vo.getMndye() != null ? CommonUtils.formatNum(vo.getMndye()) : "", style); + ExcelUtils.formatCell(row, 13, vo.getMndyercd() != null ? vo.getMndyercd() : "", style); + rowIndex++; + } + } + } +} + + + + diff --git a/swlscx/src/main/java/com/ruoyi/swlscx/month/service/impl/HyMtwtEServiceImpl.java b/swlscx/src/main/java/com/ruoyi/swlscx/month/service/impl/HyMtwtEServiceImpl.java new file mode 100644 index 0000000..f1536cc --- /dev/null +++ b/swlscx/src/main/java/com/ruoyi/swlscx/month/service/impl/HyMtwtEServiceImpl.java @@ -0,0 +1,360 @@ +package com.ruoyi.swlscx.month.service.impl; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.ruoyi.common.annotation.DataSource; +import com.ruoyi.common.config.RuoYiConfig; +import com.ruoyi.common.core.page.R; +import com.ruoyi.common.core.text.Convert; +import com.ruoyi.common.enums.DataSourceType; +import com.ruoyi.common.utils.DateUtils; +import com.ruoyi.common.utils.SecurityUtils; +import com.ruoyi.common.utils.bean.BeanUtils; +import com.ruoyi.swlscx.basic.domain.po.YcExportTask; +import com.ruoyi.swlscx.basic.service.YcExportTaskService; +import com.ruoyi.swlscx.common.PageParams; +import com.ruoyi.swlscx.month.domain.bo.HyMtwtEBo; +import com.ruoyi.swlscx.month.domain.po.HyMtwtE; +import com.ruoyi.swlscx.month.domain.vo.HyMtwtEVo; +import com.ruoyi.swlscx.month.mapper.HyMtwtEMapper; +import com.ruoyi.swlscx.month.service.HyMtwtEService; +import com.ruoyi.swlscx.common.utils.CommonUtils; +import com.ruoyi.swlscx.common.utils.ExcelUtils; +import com.ruoyi.swlscx.common.utils.Query; +import org.apache.commons.lang3.ObjectUtils; +import org.apache.poi.ss.usermodel.CellStyle; +import org.apache.poi.ss.usermodel.Row; +import org.apache.poi.ss.usermodel.Sheet; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.context.ApplicationContext; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; +import org.springframework.web.multipart.MultipartFile; + +import javax.annotation.Resource; +import javax.servlet.http.HttpServletResponse; +import java.io.File; +import java.util.Date; +import java.util.List; +import java.util.Map; +import java.util.concurrent.CompletableFuture; +import java.util.concurrent.ThreadPoolExecutor; +import java.util.stream.Collectors; + +/** + * @author 12974 + * @description 针对表【hy_mtwt_e(月水温表字段定义)】的数据库操作Service实现 + * @createDate 2024-08-06 13:42:04 + */ +@Service +public class HyMtwtEServiceImpl extends ServiceImpl + implements HyMtwtEService { + + @Resource + private ThreadPoolExecutor labelThreadPool; + + @Resource + private YcExportTaskService ycExportTaskService; + + /** + * 查询月水温表数据 + */ + @Override + public IPage selectHyMtweEDataByPageAndInfo(PageParams pageParams, String stcdIds, String startTime, String endTime, String stcd, String stnm) { + Map map = CommonUtils.getMonthDataMap(pageParams, startTime, endTime, stcd, stnm); + return this.baseMapper.selectHyMtzEListPageByInfo(new Query().getPage(map), map); + } + + /** + * 导入月水温表数据 + */ + @Override + @Transactional(rollbackFor = Exception.class) + public void importHyMtwtEData(MultipartFile file) { + try { + List hyMtpddbEBos = ExcelUtils.readExcel(file.getInputStream(), HyMtwtEBo.class, 2); + // 获取数据 + List dataList = hyMtpddbEBos.parallelStream().map(i -> { + HyMtwtE hyMtwtE = new HyMtwtE(); + BeanUtils.copyProperties(i, hyMtwtE); + hyMtwtE.setAvwtmp(Convert.toBigDecimal(i.getAvwtmp())); + hyMtwtE.setMth(Convert.toInt(i.getMth())); + hyMtwtE.setMnwtmp(Convert.toBigDecimal(i.getMnwtmp())); + hyMtwtE.setYr(Convert.toInt(i.getYr())); + hyMtwtE.setMnwtmpdt(DateUtils.parseDate(i.getMnwtmpdt())); + hyMtwtE.setMxwtmpdt(DateUtils.parseDate(i.getMxwtmpdt())); + hyMtwtE.setMxwtmp(Convert.toBigDecimal(i.getMxwtmp())); + + return hyMtwtE; + }).collect(Collectors.toList()); + this.saveBatch(dataList, 10000); + } catch (Exception e) { + throw new RuntimeException(e); + } + } + + @Override + public R exportMonthWaterTemperatureList(HttpServletResponse response, String startTime, String endTime, String stcd, String stnm) { + + Long userId = SecurityUtils.getUserId(); + String tableName = "月水温表"; + return taskAndExport(tableName,startTime, endTime, stcd, stnm, userId); + } + + @Resource + private ThreadPoolExecutor importThreadPool; + + @Autowired + private ApplicationContext context; + + + /** + * 从mysql导入到sqlserver中 + */ + @Transactional(rollbackFor = Exception.class) + @DataSource(DataSourceType.SHARDING) + public void importMysqlToSqlserver(List hyMtwtEVoList) { + List records = hyMtwtEVoList.stream().map(i->{ + HyMtwtE hyMtwtE = new HyMtwtE(); + BeanUtils.copyProperties(i, hyMtwtE); + hyMtwtE.setAvwtmp(Convert.toBigDecimal(i.getAvwtmp())); + hyMtwtE.setMth(Convert.toInt(i.getMth())); + hyMtwtE.setMnwtmp(Convert.toBigDecimal(i.getMnwtmp())); + hyMtwtE.setYr(Convert.toInt(i.getYr())); + hyMtwtE.setMnwtmpdt(DateUtils.parseDate(i.getMnwtmpdt())); + hyMtwtE.setMxwtmpdt(DateUtils.parseDate(i.getMxwtmpdt())); + hyMtwtE.setMxwtmp(Convert.toBigDecimal(i.getMxwtmp())); + + return hyMtwtE; + }).collect(Collectors.toList()); + //先清空临时表的数据 + this.baseMapper.deleteTempData(); + //插入临时表数据 + int batchSize = 50; + for (int i = 0; i < records.size(); i += batchSize) { + int end = Math.min(i + batchSize, records.size()); + List batch = records.subList(i, end); + // 执行批量插入 + this.baseMapper.insertTempData(batch); + } + //从临时表增或修改主表 + this.baseMapper.mergeToData(); + } + + @Override + public R importDateTosoft(String startTime, String endTime) { + Long userId = SecurityUtils.getUserId(); + String filename = "月水温表" + startTime + "-" + endTime+"导入到南方片"; + // 查询是否已存在相同条件且未完成的任务 + List ongoingTasks = ycExportTaskService.list( + new QueryWrapper() + .eq("user_id", userId) + .eq("status", 0) // 状态为0表示任务未完成 + .like("filename", "月水温表")); + if (!ongoingTasks.isEmpty()) { + return R.error("当前任务正在下载中，请稍后重试"); + } + YcExportTask ycExportTask = new YcExportTask(); + ycExportTask.setFilename(filename); + ycExportTask.setUserId(userId); + ycExportTask.setStartTime(new Date()); + ycExportTask.setStatus(0); + ycExportTaskService.save(ycExportTask); + CompletableFuture.runAsync(() -> { + try { + IPage pageByInfo = this.selectHyMtweEDataByPageAndInfo(new PageParams(0L, 1000000000L), null, startTime, endTime, null,null); +// IPage pageByInfo = this.selectMaxHRainListPageByInfo(new PageParams(0L, 1000000000L), null, null, startTime, endTime); + HyMtwtEServiceImpl hyMtwtEService = context.getBean(HyMtwtEServiceImpl.class); + hyMtwtEService.importMysqlToSqlserver(pageByInfo.getRecords()); + ycExportTask.setStatus(2); + } catch (Exception e) { + ycExportTask.setStatus(4); + log.error(e.getMessage()); + R.error("任务下载失败"); + }finally { + ycExportTask.setEndTime(new Date()); + ycExportTaskService.updateById(ycExportTask); + } + }, importThreadPool); + return R.ok("任务已提交"); + } + + private R taskAndExport(String tableName,String startTime, String endTime, String stcd, String stnm, Long userId) { + String startNewTime=""; + String endNewTime=""; + if (ObjectUtils.isNotEmpty(startTime) ){ + startNewTime=startTime.substring(0,6); + } + if (ObjectUtils.isNotEmpty(endTime)){ + endNewTime=endTime.substring(0,6); + } + String filename = tableName + startNewTime + "-" + endNewTime; + // 查询是否已存在相同条件且未完成的任务 + List ongoingTasks = ycExportTaskService.list( + new QueryWrapper() + .eq("user_id", userId) + .eq("filename", filename) + .eq("status", 0) // 状态为0表示任务未完成 + ); + + if (!ongoingTasks.isEmpty()) { + return R.error("当前任务正在下载中，请稍后重试"); + } + + YcExportTask ycExportTask = new YcExportTask(); + String pathPeffix = RuoYiConfig.getExportPath() + + File.separator + userId + File.separator+ + DateUtils.parseDateToStr("yyyy-MM-dd",DateUtils.getNowDate()) + File.separator + + DateUtils.parseDateToStr("HH_mm",DateUtils.getNowDate())+File.separator; + ycExportTask.setFilename(filename); + ycExportTask.setUserId(userId); + ycExportTask.setStartTime(new Date()); + ycExportTask.setStatus(0); + ycExportTask.setFilepath(pathPeffix); + ycExportTaskService.save(ycExportTask); + CompletableFuture.runAsync(() -> { + try { + File dest = new File(pathPeffix); + if (!dest.exists()) { + dest.mkdirs(); + } + String fullPath = pathPeffix + filename; + exportBlackData(fullPath, startTime, endTime, stcd, stnm); + + ycExportTask.setStatus(1); + ycExportTask.setEndTime(new Date()); + ycExportTaskService.updateById(ycExportTask); + } catch (Exception e) { + log.error(e.getMessage(), e); + R.error("任务下载失败"); + } + }, labelThreadPool); + return R.ok("任务已提交，请稍后下载"); + } + + private void exportBlackData(String tableName, String startTime, String endTime, String stcd, String stnm) { + Map rainMap = CommonUtils.getMonthDataMap(new PageParams(0L, 1000000000L), startTime, endTime, stcd, stnm); + ExcelUtils.excelBackExport2("monthWaterTemperature.xls", tableName, (Sheet sheet, CellStyle style) -> + dataModel1(rainMap, sheet, style)); + } + + + public int dataModel1(Map map, Sheet sheet, CellStyle style) { + // 批量查询数据 + IPage hyMtzEVoIPage = this.baseMapper.selectHyMtzEListPageByInfo(new Query().getPage(map), map); + List records = hyMtzEVoIPage.getRecords(); + + // 定义当前sheet的行号 + int rowIndex = 2; // 从第二行开始写入数据 + // 定义全局序号 + int globalIndex = 1; // 从1开始 + + // 定义当前sheet的编号 + int sheetIndex = 1; + + // 最大行数限制 + int maxRowsPerSheet = 65536; // 对于 .xls 文件，最大行数为 65536 + int batchSize = 1000; // 每次批量处理1000行，减少逐行写入的开销 + + // 复制表头到新sheet的逻辑 + ExcelUtils.copyHeader(sheet, style); + + // 批量处理数据 + for (int i = 0; i < records.size(); i += batchSize) { + // 处理一批数据 + int toIndex = Math.min(i + batchSize, records.size()); + List batchList = records.subList(i, toIndex); + + // 批量写入数据 + for (HyMtwtEVo vo : batchList) { + // 如果当前行数达到最大行数，创建新sheet + if (rowIndex >= maxRowsPerSheet) { + sheetIndex++; + sheet = sheet.getWorkbook().createSheet("月水温表" + sheetIndex); + rowIndex = 2; // 重置行号 + // 复制表头到新sheet + ExcelUtils.copyHeader(sheet, style); + } + + // 创建新行并写入数据 + Row row = ExcelUtils.createRow(sheet, rowIndex); + + // 使用 globalIndex 作为序号 + ExcelUtils.formatCell(row, 0, String.valueOf(globalIndex), style); + ExcelUtils.formatCell(row, 1, vo.getStcd() != null ? vo.getStcd() : "", style); + ExcelUtils.formatCell(row, 2, vo.getStnm() != null ? vo.getStnm() : "", style); + ExcelUtils.formatCell(row, 3, vo.getAddvcd() != null ? vo.getAddvcd() : "", style); + ExcelUtils.formatCell(row, 4, "", style); + ExcelUtils.formatCell(row, 5, vo.getYr() != null ? vo.getYr().toString() : "", style); + ExcelUtils.formatCell(row, 6, vo.getMth() != null ? vo.getMth().toString() : "", style); + ExcelUtils.formatCell(row, 7, vo.getAvwtmp() != null ? CommonUtils.formatNum(vo.getAvwtmp()) : "", style); + ExcelUtils.formatCell(row, 8, vo.getAvwtmprcd() != null ? vo.getAvwtmprcd() : "", style); + ExcelUtils.formatCell(row, 9, vo.getMxwtmp() != null ? CommonUtils.formatNum(vo.getMxwtmp()) : "", style); + ExcelUtils.formatCell(row, 10, vo.getMxwtmprcd() != null ? vo.getMxwtmprcd() : "", style); + ExcelUtils.formatCell(row, 11, vo.getMxwtmpdt() != null ? vo.getMxwtmpdt() : "", style); + ExcelUtils.formatCell(row, 12, vo.getMnwtmp() != null ? CommonUtils.formatNum(vo.getMnwtmp()) : "", style); + ExcelUtils.formatCell(row, 13, vo.getMnwtmprcd() != null ? vo.getMnwtmprcd() : "", style); + ExcelUtils.formatCell(row, 14, vo.getMnwtmpdt() != null ? vo.getMnwtmpdt() : "", style); + + // 增加行号和全局序号 + rowIndex++; + globalIndex++; + } + } + return 0; + } + + public void dataModel(Map map, Sheet sheet, CellStyle style) { + + // 批量查询数据 + IPage hyMtzEVoIPage = this.baseMapper.selectHyMtzEListPageByInfo(new Query().getPage(map), map); + List records = hyMtzEVoIPage.getRecords(); + // 定义当前sheet的行号 + int rowIndex = 2; + // 定义当前sheet的编号 + int sheetIndex = 1; + Row row; + // 最大行数限制 + int maxRowsPerSheet = 65536; // 对于 .xls 文件，最大行数为 65536 + int batchSize = 1000; // 每次批量处理1000行，减少逐行写入的开销 + // 批量处理数据 + for (int i = 0; i < records.size(); i += batchSize) { + // 处理一批数据 + int toIndex = Math.min(i + batchSize, records.size()); + List batchList = records.subList(i, toIndex); + // 批量写入数据 + for (HyMtwtEVo vo : batchList) { + // 如果当前行数达到最大行数，创建新sheet + if (rowIndex >= maxRowsPerSheet) { + sheetIndex++; + sheet = sheet.getWorkbook().createSheet("月水温表" + sheetIndex); + rowIndex = 2; // 重置行号 + } + // 创建新行并写入数据 + row = ExcelUtils.createRow(sheet, rowIndex); + //序号 + ExcelUtils.formatCell(row, 0, String.valueOf(rowIndex - 1), style); + ExcelUtils.formatCell(row, 1, vo.getStcd() != null ? vo.getStcd() : "", style); + ExcelUtils.formatCell(row, 2, vo.getStnm() != null ? vo.getStnm() : "", style); + ExcelUtils.formatCell(row, 3, vo.getAddvcd() != null ? vo.getAddvcd() : "", style); + ExcelUtils.formatCell(row, 4, "", style); + ExcelUtils.formatCell(row, 5, vo.getYr() != null ? vo.getYr().toString() : "", style); + ExcelUtils.formatCell(row, 6, vo.getMth() != null ? vo.getMth().toString() : "", style); + ExcelUtils.formatCell(row, 7, vo.getAvwtmp() != null ? CommonUtils.formatNum(vo.getAvwtmp()) : "", style); + ExcelUtils.formatCell(row, 8, vo.getAvwtmprcd() != null ? vo.getAvwtmprcd() : "", style); + ExcelUtils.formatCell(row, 9, vo.getMxwtmp() != null ? CommonUtils.formatNum(vo.getMxwtmp()) : "", style); + ExcelUtils.formatCell(row, 10, vo.getMxwtmprcd() != null ? vo.getMxwtmprcd() : "", style); + ExcelUtils.formatCell(row, 11, vo.getMxwtmpdt() != null ? vo.getMxwtmpdt() : "", style); + ExcelUtils.formatCell(row, 12, vo.getMnwtmp() != null ? CommonUtils.formatNum(vo.getMnwtmp()) : "", style); + ExcelUtils.formatCell(row, 13, vo.getMnwtmprcd() != null ? vo.getMnwtmprcd() : "", style); + ExcelUtils.formatCell(row, 14, vo.getMnwtmpdt() != null ? vo.getMnwtmpdt() : "", style); + rowIndex++; + } + } + } +} + + + + diff --git a/swlscx/src/main/java/com/ruoyi/swlscx/month/service/impl/HyMtzEServiceImpl.java b/swlscx/src/main/java/com/ruoyi/swlscx/month/service/impl/HyMtzEServiceImpl.java new file mode 100644 index 0000000..d52edb1 --- /dev/null +++ b/swlscx/src/main/java/com/ruoyi/swlscx/month/service/impl/HyMtzEServiceImpl.java @@ -0,0 +1,360 @@ +package com.ruoyi.swlscx.month.service.impl; + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.ruoyi.common.annotation.DataSource; +import com.ruoyi.common.config.RuoYiConfig; +import com.ruoyi.common.core.page.R; +import com.ruoyi.common.core.text.Convert; +import com.ruoyi.common.enums.DataSourceType; +import com.ruoyi.common.utils.DateUtils; +import com.ruoyi.common.utils.SecurityUtils; +import com.ruoyi.common.utils.bean.BeanUtils; +import com.ruoyi.swlscx.basic.domain.po.YcExportTask; +import com.ruoyi.swlscx.basic.service.YcExportTaskService; +import com.ruoyi.swlscx.common.PageParams; +import com.ruoyi.swlscx.month.domain.bo.HyMtzEBo; +import com.ruoyi.swlscx.month.domain.po.HyMtzE; +import com.ruoyi.swlscx.month.domain.vo.HyMtzEVo; +import com.ruoyi.swlscx.month.mapper.HyMtzEMapper; +import com.ruoyi.swlscx.month.service.HyMtzEService; +import com.ruoyi.swlscx.common.utils.CommonUtils; +import com.ruoyi.swlscx.common.utils.ExcelUtils; +import com.ruoyi.swlscx.common.utils.Query; +import org.apache.poi.ss.usermodel.CellStyle; +import org.apache.poi.ss.usermodel.Row; +import org.apache.poi.ss.usermodel.Sheet; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.context.ApplicationContext; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; +import org.springframework.web.multipart.MultipartFile; + +import javax.annotation.Resource; +import javax.servlet.http.HttpServletResponse; +import java.io.File; +import java.io.IOException; +import java.util.*; +import java.util.concurrent.CompletableFuture; +import java.util.concurrent.ThreadPoolExecutor; +import java.util.stream.Collectors; + +/** +* @author 12974 +* @description 针对表【hy_mtz_e】的数据库操作Service实现 +* @createDate 2024-07-23 14:15:25 +*/ +@Service +public class HyMtzEServiceImpl extends ServiceImpl + implements HyMtzEService { + + @Resource + private ThreadPoolExecutor labelThreadPool; + + @Resource + private YcExportTaskService ycExportTaskService; + + + /** + * 导入月水位表 + */ + @Override + @Transactional(rollbackFor = Exception.class) + public void importHyMtzEData(MultipartFile file) { + try { + List HyMtzEBos = ExcelUtils.readExcel(file.getInputStream(), HyMtzEBo.class, 2); + List HyMtzEList = HyMtzEBos.stream().map(i -> { + HyMtzE hyMtweE = new HyMtzE(); + BeanUtils.copyProperties(i, hyMtweE); + hyMtweE.setYr(Integer.valueOf(i.getYr())); + hyMtweE.setMth(Integer.valueOf(i.getMth())); + hyMtweE.setAvz(Convert.toBigDecimal(i.getAvz())); + hyMtweE.setHtz(Convert.toBigDecimal(i.getHtz())); + hyMtweE.setHtzdt(DateUtils.parseDate(i.getHtzdt())); + hyMtweE.setMnz(Convert.toBigDecimal(i.getMnz())); + hyMtweE.setMnzdt(DateUtils.parseDate(i.getMnzdt())); + return hyMtweE; + }).collect(Collectors.toList()); + for (int i = 0; i < HyMtzEList.size(); i += 1000) { + int end = Math.min(i + 1000, HyMtzEList.size()); + List batchList = HyMtzEList.subList(i, end); + baseMapper.batchInsert(batchList); + } + } catch (IOException e) { + throw new RuntimeException(e); + } + + } + + /**查询月水位表*/ + @Override + public IPage selectHyMtzEPageByInfo(PageParams pageParams, String stcdIds, String startTime, String endTime,String stnm,String stcd) { + Map map = CommonUtils.getMonthDataMap(pageParams, startTime, endTime, stcd, stnm); + return this.baseMapper.selectHyMtzEPageByInfo(new Query().getPage(map), map); + } + + /** + * 导出月水位表 + */ + @Override + public R exportMonthWaterLeverList(HttpServletResponse response, String startTime, String endTime, String stcd, String stnm) { + + Long userId = SecurityUtils.getUserId(); + String tableName = "月水位表"; + return taskAndExport(tableName,startTime, endTime, stcd, stnm, userId); + +// Map map = CommonUtils.getMonthDataMap(new PageParams(0L,100000L), startTime, endTime, stcd, stnm); +// ExcelUtils.excelExport(response,"monthWaterLever.xls","月水位表",(Sheet sheet, CellStyle style) ->{ +// dataModel(map, sheet, style); +// }); + } + + @Resource + private ThreadPoolExecutor importThreadPool; + + @Autowired + private ApplicationContext context; + + /** + * 从mysql导入到sqlserver中 + */ + @Transactional(rollbackFor = Exception.class) + @DataSource(DataSourceType.SHARDING) + public void importMysqlToSqlserver(List hyMtzEVoList) { + List records = hyMtzEVoList.stream().map(i->{ + HyMtzE hyMtweE = new HyMtzE(); + BeanUtils.copyProperties(i, hyMtweE); + hyMtweE.setYr(i.getYr()); + hyMtweE.setMth(i.getMth()); + hyMtweE.setAvz(Convert.toBigDecimal(i.getAvz())); + hyMtweE.setHtz(Convert.toBigDecimal(i.getHtz())); + hyMtweE.setHtzdt(DateUtils.parseDate(i.getHtzdt())); + hyMtweE.setMnz(Convert.toBigDecimal(i.getMnz())); + hyMtweE.setMnzdt(DateUtils.parseDate(i.getMnzdt())); + return hyMtweE; + }).collect(Collectors.toList()); + //先清空临时表的数据 + this.baseMapper.deleteTempData(); + //插入临时表数据 + int batchSize = 50; + for (int i = 0; i < records.size(); i += batchSize) { + int end = Math.min(i + batchSize, records.size()); + List batch = records.subList(i, end); + // 执行批量插入 + this.baseMapper.insertTempData(batch); + } + //从临时表增或修改主表 + this.baseMapper.mergeToData(); + } + + @Override + public R importDateTosoft(String startTime, String endTime) { + Long userId = SecurityUtils.getUserId(); + String filename = "月水位表" + startTime + "-" + endTime+"导入到南方片"; + // 查询是否已存在相同条件且未完成的任务 + List ongoingTasks = ycExportTaskService.list( + new QueryWrapper() + .eq("user_id", userId) + .eq("status", 0) // 状态为0表示任务未完成 + .like("filename", "月水位表")); + if (!ongoingTasks.isEmpty()) { + return R.error("当前任务正在下载中，请稍后重试"); + } + YcExportTask ycExportTask = new YcExportTask(); + ycExportTask.setFilename(filename); + ycExportTask.setUserId(userId); + ycExportTask.setStartTime(new Date()); + ycExportTask.setStatus(0); + ycExportTaskService.save(ycExportTask); + CompletableFuture.runAsync(() -> { + try { + IPage pageByInfo = this.selectHyMtzEPageByInfo(new PageParams(0L, 1000000000L), null, startTime, endTime, null,null); +// IPage pageByInfo = this.selectMaxHRainListPageByInfo(new PageParams(0L, 1000000000L), null, null, startTime, endTime); + HyMtzEServiceImpl hyMtzEService = context.getBean(HyMtzEServiceImpl.class); + hyMtzEService.importMysqlToSqlserver(pageByInfo.getRecords()); + ycExportTask.setStatus(2); + } catch (Exception e) { + ycExportTask.setStatus(4); + log.error(e.getMessage()); + R.error("任务下载失败"); + }finally { + ycExportTask.setEndTime(new Date()); + ycExportTaskService.updateById(ycExportTask); + } + }, importThreadPool); + return R.ok("任务已提交"); + } + + + private R taskAndExport(String tableName,String startTime, String endTime, String stcd, String stnm, Long userId) { + String filename = tableName + startTime + "-" + endTime; + // 查询是否已存在相同条件且未完成的任务 + List ongoingTasks = ycExportTaskService.list( + new QueryWrapper() + .eq("user_id", userId) + .eq("filename", filename) + .eq("status", 0) // 状态为0表示任务未完成 + ); + + if (!ongoingTasks.isEmpty()) { + return R.error("当前任务正在下载中，请稍后重试"); + } + + YcExportTask ycExportTask = new YcExportTask(); + String pathPeffix = RuoYiConfig.getExportPath() + + File.separator + userId + File.separator+ + DateUtils.parseDateToStr("yyyy-MM-dd",DateUtils.getNowDate()) + File.separator + + DateUtils.parseDateToStr("HH_mm",DateUtils.getNowDate())+File.separator; + ycExportTask.setFilename(filename); + ycExportTask.setUserId(userId); + ycExportTask.setStartTime(new Date()); + ycExportTask.setStatus(0); + ycExportTask.setFilepath(pathPeffix); + ycExportTaskService.save(ycExportTask); + CompletableFuture.runAsync(() -> { + try { + File dest = new File(pathPeffix); + if (!dest.exists()) { + dest.mkdirs(); + } + String fullPath = pathPeffix + filename; + exportBlackData(fullPath, startTime, endTime, stcd, stnm); + + ycExportTask.setStatus(1); + ycExportTask.setEndTime(new Date()); + ycExportTaskService.updateById(ycExportTask); + } catch (Exception e) { + log.error(e.getMessage(), e); + R.error("任务下载失败"); + } + }, labelThreadPool); + return R.ok("任务已提交，请稍后下载"); + } + + private void exportBlackData(String tableName, String startTime, String endTime, String stcd, String stnm) { + Map rainMap = CommonUtils.getMonthDataMap(new PageParams(0L, 1000000000L), startTime, endTime, stcd, stnm); + ExcelUtils.excelBackExport2("monthWaterLever.xls", tableName, (Sheet sheet, CellStyle style) -> + dataModel1(rainMap, sheet, style)); + } + + public int dataModel1(Map map, Sheet sheet, CellStyle style) { + // 批量查询数据 + IPage HyMtzEVoIPage = this.baseMapper.selectHyMtzEPageByInfo(new Query().getPage(map), map); + List records = HyMtzEVoIPage.getRecords(); + + // 定义当前sheet的行号 + int rowIndex = 2; // 从第二行开始写入数据 + // 定义全局序号 + int globalIndex = 1; // 从1开始 + + // 定义当前sheet的编号 + int sheetIndex = 1; + + // 最大行数限制 + int maxRowsPerSheet = 65536; // 对于 .xls 文件，最大行数为 65536 + int batchSize = 1000; // 每次批量处理1000行，减少逐行写入的开销 + + // 复制表头到新sheet的逻辑 + ExcelUtils.copyHeader(sheet, style); + + // 批量处理数据 + for (int i = 0; i < records.size(); i += batchSize) { + // 处理一批数据 + int toIndex = Math.min(i + batchSize, records.size()); + List batchList = records.subList(i, toIndex); + + // 批量写入数据 + for (HyMtzEVo vo : batchList) { + // 如果当前行数达到最大行数，创建新sheet + if (rowIndex >= maxRowsPerSheet) { + sheetIndex++; + sheet = sheet.getWorkbook().createSheet("月水位表" + sheetIndex); + rowIndex = 2; // 重置行号 + // 复制表头到新sheet + ExcelUtils.copyHeader(sheet, style); + } + + // 创建新行并写入数据 + Row row = ExcelUtils.createRow(sheet, rowIndex); + + // 使用 globalIndex 作为序号 + ExcelUtils.formatCell(row, 0, String.valueOf(globalIndex), style); + ExcelUtils.formatCell(row, 1, vo.getStcd() != null ? vo.getStcd() : "", style); + ExcelUtils.formatCell(row, 2, vo.getStnm() != null ? vo.getStnm() : "", style); + ExcelUtils.formatCell(row, 3, vo.getAddvcd() != null ? vo.getAddvcd() : "", style); + ExcelUtils.formatCell(row,4,"",style); + ExcelUtils.formatCell(row, 5, vo.getYr() != null ? vo.getYr().toString() : "", style); + ExcelUtils.formatCell(row, 6, vo.getMth() != null ? vo.getMth().toString() : "", style); + ExcelUtils.formatCell(row, 7, vo.getAvz() != null ? CommonUtils.formatNum(vo.getAvz()) : "", style); + ExcelUtils.formatCell(row, 8, vo.getAvzrcd() != null ? vo.getAvzrcd() : "", style); + ExcelUtils.formatCell(row, 9, vo.getHtz() != null ? CommonUtils.formatNum(vo.getHtz()) : "", style); + ExcelUtils.formatCell(row, 10, vo.getHtzrcd() != null ? vo.getHtzrcd() : "", style); + ExcelUtils.formatCell(row, 11, vo.getHtzdt() != null ? vo.getHtzdt() : "", style); + ExcelUtils.formatCell(row, 12, vo.getMnz() != null ? CommonUtils.formatNum(vo.getMnz()) : "", style); + ExcelUtils.formatCell(row, 13, vo.getMnzrcd() != null ? vo.getMnzrcd() : "", style); + ExcelUtils.formatCell(row, 14, vo.getMnzdt() != null ? vo.getMnzdt() : "", style); + + // 增加行号和全局序号 + rowIndex++; + globalIndex++; + } + } + return 0; + } + + + public void dataModel(Map map, Sheet sheet, CellStyle style) { + // 批量查询数据 + IPage HyMtzEVoIPage = this.baseMapper.selectHyMtzEPageByInfo(new Query().getPage(map), map); + List records = HyMtzEVoIPage.getRecords(); + // 定义当前sheet的行号 + int rowIndex = 2; + // 定义当前sheet的编号 + int sheetIndex = 1; + Row row; + // 最大行数限制 + int maxRowsPerSheet = 65536; // 对于 .xls 文件，最大行数为 65536 + int batchSize = 1000; // 每次批量处理1000行，减少逐行写入的开销 + // 批量处理数据 + for (int i = 0; i < records.size(); i += batchSize) { + // 处理一批数据 + int toIndex = Math.min(i + batchSize, records.size()); + List batchList = records.subList(i, toIndex); + // 批量写入数据 + for (HyMtzEVo vo : batchList) { + // 如果当前行数达到最大行数，创建新sheet + if (rowIndex >= maxRowsPerSheet) { + sheetIndex++; + sheet = sheet.getWorkbook().createSheet("月水面蒸发量表" + sheetIndex); + rowIndex = 2; // 重置行号 + } + // 创建新行并写入数据 + row = ExcelUtils.createRow(sheet, rowIndex); + //序号 + ExcelUtils.formatCell(row, 0, String.valueOf(rowIndex - 1), style); + ExcelUtils.formatCell(row, 1, vo.getStcd() != null ? vo.getStcd() : "", style); + ExcelUtils.formatCell(row, 2, vo.getStnm() != null ? vo.getStnm() : "", style); + ExcelUtils.formatCell(row, 3, vo.getAddvcd() != null ? vo.getAddvcd() : "", style); + ExcelUtils.formatCell(row,4,"",style); + ExcelUtils.formatCell(row, 5, vo.getYr() != null ? vo.getYr().toString() : "", style); + ExcelUtils.formatCell(row, 6, vo.getMth() != null ? vo.getMth().toString() : "", style); + ExcelUtils.formatCell(row, 7, vo.getAvz() != null ? CommonUtils.formatNum(vo.getAvz()) : "", style); + ExcelUtils.formatCell(row, 8, vo.getAvzrcd() != null ? vo.getAvzrcd() : "", style); + ExcelUtils.formatCell(row, 9, vo.getHtz() != null ? CommonUtils.formatNum(vo.getHtz()) : "", style); + ExcelUtils.formatCell(row, 10, vo.getHtzrcd() != null ? vo.getHtzrcd() : "", style); + ExcelUtils.formatCell(row, 11, vo.getHtzdt() != null ? vo.getHtzdt() : "", style); + ExcelUtils.formatCell(row, 12, vo.getMnz() != null ? CommonUtils.formatNum(vo.getMnz()) : "", style); + ExcelUtils.formatCell(row, 13, vo.getMnzrcd() != null ? vo.getMnzrcd() : "", style); + ExcelUtils.formatCell(row, 14, vo.getMnzdt() != null ? vo.getMnzdt() : "", style); + rowIndex++; + } + } + } + +} + + + + diff --git a/swlscx/src/main/java/com/ruoyi/swlscx/year/controller/YearExportController.java b/swlscx/src/main/java/com/ruoyi/swlscx/year/controller/YearExportController.java new file mode 100644 index 0000000..9c2ce76 --- /dev/null +++ b/swlscx/src/main/java/com/ruoyi/swlscx/year/controller/YearExportController.java @@ -0,0 +1,201 @@ +package com.ruoyi.swlscx.year.controller; + +import com.ruoyi.common.core.page.R; +import com.ruoyi.swlscx.basic.domain.po.YcExportTask; +import com.ruoyi.swlscx.basic.service.YcExportTaskService; +import com.ruoyi.swlscx.common.thread.ExportThread; +import com.ruoyi.swlscx.year.service.*; +import lombok.RequiredArgsConstructor; +import org.springframework.web.bind.annotation.*; + +import javax.servlet.http.HttpServletResponse; + +/** + * @Author al + * @Date 2024/8/7 14:10 + * @Description: TODO + * @Version + */ + +@RequestMapping("/report") +@RequiredArgsConstructor +@RestController +public class YearExportController { + + private final HyYrpFService hyYrpFService; + + private final HyHmxpFService hyHmxpFService; + + private final HyDmxpFService hyDmxpFService; + + private final HyMmxpFService hyMmxpFService; + + private final HyYrzFService hyYrzFService; + + private final HyYrweFService hyYrweFService; + + private final HyYrqFService hyYrqFService; + + private final HyYrcsFService hyYrcsFService; + + private final HyImxfwFService hyImxfwFService; + + private final HyYrqsFService hyYrqsFService; + + private final HyYrwtFService hyYrwtFService; + + private final HyYrtdzFService hyYrtdzFService; + + + + + /** + * 导出年降水表数据 + */ + @RequestMapping("/yearRain") + public R exportYearRainList(HttpServletResponse response, + @RequestParam String startTime, + @RequestParam String endTime, + @RequestParam String stcd, + @RequestParam String stnm) { + return hyYrpFService.exportHyYrpFData(response,startTime,endTime,stcd,stnm); + } + + + + + + /** + * 导出小时时段最大降水量表 + */ + @RequestMapping("/hourMaxRain") + public R exportHourMaxRainList(HttpServletResponse response, + @RequestParam String startTime, + @RequestParam String endTime, + @RequestParam String stcd, + @RequestParam String stnm) { + return hyHmxpFService.exportHyHmxpFData(response,startTime,endTime,stcd,stnm); + } + + /** + * 导出日时时段最大降水量表 + */ + @RequestMapping("/dayMaxRain") + public R exportDayMaxRainList(HttpServletResponse response, + @RequestParam String startTime, + @RequestParam String endTime, + @RequestParam String stcd, + @RequestParam String stnm) { + return hyDmxpFService.exportDayDmxpFData(response,startTime,endTime,stcd,stnm); + } + + /** + * 导出分钟时段最大降水量表 + */ + @RequestMapping("/minMaxRain") + public R exportMinMaxRainList(HttpServletResponse response, + @RequestParam String startTime, + @RequestParam String endTime, + @RequestParam String stcd, + @RequestParam String stnm) { + return hyMmxpFService.exportMinMaxRainList(response,startTime,endTime,stcd,stnm); + } + + /** + * 导出年水位表 + */ + @RequestMapping("/yearWaterLever") + public R exportYearWaterLeverList(HttpServletResponse response, + @RequestParam String startTime, + @RequestParam String endTime, + @RequestParam String stcd, + @RequestParam String stnm) { + return hyYrzFService.exportYearWaterLeverList(response,startTime,endTime,stcd,stnm); + } + + /** + * 导出年水面蒸发量表 + */ + @RequestMapping("/yearEvaporationWater") + public R exportYearEvaporationWaterList(HttpServletResponse response, + @RequestParam String startTime, + @RequestParam String endTime, + @RequestParam String stcd, + @RequestParam String stnm) { + return hyYrweFService.exportYearEvaporationWaterList(response,startTime,endTime,stcd,stnm); + } + + /** + * 导出年流量表 + */ + @RequestMapping("/yearFlow") + public R exportYearFlowList(HttpServletResponse response, + @RequestParam String startTime, + @RequestParam String endTime, + @RequestParam String stcd, + @RequestParam String stnm) { + return hyYrqFService.exportYearFlowList(response,startTime,endTime,stcd,stnm); + } + + /** + * 导出时段最大洪量表 + */ + @RequestMapping("/maxFloodScale") + public R exportMaxFloodScaleList(HttpServletResponse response, + @RequestParam String startTime, + @RequestParam String endTime, + @RequestParam String stcd, + @RequestParam String stnm) { + return hyImxfwFService.exportMaxFloodScaleList(response,startTime,endTime,stcd,stnm); + } + + /** + * 导出年含沙量表 + */ + @RequestMapping("/sedimentConcentration") + public R exportSedimentConcentrationList(HttpServletResponse response, + @RequestParam String startTime, + @RequestParam String endTime, + @RequestParam String stcd, + @RequestParam String stnm) { + return hyYrcsFService.exportSedimentConcentrationList(response,startTime,endTime,stcd,stnm); + } + + /** + * 导出年输沙率表 + */ + @RequestMapping("/sedimentTransportRate") + public R exportSedimentTransportRateList(HttpServletResponse response, + @RequestParam String startTime, + @RequestParam String endTime, + @RequestParam String stcd, + @RequestParam String stnm) { + return hyYrqsFService.exportSedimentTransportRateList(response,startTime,endTime,stcd,stnm); + } + + /** + * 导出年水温表 + */ + @RequestMapping("/yearWaterTemperature") + public R exportYearWaterTemperatureList(HttpServletResponse response, + @RequestParam String startTime, + @RequestParam String endTime, + @RequestParam String stcd, + @RequestParam String stnm) { + return hyYrwtFService.exportYearWaterTemperatureList(response,startTime,endTime,stcd,stnm); + } + + /** + * 导出年潮位表 + */ + @RequestMapping("/yearTideLever") + public R exportYearTideLeverList(HttpServletResponse response, + @RequestParam String startTime, + @RequestParam String endTime, + @RequestParam String stcd, + @RequestParam String stnm) { + return hyYrtdzFService.exportYearTideLeverList(response,startTime,endTime,stcd,stnm); + } + + +} diff --git a/swlscx/src/main/java/com/ruoyi/swlscx/year/controller/YearImportToSoftController.java b/swlscx/src/main/java/com/ruoyi/swlscx/year/controller/YearImportToSoftController.java new file mode 100644 index 0000000..fda4fbf --- /dev/null +++ b/swlscx/src/main/java/com/ruoyi/swlscx/year/controller/YearImportToSoftController.java @@ -0,0 +1,143 @@ +package com.ruoyi.swlscx.year.controller; + +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.ruoyi.common.core.page.R; +import com.ruoyi.swlscx.common.PageParams; +import com.ruoyi.swlscx.day.service.*; +import com.ruoyi.swlscx.year.domain.vo.*; +import com.ruoyi.swlscx.year.service.*; +import lombok.RequiredArgsConstructor; +import lombok.extern.slf4j.Slf4j; +import org.springframework.web.bind.annotation.*; + +/** + * @Author al + * @Date 2025/1/5 16:11 + * @Description: TODO + * @Version + */ +@RestController +@RequestMapping("/year/import") +@RequiredArgsConstructor +@Slf4j +public class YearImportToSoftController { + + private final HyHmxpFService hyHmxpFService; + + private final HyYrpFService hyYrpFService; + + private final HyYrweFService hyYrweFService; + + private final HyYrzFService hyYrzFService; + + private final HyYrqFService hyYrqFService; + + private final HyMmxpFService hyMmxpFService; + + private final HyDmxpFService hyDmxpFService; + + private final HyImxfwFService hyImxfwFService; + + private final HyYrcsFService hyYrcsFService; + + private final HyYrqsFService hyYrqsFService; + + private final HyYrwtFService hyYrwtFService; + + private final HyYrtdzFService hyYrtdzFService; + + + /** + * 导入年降水表数据 + */ + @PostMapping("/importYearRainDateToSoft") + public R getMonthRainList(String startTime, String endTime) { + return hyYrpFService.importDateTosoft(startTime,endTime); + } + + /** + * 导入分钟时段最大降水量表数据 + */ + @PostMapping("/importMaxMRainDateToSoft") + public R importMaxMRainDateToSoft(String startTime, String endTime) { + return hyMmxpFService.importDateTosoft(startTime, endTime); + } + + /** + * 导入小时时段最大降水量表数据 + */ + @RequestMapping("/importMaxHRainDateToSoft") + public R importMaxHRainDateToSoft(String startTime, String endTime) { + return hyHmxpFService.importDateTosoft(startTime, endTime); + } + + /** + * 导入日时时段最大降水量表数据 + */ + @RequestMapping("/importMaxDRainDateToSoft") + public R importMaxDRainDateToSoft(String startTime, String endTime) { + return hyDmxpFService.importDateTosoft(startTime,endTime); + } + + /**导入年水面蒸发表数据**/ + @RequestMapping("/importEvaporationWaterDateToSoft") + public R importEvaporationWaterDateToSoft(String startTime, String endTime) { + return hyYrweFService.importDateTosoft(startTime, endTime); + } + + /**导入年水位表数据**/ + @RequestMapping("/importYearWaterLeverDateToSoft") + public R importYearWaterLeverDateToSoft(String startTime, String endTime) { + return hyYrzFService.importDateTosoft(startTime, endTime); + } + + /**导入年流量表数据**/ + @RequestMapping("/importFlowDateToSoft") + public R importFlowDateToSoft(String startTime, String endTime) { + return hyYrqFService.importDateTosoft(startTime, endTime); + } + + + /** + * 导入年水温表数据 + */ + @RequestMapping("/importYearWaterTemperatureDateToSoft") + public R importYearWaterTemperatureDateToSoft(String startTime, String endTime) { + return hyYrwtFService.importDateTosoft(startTime, endTime); + } + + /** + * 导入年输沙率表数据 + */ + @RequestMapping("/importYearsedimentTransportRateDateToSoft") + public R getYearsedimentTransportRateList(String startTime, String endTime) { + return hyYrqsFService.importDateTosoft(startTime, endTime); + } + + + /** + * 导入年含沙量表数据 + */ + @RequestMapping("/importYearSedimentConcentrationDateToSoft") + public R importYearSedimentConcentrationDateToSoft(String startTime, String endTime) { + return hyYrcsFService.importDateTosoft(startTime, endTime); + } + + + /** + * 导入时段最大洪量表数据 + */ + @RequestMapping("/importMaxFloodScaleDateToSoft") + public R importMaxFloodScaleDateToSoft(String startTime, String endTime) { + return hyImxfwFService.importDateTosoft(startTime, endTime); + } + + /** + * 导入年潮位表数据 + */ + @RequestMapping("/importYearTideLeverDateToSoft") + public R importYearTideLeverDateToSoft(String startTime, String endTime) { + return hyYrtdzFService.importDateTosoft(startTime, endTime); + } + +} diff --git a/swlscx/src/main/java/com/ruoyi/swlscx/year/controller/YearTableController.java b/swlscx/src/main/java/com/ruoyi/swlscx/year/controller/YearTableController.java new file mode 100644 index 0000000..36c6aa2 --- /dev/null +++ b/swlscx/src/main/java/com/ruoyi/swlscx/year/controller/YearTableController.java @@ -0,0 +1,184 @@ +package com.ruoyi.swlscx.year.controller; + +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.ruoyi.common.core.page.R; +import com.ruoyi.swlscx.common.PageParams; +import com.ruoyi.swlscx.year.domain.vo.*; +import com.ruoyi.swlscx.year.service.*; +import lombok.RequiredArgsConstructor; +import lombok.extern.slf4j.Slf4j; +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 org.springframework.web.multipart.MultipartFile; + +/** + * @Author al + * @Date 2024/7/23 14:04 + * @Description: TODO + * @Version + */ + +@RestController +@RequestMapping("/year") +@RequiredArgsConstructor +@Slf4j +public class YearTableController { + + private final HyHmxpFService hyHmxpFService; + + private final HyYrpFService hyYrpFService; + + private final HyYrweFService hyYrweFService; + + private final HyYrzFService hyYrzFService; + + private final HyYrqFService hyYrqFService; + + private final HyMmxpFService hyMmxpFService; + + private final HyDmxpFService hyDmxpFService; + + private final HyImxfwFService hyImxfwFService; + + private final HyYrcsFService hyYrcsFService; + + private final HyYrqsFService hyYrqsFService; + + private final HyYrwtFService hyYrwtFService; + + private final HyYrtdzFService hyYrtdzFService; + + /** + * 导入时段最大降雨量数据 + */ + @PostMapping("/importHourMaxRainData") + public R importHourMaxRainData(MultipartFile file) { + log.info("file:{}", file); + hyHmxpFService.importHourMaxRainData(file); + return R.ok(); + } + + + /** + * 查询年降水表数据 + */ + @GetMapping("/getYearRainList") + public R getMonthRainList(Integer pageNum, Integer pageSize, String startTime, String endTime, String stcd, String stnm) { + PageParams pageParams = new PageParams(pageNum.longValue(), pageSize.longValue()); + IPage hyYrpFVoIPage = hyYrpFService.selectHyYrpFDataByPageAndInfo(pageParams, startTime, endTime, stcd, stnm); + return R.ok().put("data", hyYrpFVoIPage.getRecords()).put("count", hyYrpFVoIPage.getTotal()); + } + + /**查询年水面蒸发表数据**/ + @RequestMapping("/getEvaporationWaterList") + public R getEvaporationWaterList(Integer pageNum,Integer pageSize, String startTime, String endTime,String stcd,String stnm) { + PageParams pageParams = new PageParams(pageNum.longValue(), pageSize.longValue()); + IPage hyYrweFVoIPage = hyYrweFService.selectHyYrweFListPageByInfo(pageParams, startTime, endTime, stcd, stnm); + return R.ok().put("data", hyYrweFVoIPage.getRecords()).put("count", hyYrweFVoIPage.getTotal()); + } + + /**查询年水位表数据**/ + @GetMapping("/getYearWaterLeverList") + public R getWaterLeverList(Integer pageNum,Integer pageSize, String startTime, String endTime,String stnm,String stcd) { + PageParams pageParams = new PageParams(pageNum.longValue(), pageSize.longValue()); + IPage hyYrzFVoIPage = hyYrzFService.selectHyYrzFPageByInfo(pageParams, startTime, endTime, stnm, stcd); + return R.ok().put("data", hyYrzFVoIPage.getRecords()).put("count", hyYrzFVoIPage.getTotal()); + } + + + /**查询年流量表数据**/ + @GetMapping("/getYearFlowList") + public R getFlowList(Integer pageNum, Integer pageSize, String startTime, String endTime, String stcd, String stnm) { + PageParams pageParams = new PageParams(pageNum.longValue(), pageSize.longValue()); + IPage hyYrqFVoIPage = hyYrqFService.selecHyYrqFListPageByInfo(pageParams, startTime, endTime, stcd, stnm); + return R.ok().put("data", hyYrqFVoIPage.getRecords()).put("count", hyYrqFVoIPage.getTotal()); + } + + + + /** + * 查询分钟时段最大降水量表数据 + */ + @RequestMapping("/getMaxMRainList") + public R getMaxMRainList(Integer pageNum,Integer pageSize, String startTime, String endTime,String stcd,String stnm) { + PageParams pageParams = new PageParams(pageNum.longValue(), pageSize.longValue()); + IPage hyMmxpFVoIPage = hyMmxpFService.selectMaxMRainListPageByInfo(pageParams, startTime, endTime, stcd, stnm); + return R.ok().put("data", hyMmxpFVoIPage.getRecords()).put("count", hyMmxpFVoIPage.getTotal()); + } + + /** + * 查询小时时段最大降水量表数据 + */ + @RequestMapping("/getMaxHRainList") + public R getMaxHRainList(Integer pageNum,Integer pageSize, String startTime, String endTime,String stcd,String stnm) { + PageParams pageParams = new PageParams(pageNum.longValue(), pageSize.longValue()); + IPage hyHmxpFVoIPage = hyHmxpFService.selectMaxHRainListPageByInfo(pageParams, startTime, endTime, stcd, stnm); + return R.ok().put("data", hyHmxpFVoIPage.getRecords()).put("count", hyHmxpFVoIPage.getTotal()); + } + + /** + * 查询日时时段最大降水量表 + */ + @RequestMapping("/getMaxDRainList") + public R getMaxDRainList(Integer pageNum,Integer pageSize, String startTime, String endTime,String stcd,String stnm) { + PageParams pageParams = new PageParams(pageNum.longValue(), pageSize.longValue()); + IPage hyDmxpFVoIPage = hyDmxpFService.selectMaxDRainListPageByInfo(pageParams, startTime, endTime, stcd, stnm); + return R.ok().put("data", hyDmxpFVoIPage.getRecords()).put("count", hyDmxpFVoIPage.getTotal()); + } + + + /** + * 查询时段最大洪量表数据 + */ + @RequestMapping("/getMaxFloodScaleList") + public R getMaxFloodScaleList(Integer pageNum,Integer pageSize, String startTime, String endTime,String stcd,String stnm) { + PageParams pageParams = new PageParams(pageNum.longValue(), pageSize.longValue()); + IPage hyImxfwFVoIPage = hyImxfwFService.selectMaxFloodScaleListPageByInfo(pageParams, startTime, endTime, stcd, stnm); + return R.ok().put("data", hyImxfwFVoIPage.getRecords()).put("count", hyImxfwFVoIPage.getTotal()); + } + + + /** + * 查询年含沙量表数据 + */ + @RequestMapping("/getYearSedimentConcentrationList") + public R getYearSedimentConcentrationList(Integer pageNum,Integer pageSize, String startTime, String endTime,String stcd,String stnm) { + PageParams pageParams = new PageParams(pageNum.longValue(), pageSize.longValue()); + IPage yearSedimentConcentrationList = hyYrcsFService.getYearSedimentConcentrationList(pageParams, startTime, endTime, stcd, stnm); + return R.ok().put("data", yearSedimentConcentrationList.getRecords()).put("count", yearSedimentConcentrationList.getTotal()); + } + + /** + * 查询年输沙率表数据 + */ + @RequestMapping("/getYearsedimentTransportRateList") + public R getYearsedimentTransportRateList(Integer pageNum,Integer pageSize, String startTime, String endTime,String stcd,String stnm) { + PageParams pageParams = new PageParams(pageNum.longValue(), pageSize.longValue()); + IPage yearsedimentTransportRateList = hyYrqsFService.getYearsedimentTransportRateList(pageParams, startTime, endTime, stcd, stnm); + return R.ok().put("data", yearsedimentTransportRateList.getRecords()).put("count", yearsedimentTransportRateList.getTotal()); + } + + + /** + * 查询年水温表数据 + */ + @RequestMapping("/getYearWaterTemperatureList") + public R getYearWaterTemperatureList(Integer pageNum,Integer pageSize, String startTime, String endTime,String stcd,String stnm) { + PageParams pageParams = new PageParams(pageNum.longValue(), pageSize.longValue()); + IPage yearWaterTemperatureList = hyYrwtFService.getYearWaterTemperatureList(pageParams, startTime, endTime, stcd, stnm); + return R.ok().put("data", yearWaterTemperatureList.getRecords()).put("count", yearWaterTemperatureList.getTotal()); + } + + /** + * 查询年潮位表数据 + */ + @RequestMapping("/getYearTideLeverList") + public R getYearTideLeverList(Integer pageNum,Integer pageSize, String startTime, String endTime,String stcd,String stnm) { + PageParams pageParams = new PageParams(pageNum.longValue(), pageSize.longValue()); + IPage hyYrtdzFVoIPage = hyYrtdzFService.selectHyYrtdzFListPageByInfo(pageParams, startTime, endTime, stcd, stnm); + return R.ok().put("data", hyYrtdzFVoIPage.getRecords()).put("count", hyYrtdzFVoIPage.getTotal()); + } + +} diff --git a/swlscx/src/main/java/com/ruoyi/swlscx/year/domain/bo/HyDmxpFBo.java b/swlscx/src/main/java/com/ruoyi/swlscx/year/domain/bo/HyDmxpFBo.java new file mode 100644 index 0000000..ae75b3c --- /dev/null +++ b/swlscx/src/main/java/com/ruoyi/swlscx/year/domain/bo/HyDmxpFBo.java @@ -0,0 +1,54 @@ +package com.ruoyi.swlscx.year.domain.bo; + +import com.alibaba.excel.annotation.ExcelProperty; +import lombok.Data; + +import java.io.Serializable; +import java.math.BigDecimal; +import java.util.Date; + +/** + * 日时段最大降水量 + * + * @TableName hy_dmxp_f + */ +@Data +public class HyDmxpFBo implements Serializable { + /** + * 站码 + */ + @ExcelProperty(value = "站码", index = 1) + private String stcd; + + /** + * 最大降水量时段长 + */ + @ExcelProperty(value = "最大降水量时段长", index = 7) + private String mxpdr; + + /** + * 年 + */ + @ExcelProperty(value = "年", index = 5) + private String yr; + + /** + * 起始日期 + */ + @ExcelProperty(value = "起始日期", index = 6) + private String bgdt; + + /** + * 最大降水量 + */ + @ExcelProperty(value = "最大降水量", index = 8) + private String mxp; + + /** + * 最大降水量注解码 + */ + @ExcelProperty(value = "最大降水量注解码", index = 9) + private String mxprc; + + private static final long serialVersionUID = 1L; +} \ No newline at end of file diff --git a/swlscx/src/main/java/com/ruoyi/swlscx/year/domain/bo/HyHmxpFBo.java b/swlscx/src/main/java/com/ruoyi/swlscx/year/domain/bo/HyHmxpFBo.java new file mode 100644 index 0000000..bebfa8b --- /dev/null +++ b/swlscx/src/main/java/com/ruoyi/swlscx/year/domain/bo/HyHmxpFBo.java @@ -0,0 +1,35 @@ +package com.ruoyi.swlscx.year.domain.bo; + +import com.alibaba.excel.annotation.ExcelProperty; +import lombok.Data; + +/** + * @Author al + * @Date 2024/7/30 14:42 + * @Description: TODO + * @Version + */ + + +@Data +public class HyHmxpFBo { + + @ExcelProperty(value = "站码", index = 1) + private String stcd; + + + @ExcelProperty(value = "年", index = 5) + private String yr; + @ExcelProperty(value = "起时间", index = 6) + private String bgtm; + @ExcelProperty(value = "最大降水量时段长", index = 7) + private String mxpdr; + @ExcelProperty(value = "最大降水量", index = 8) + private String mxp; + @ExcelProperty(value = "最大降水量注解码", index = 9) + private String mxprc; + + + + +} diff --git a/swlscx/src/main/java/com/ruoyi/swlscx/year/domain/bo/HyImxfwFBo.java b/swlscx/src/main/java/com/ruoyi/swlscx/year/domain/bo/HyImxfwFBo.java new file mode 100644 index 0000000..e8635f7 --- /dev/null +++ b/swlscx/src/main/java/com/ruoyi/swlscx/year/domain/bo/HyImxfwFBo.java @@ -0,0 +1,54 @@ +package com.ruoyi.swlscx.year.domain.bo; + +import com.alibaba.excel.annotation.ExcelProperty; +import lombok.Data; + +import java.io.Serializable; +import java.math.BigDecimal; +import java.util.Date; + +/** + * 时段最大洪量表 + * + * @TableName hy_imxfw_f + */ +@Data +public class HyImxfwFBo implements Serializable { + /** + * 站码 + */ + @ExcelProperty(value = "站码", index = 1) + private String stcd; + + /** + * 最大洪量时段长 + */ + @ExcelProperty(value = "最大洪量时段长", index = 7) + private String mxwdr; + + /** + * 年 + */ + @ExcelProperty(value = "年", index = 5) + private String yr; + + /** + * 起始日期 + */ + @ExcelProperty(value = "起始日期", index = 6) + private String bgdt; + + /** + * 最大洪量 + */ + @ExcelProperty(value = "最大洪量", index = 8) + private String mxw; + + /** + * 最大洪量注解码 + */ + @ExcelProperty(value = "最大洪量注解码", index = 9) + private String mxwrc; + + private static final long serialVersionUID = 1L; +} \ No newline at end of file diff --git a/swlscx/src/main/java/com/ruoyi/swlscx/year/domain/bo/HyMmxpFBo.java b/swlscx/src/main/java/com/ruoyi/swlscx/year/domain/bo/HyMmxpFBo.java new file mode 100644 index 0000000..45b4f97 --- /dev/null +++ b/swlscx/src/main/java/com/ruoyi/swlscx/year/domain/bo/HyMmxpFBo.java @@ -0,0 +1,54 @@ +package com.ruoyi.swlscx.year.domain.bo; + +import com.alibaba.excel.annotation.ExcelProperty; +import lombok.Data; + +import java.io.Serializable; +import java.math.BigDecimal; +import java.util.Date; + +/** + * 分钟时段最大降水量表 + * + * @TableName hy_mmxp_f + */ +@Data +public class HyMmxpFBo implements Serializable { + /** + * 站码 + */ + @ExcelProperty(value = "站码", index = 1) + private String stcd; + + /** + * 最大降水量时段长 + */ + @ExcelProperty(value = "最大降水量时段长", index = 7) + private String mxpdr; + + /** + * 年 + */ + @ExcelProperty(value = "年", index = 5) + private String yr; + + /** + * 起时间 + */ + @ExcelProperty(value = "起时间", index = 6) + private String bgdt; + + /** + * 最大降水量 + */ + @ExcelProperty(value = "最大降水量", index = 8) + private String mxp; + + /** + * 最大降水量注解码 + */ + @ExcelProperty(value = "最大降水量注解码", index = 9) + private String mxprc; + + private static final long serialVersionUID = 1L; +} \ No newline at end of file diff --git a/swlscx/src/main/java/com/ruoyi/swlscx/year/domain/bo/HyYrcsFBo.java b/swlscx/src/main/java/com/ruoyi/swlscx/year/domain/bo/HyYrcsFBo.java new file mode 100644 index 0000000..ef05d4d --- /dev/null +++ b/swlscx/src/main/java/com/ruoyi/swlscx/year/domain/bo/HyYrcsFBo.java @@ -0,0 +1,78 @@ +package com.ruoyi.swlscx.year.domain.bo; + +import com.alibaba.excel.annotation.ExcelProperty; +import lombok.Data; + +import java.io.Serializable; +import java.math.BigDecimal; +import java.util.Date; + +/** + * 年含沙量表 + * + * @TableName hy_yrcs_f + */ +@Data +public class HyYrcsFBo implements Serializable { + /** + * 站码 + */ + @ExcelProperty(value = "站码", index = 1) + private String stcd; + + /** + * 年 + */ + @ExcelProperty(value = "年", index = 5) + private String yr; + + /** + * 平均含沙量(千克每立方米) + */ + @ExcelProperty(value = "平均含沙量", index = 6) + private String avcs; + + /** + * 平均含沙量注解码 + */ + @ExcelProperty(value = "平均含沙量注解码", index = 7) + private String avcsrcd; + + /** + * 最大含沙量(千克每立方米) + */ + @ExcelProperty(value = "最大含沙量", index = 8) + private String mxs; + + /** + * 最大含沙量注解码 + */ + @ExcelProperty(value = "最大含沙量注解码", index = 9) + private String mxsrcd; + + /** + * 最大含沙量日期 + */ + @ExcelProperty(value = "最大含沙量日期", index = 10) + private String mxsdt; + + /** + * 最小含沙量(千克每立方米) + */ + @ExcelProperty(value = "最小含沙量", index = 11) + private String mns; + + /** + * 最小含沙量注解码 + */ + @ExcelProperty(value = "最小含沙量注解码", index = 12) + private String mnsrcd; + + /** + * 最小含沙量日期 + */ + @ExcelProperty(value = "最小含沙量日期", index = 13) + private String mnsdt; + + private static final long serialVersionUID = 1L; +} \ No newline at end of file diff --git a/swlscx/src/main/java/com/ruoyi/swlscx/year/domain/bo/HyYrpFBo.java b/swlscx/src/main/java/com/ruoyi/swlscx/year/domain/bo/HyYrpFBo.java new file mode 100644 index 0000000..e19d373 --- /dev/null +++ b/swlscx/src/main/java/com/ruoyi/swlscx/year/domain/bo/HyYrpFBo.java @@ -0,0 +1,75 @@ +package com.ruoyi.swlscx.year.domain.bo; + +import com.alibaba.excel.annotation.ExcelProperty; +import lombok.Data; + +import java.io.Serializable; + +/** + * 年降水量表 + * @TableName hy_yrp_f + */ +@Data +public class HyYrpFBo implements Serializable { + /** + * 站码 + */ + @ExcelProperty(value = "站码",index = 1) + private String stcd; + + /** + * 年 + */ + @ExcelProperty(value = "年",index = 5) + private String yr; + + /** + * 降水量(毫米) + */ + @ExcelProperty(value = "降水量",index = 6) + private String p; + + /** + * 降水量注解码 + */ + @ExcelProperty(value = "降水量注解码",index = 7) + private String prcd; + + /** + * 降水日数 + */ + @ExcelProperty(value = "降水日数",index = 8) + private String pdynum; + + /** + * 降水日数注解码 + */ + @ExcelProperty(value = "降水日数注解码",index = 9) + private String pdynumrcd; + + /** + * 终霜日期 + */ + @ExcelProperty(value = "终霜日期",index = 10) + private String frdsdt; + + /** + * 初霜日期 + */ + @ExcelProperty(value = "初霜日期",index = 11) + private String frapdt; + + /** + * 终雪日期 + */ + @ExcelProperty(value = "终雪日期",index = 12) + private String sndsdt; + + /** + * 初雪日期 + */ + @ExcelProperty(value = "初雪日期",index = 13) + private String snapdt; + + private static final long serialVersionUID = 1L; +} \ No newline at end of file diff --git a/swlscx/src/main/java/com/ruoyi/swlscx/year/domain/bo/HyYrqFBo.java b/swlscx/src/main/java/com/ruoyi/swlscx/year/domain/bo/HyYrqFBo.java new file mode 100644 index 0000000..20a6ee4 --- /dev/null +++ b/swlscx/src/main/java/com/ruoyi/swlscx/year/domain/bo/HyYrqFBo.java @@ -0,0 +1,98 @@ +package com.ruoyi.swlscx.year.domain.bo; + +import com.alibaba.excel.annotation.ExcelProperty; +import lombok.Data; + +/** + * 年流量表 + * + * @TableName hy_yrq_f + */ +@Data +public class HyYrqFBo { + + /** + * 站码 + */ + @ExcelProperty(value = "站码", index = 1) + private String stcd; + + /** + * 年 + */ + @ExcelProperty(value = "年", index = 5) + private String yr; + + /** + * 平均流量 + */ + @ExcelProperty(value = "平均流量", index = 6) + private String avq; + + /** + * 平均流量注解码 + */ + @ExcelProperty(value = "平均流量注解码", index = 7) + private String avqrcd; + + /** + * 最高流量 + */ + @ExcelProperty(value = "最高流量", index = 8) + private String mxq; + + /** + * 最高流量注解码 + */ + @ExcelProperty(value = "最高流量注解码", index = 9) + private String mxqrcd; + + /** + * 最高流量日期 + */ + @ExcelProperty(value = "最高流量日期", index = 10) + private String mxqdt; + + /** + * 最小流量 + */ + @ExcelProperty(value = "最小流量", index = 11) + private String mnq; + + /** + * 最小流量注解码 + */ + @ExcelProperty(value = "最小流量注解码", index = 12) + private String mnqrcd; + + /** + * 最小流量日期 + */ + @ExcelProperty(value = "最小流量日期", index = 13) + private String mnqdt; + + /** + * 径流量(万立方米) + */ + @ExcelProperty(value = "径流量", index = 14) + private String rw; + + /** + * 径流量注解码 + */ + @ExcelProperty(value = "径流量注解码", index = 15) + private String rwrcd; + + /** + * 径流模数(立方分米每秒平方千米) + */ + @ExcelProperty(value = "径流模数", index = 16) + private String rm; + + /** + * 径流深(毫米) + */ + @ExcelProperty(value = "径流深", index = 17) + private String rd; + +} \ No newline at end of file diff --git a/swlscx/src/main/java/com/ruoyi/swlscx/year/domain/bo/HyYrqsFBo.java b/swlscx/src/main/java/com/ruoyi/swlscx/year/domain/bo/HyYrqsFBo.java new file mode 100644 index 0000000..4a7435b --- /dev/null +++ b/swlscx/src/main/java/com/ruoyi/swlscx/year/domain/bo/HyYrqsFBo.java @@ -0,0 +1,97 @@ +package com.ruoyi.swlscx.year.domain.bo; + +import com.alibaba.excel.annotation.ExcelProperty; +import lombok.Data; + +/** + * 年输沙率表 + * + * @TableName hy_yrqs_f + */ +@Data +public class HyYrqsFBo { + /** + * 站码 + */ + @ExcelProperty(value = "站码", index = 1) + private String stcd; + + /** + * 泥沙类型 + */ + @ExcelProperty(value = "泥沙类型", index = 6) + private String sdtp; + + /** + * 年 + */ + @ExcelProperty(value = "年", index = 5) + private String yr; + + /** + * 平均输沙率(千克每秒) + */ + @ExcelProperty(value = "平均输沙率", index = 7) + private String avqs; + + /** + * 平均输沙率注解码 + */ + @ExcelProperty(value = "平均输沙率注解码", index = 8) + private String avqsrcd; + + /** + * 最大日平均沙率(千克每秒) + */ + @ExcelProperty(value = "最大日平均沙率", index = 9) + private String mxdyqs; + + /** + * 最大日平均沙率注解码 + */ + @ExcelProperty(value = "最大日平均沙率注解码", index = 10) + private String mxdyqsrcd; + + /** + * 最大日平均沙率出现日期 + */ + @ExcelProperty(value = "最大日平均沙率出现日期", index = 11) + private String mxdyqsodt; + + /** + * 输沙量(万吨) + */ + @ExcelProperty(value = "输沙量", index = 12) + private String sw; + + /** + * 输沙量注解码 + */ + @ExcelProperty(value = "输沙量注解码", index = 13) + private String swpc; + + /** + * 输沙数模 + */ + @ExcelProperty(value = "输沙数模", index = 14) + private String sm; + + /** + * 采样仪器型号 + */ + @ExcelProperty(value = "采样仪器型号", index = 15) + private String simn; + + /** + * 采样效率系数 + */ + @ExcelProperty(value = "采样效率系数", index = 16) + private String smec; + + /** + * 备注 + */ + @ExcelProperty(value = "备注", index = 17) + private String nt; + +} \ No newline at end of file diff --git a/swlscx/src/main/java/com/ruoyi/swlscx/year/domain/bo/HyYrtdzFBo.java b/swlscx/src/main/java/com/ruoyi/swlscx/year/domain/bo/HyYrtdzFBo.java new file mode 100644 index 0000000..da55e41 --- /dev/null +++ b/swlscx/src/main/java/com/ruoyi/swlscx/year/domain/bo/HyYrtdzFBo.java @@ -0,0 +1,353 @@ +package com.ruoyi.swlscx.year.domain.bo; + +import com.alibaba.excel.annotation.ExcelProperty; +import lombok.Data; + +import java.io.Serializable; + +/** + * 年潮位表 + * + * @TableName hy_yrtdz_f + */ +@Data +public class HyYrtdzFBo implements Serializable { + /** + * 站码 + */ + @ExcelProperty(value = "站码", index = 1) + private String stcd; + + /** + * 年 + */ + @ExcelProperty(value = "年", index = 5) + private String yr; + + /** + * 平均高潮潮位 + */ + @ExcelProperty(value = "平均高潮潮位",index = 6) + private String avhtdz; + + /** + * 平均高潮潮位注解码 + */ + @ExcelProperty(value = "平均高潮潮位注解码", index = 7) + private String avhtdzrcd; + + /** + * 最高高潮位 + */ + @ExcelProperty(value = "最高高潮位", index = 8) + private String hthtdz; + + /** + * 最高高潮位注解码 + */ + @ExcelProperty(value = "最高高潮位注解码", index = 9) + private String hthtdzrcd; + + /** + * 最高高潮位出现时间 + */ + @ExcelProperty(value = "最高高潮位出现时间", index = 10) + private String hthtdzotm; + + /** + * 最低高潮位 + */ + @ExcelProperty(value = "最低高潮位", index = 11) + private String lthtdz; + + /** + * 最低高潮位注解码 + */ + @ExcelProperty(value = "最低高潮位注解码", index = 12) + private String lthtdzrcd; + + /** + * 最低高潮位出现时间 + */ + @ExcelProperty(value = "最低高潮位出现时间", index = 13) + private String lthtdzotm; + + /** + * 平均低潮潮位 + */ + @ExcelProperty(value = "平均低潮潮位", index = 14) + private String avltdz; + + /** + * 平均低潮潮位注解码 + */ + @ExcelProperty(value = "平均低潮潮位注解码", index = 15) + private String avltdzrcd; + + /** + * 最高低潮位 + */ + @ExcelProperty(value = "最高低潮位", index = 16) + private String htltdz; + + /** + * 最高低潮位注解码 + */ + @ExcelProperty(value = "最高低潮位注解码", index = 17) + private String htltdzrcd; + + /** + * 最高低潮潮位出现时间 + */ + @ExcelProperty(value = "最高低潮潮位出现时间", index = 18) + private String htltdzotm; + + /** + * 最低低潮位 + */ + @ExcelProperty(value = "最低低潮位", index = 19) + private String ltltdz; + + /** + * 最低低潮潮位注解码 + */ + @ExcelProperty(value = "最低低潮潮位注解码", index = 20) + private String ltltdzrcd; + + /** + * 最低低潮位出现时间 + */ + @ExcelProperty(value = "最低低潮位出现时间", index = 21) + private String ltltdzotm; + + /** + * 平均涨潮潮差 + */ + @ExcelProperty(value = "平均涨潮潮差", index = 22) + private String avftdr; + + /** + * 平均涨潮潮差注解码 + */ + @ExcelProperty(value = "平均涨潮潮差注解码", index = 23) + private String avftdrrcd; + + /** + * 最大涨潮潮差 + */ + @ExcelProperty(value = "最大涨潮潮差", index = 24) + private String mxfltdr; + + /** + * 最大涨潮潮差注解码 + */ + @ExcelProperty(value = "最大涨潮潮差注解码", index = 25) + private String mxfltdrrcd; + + /** + * 最大涨潮潮差（高潮）时间 + */ + @ExcelProperty(value = "最大涨潮潮差（高潮）时间", index = 26) + private String mxfltdrhtm; + + /** + * 最小潮潮差 + */ + @ExcelProperty(value = "最小潮潮差", index = 27) + private String mnfltdr; + + /** + * 最小涨潮潮差注解码 + */ + @ExcelProperty(value = "最小涨潮潮差注解码", index = 28) + private String mnfltdrrcd; + + /** + * 最小涨潮潮差（高潮）时间 + */ + @ExcelProperty(value = "最小涨潮潮差（高潮）时间", index = 29) + private String mnfltdrhtm; + + + /** + * 平均涨潮潮差 + */ + @ExcelProperty(value = "平均涨潮潮差", index = 30) + private String aver; + + /** + * 平均涨潮潮差注解码 + */ + @ExcelProperty(value = "平均涨潮潮差注解码", index = 31) + private String averbbrrcd; + + /** + * 最大落潮潮差 + */ + @ExcelProperty(value = "最大落潮潮差", index = 32) + private String mxebtdr; + + /** + * 最大落潮潮差注解码 + */ + @ExcelProperty(value = "最大落潮潮差注解码", index = 33) + private String mxebtdrrcd; + + /** + * 最大落潮潮差(高潮)时间 + */ + @ExcelProperty(value = "最大落潮潮差(高潮)时间", index = 34) + private String mxebtdrht; + + /** + * 最小落潮潮差 + */ + @ExcelProperty(value = "最小落潮潮差", index = 35) + private String mnebtdr; + + /** + * 最小落潮潮差注解码 + */ + @ExcelProperty(value = "最小落潮潮差注解码", index = 36) + private String mnebtdrrcd; + + /** + * 最小落潮潮差（高潮）时间 + */ + @ExcelProperty(value = "最小落潮潮差（高潮）时间", index = 37) + private String mnebtdrhtm; + + /** + * 平均涨潮历时 + */ + @ExcelProperty(value = "平均涨潮历时", index = 38) + private String avftd; + + /** + * 平均涨潮历时注解码 + */ + @ExcelProperty(value = "平均涨潮历时注解码", index = 39) + private String avftdrcd; + + /** + * 最长涨潮历时 + */ + @ExcelProperty(value = "最长涨潮历时", index = 40) + private String mxfltddr; + + /** + * 最长涨潮历时注解码 + */ + @ExcelProperty(value = "最长涨潮历时注解码", index = 41) + private String mxfltddrrcd; + + /** + * 最长涨潮历时（高潮）时间 + */ + @ExcelProperty(value = "最长涨潮历时（高潮）时间", index = 42) + private String mxfltddrhtm; + + /** + * 最短涨潮历时 + */ + @ExcelProperty(value = "最短涨潮历时", index = 43) + private String mnfltddr; + + /** + * 最短涨潮历时注解码 + */ + @ExcelProperty(value = "最短涨潮历时注解码", index = 44) + private String mnfltddrrcd; + + /** + * 最短涨潮历时（高潮）时间 + */ + @ExcelProperty(value = "最短涨潮历时（高潮）时间", index = 45) + private String mnfltddrhtm; + + /** + * 平均落潮历时 + */ + @ExcelProperty(value = "平均落潮历时", index = 46) + private String avebbdr; + + /** + * 平均落潮历时注解码 + */ + @ExcelProperty(value = "平均落潮历时注解码", index = 47) + private String avedrc; + + /** + * 最长落潮历时 + */ + @ExcelProperty(value = "最长落潮历时", index = 48) + private String mxebtddr; + + /** + * 最长落潮历时注解码 + */ + @ExcelProperty(value = "最长落潮历时注解码", index = 49) + private String mxebtddrrcd; + + /** + * 最长落潮历时（高潮）时间 + */ + @ExcelProperty(value = "最长落潮历时（高潮）时间", index = 50) + private String mxebtddrhtm; + + /** + * 最短落潮历时 + */ + @ExcelProperty(value = "最短落潮历时", index = 51) + private String mnbtddr; + + /** + * 最短落潮历时注解码 + */ + @ExcelProperty(value = "最短落潮历时注解码", index = 52) + private String mnebtddrrcd; + + /** + * 最短落潮历时（高潮）时间 + */ + @ExcelProperty(value = "最短落潮历时（高潮）时间", index = 53) + private String mnebtddrhtm; + + /** + * 逐时平均潮位 + */ + @ExcelProperty(value = "逐时平均潮位", index = 54) + private String hravtdz; + + /** + * 逐时平均潮位注解码 + */ + @ExcelProperty(value = "逐时平均潮位注解码", index = 55) + private String hravtdzrcd; + + /** + * 平均潮差 + */ + @ExcelProperty(value = "平均潮差", index = 56) + private String avtdr; + + /** + * 平均潮差注解码 + */ + @ExcelProperty(value = "平均潮差注解码", index = 57) + private String avtdrrcd; + + /** + * 平均历时 + */ + @ExcelProperty(value = "平均历时", index = 58) + private String avtddr; + + /** + * 平均历时注解码 + */ + @ExcelProperty(value = "平均历时注解码", index = 59) + private String avtddrrcd; + + private static final long serialVersionUID = 1L; +} \ No newline at end of file diff --git a/swlscx/src/main/java/com/ruoyi/swlscx/year/domain/bo/HyYrweFBo.java b/swlscx/src/main/java/com/ruoyi/swlscx/year/domain/bo/HyYrweFBo.java new file mode 100644 index 0000000..4bb1d82 --- /dev/null +++ b/swlscx/src/main/java/com/ruoyi/swlscx/year/domain/bo/HyYrweFBo.java @@ -0,0 +1,106 @@ +package com.ruoyi.swlscx.year.domain.bo; + +import com.alibaba.excel.annotation.ExcelProperty; +import lombok.Data; + +import java.io.Serializable; + +/** + * 年水面蒸发量表 + * + * @TableName hy_yrwe_f + */ +@Data +public class HyYrweFBo implements Serializable { + /** + * 站码 + */ + @ExcelProperty(value = "站码", index = 1) + private String stcd; + + /** + * 蒸发器型式 + */ + @ExcelProperty(value = "蒸发器型式", index = 5) + private String eetp; + + /** + * 年 + */ + @ExcelProperty(value = "年", index = 6) + private String yr; + + /** + * 水面蒸发量(毫米) + */ + @ExcelProperty(value = "水面蒸发量", index = 7) + private String wsfe; + + /** + * 水面蒸发量注解码 + */ + @ExcelProperty(value = "水面蒸发量注解码", index = 8) + private String wsfercd; + + /** + * 最大日水面蒸发量 + */ + @ExcelProperty(value = "最大日水面蒸发量", index = 9) + private String mxdye; + + /** + * 最大日水面蒸发量注解码 + */ + @ExcelProperty(value = "最大日水面蒸发量注解码", index = 10) + private String mxdyercd; + + /** + * 最大日水面蒸发量出现日期 + */ + @ExcelProperty(value = "最大日水面蒸发量出现日期", index = 11) + private String mxdyeodt; + + /** + * 最小日水面蒸发量 + */ + @ExcelProperty(value = "最小日水面蒸发量", index = 12) + private String mndye; + + /** + * 最小日水面蒸发量注解码 + */ + @ExcelProperty(value = "最小日水面蒸发量注解码", index = 13) + private String mndyercd; + + /** + * 最小日水面蒸发量出现日期 + */ + @ExcelProperty(value = "最小日水面蒸发量出现日期", index = 14) + private String mndyeodt; + + /** + * 终冰日期 + */ + @ExcelProperty(value = "终冰日期", index = 15) + private String idsdt; + + /** + * 初冰日期 + */ + @ExcelProperty(value = "初冰日期", index = 16) + private String icapd; + + /** + * 蒸发场位置特征 + */ + @ExcelProperty(value = "蒸发场位置特征", index = 17) + private String eslcch; + + /** + * 备注 + */ + @ExcelProperty(value = "备注", index = 18) + private String nt; + + private static final long serialVersionUID = 1L; +} \ No newline at end of file diff --git a/swlscx/src/main/java/com/ruoyi/swlscx/year/domain/bo/HyYrwtFBo.java b/swlscx/src/main/java/com/ruoyi/swlscx/year/domain/bo/HyYrwtFBo.java new file mode 100644 index 0000000..53979bf --- /dev/null +++ b/swlscx/src/main/java/com/ruoyi/swlscx/year/domain/bo/HyYrwtFBo.java @@ -0,0 +1,75 @@ +package com.ruoyi.swlscx.year.domain.bo; + +import com.alibaba.excel.annotation.ExcelProperty; +import lombok.Data; + +import java.io.Serializable; + +/** + * 年水温表 + * + * @TableName hy_yrwt_f + */ +@Data +public class HyYrwtFBo implements Serializable { + /** + * 站码 + */ + @ExcelProperty(value = "站码", index = 1) + private String stcd; + + /** + * 年 + */ + @ExcelProperty(value = "年", index = 5) + private String yr; + + /** + * 平均水温(摄氏度) + */ + @ExcelProperty(value = "平均水温", index = 6) + private String avwtmp; + + /** + * 平均水温注解码 + */ + @ExcelProperty(value = "平均水温注解码", index = 7) + private String avwtmprcd; + + /** + * 最高水温(摄氏度) + */ + @ExcelProperty(value = "最高水温", index = 8) + private String mxwtmp; + + /** + * 最高水温注解码 + */ + @ExcelProperty(value = "最高水温注解码", index = 9) + private String mxwtmprcd; + + /** + * 最高水温日期 + */ + private String mxwtmpdt; + + /** + * 最低水温(摄氏度) + */ + @ExcelProperty(value = "最低水温", index = 10) + private String mnwtmp; + + /** + * 最低水温注解码 + */ + @ExcelProperty(value = "最低水温注解码", index = 11) + private String mnwtmprcd; + + /** + * 最低水温日期 + */ + @ExcelProperty(value = "最低水温日期", index = 12) + private String mnwtmpdt; + + private static final long serialVersionUID = 1L; +} \ No newline at end of file diff --git a/swlscx/src/main/java/com/ruoyi/swlscx/year/domain/bo/HyYrzFBo.java b/swlscx/src/main/java/com/ruoyi/swlscx/year/domain/bo/HyYrzFBo.java new file mode 100644 index 0000000..4ffc612 --- /dev/null +++ b/swlscx/src/main/java/com/ruoyi/swlscx/year/domain/bo/HyYrzFBo.java @@ -0,0 +1,76 @@ +package com.ruoyi.swlscx.year.domain.bo; + +import com.alibaba.excel.annotation.ExcelProperty; +import lombok.Data; + +import java.io.Serializable; + +/** + * 年水位表 + * + * @TableName hy_yrz_f + */ +@Data +public class HyYrzFBo implements Serializable { + /** + * 站码 + */ + @ExcelProperty(value = "站码", index = 1) + private String stcd; + + /** + * 年 + */ + @ExcelProperty(value = "年", index = 5) + private String yr; + + /** + * 平均水位 + */ + @ExcelProperty(value = "平均水位", index = 6) + private String avz; + + /** + * 平均水位注解码 + */ + @ExcelProperty(value = "平均水位注解码", index = 7) + private String avzrcd; + + /** + * 最高水位 + */ + @ExcelProperty(value = "最高水位", index = 8) + private String htz; + + /** + * 最高水位注解码 + */ + @ExcelProperty(value = "最高水位注解码", index = 9) + private String htzrcd; + + /** + * 最高水位日期 + */ + @ExcelProperty(value = "最高水位日期", index = 10) + private String htzdt; + + /** + * 最低水位 + */ + @ExcelProperty(value = "最低水位", index = 11) + private String mnz; + + /** + * 最低水位注解码 + */ + @ExcelProperty(value = "最低水位注解码", index = 12) + private String mnzrcd; + + /** + * 最低水位日期 + */ + @ExcelProperty(value = "最低水位日期", index = 13) + private String mnzdt; + + private static final long serialVersionUID = 1L; +} \ No newline at end of file diff --git a/swlscx/src/main/java/com/ruoyi/swlscx/year/domain/po/HyDmxpF.java b/swlscx/src/main/java/com/ruoyi/swlscx/year/domain/po/HyDmxpF.java new file mode 100644 index 0000000..87603a9 --- /dev/null +++ b/swlscx/src/main/java/com/ruoyi/swlscx/year/domain/po/HyDmxpF.java @@ -0,0 +1,51 @@ +package com.ruoyi.swlscx.year.domain.po; + +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 java.io.Serializable; +import java.math.BigDecimal; +import java.util.Date; +import lombok.Data; + +/** + * 日时段最大降水量 + * @TableName hy_dmxp_f + */ +@TableName(value ="hy_dmxp_f") +@Data +public class HyDmxpF implements Serializable { + /** + * 站码 + */ + private String stcd; + + /** + * 最大降水量时段长 + */ + private Integer mxpdr; + + /** + * 年 + */ + private Integer yr; + + /** + * 起始日期 + */ + private Date bgdt; + + /** + * 最大降水量 + */ + private BigDecimal mxp; + + /** + * 最大降水量注解码 + */ + private String mxprc; + + @TableField(exist = false) + private static final long serialVersionUID = 1L; +} \ No newline at end of file diff --git a/swlscx/src/main/java/com/ruoyi/swlscx/year/domain/po/HyHmxpF.java b/swlscx/src/main/java/com/ruoyi/swlscx/year/domain/po/HyHmxpF.java new file mode 100644 index 0000000..1d7ab4c --- /dev/null +++ b/swlscx/src/main/java/com/ruoyi/swlscx/year/domain/po/HyHmxpF.java @@ -0,0 +1,63 @@ +package com.ruoyi.swlscx.year.domain.po; + + +import com.alibaba.excel.annotation.ExcelProperty; +import com.alibaba.excel.annotation.format.DateTimeFormat; +import com.baomidou.mybatisplus.annotation.FieldStrategy; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + +import java.io.Serializable; +import java.math.BigDecimal; +import java.util.Date; + +/** + * + * @author 12974 + * @TableName hy_hmxp_f + */ +@TableName(value ="hy_hmxp_f") +@Data +public class HyHmxpF implements Serializable { + /** + * 站码 + */ + private String stcd; + + /** + * 最大降水量时段长(小时) + */ + @TableField(updateStrategy = FieldStrategy.IGNORED,insertStrategy = FieldStrategy.IGNORED) + private Integer mxpdr; + + /** + * 年 + */ + @TableField(updateStrategy = FieldStrategy.IGNORED,insertStrategy = FieldStrategy.IGNORED) + private Integer yr; + + /** + * 起时间 + */ + @TableField(updateStrategy = FieldStrategy.IGNORED,insertStrategy = FieldStrategy.IGNORED) + @DateTimeFormat("yyyy-MM-dd HH:mm:ss") + private Date bgtm; + + /** + * 最大降水量(毫米) + */ + @TableField(updateStrategy = FieldStrategy.IGNORED,insertStrategy = FieldStrategy.IGNORED) + private BigDecimal mxp; + + /** + * 最大降水量注解码 + */ + @TableField(updateStrategy = FieldStrategy.IGNORED,insertStrategy = FieldStrategy.IGNORED) + private String mxprc; + + @TableField(exist = false) + private static final long serialVersionUID = 1L; + + +} \ No newline at end of file diff --git a/swlscx/src/main/java/com/ruoyi/swlscx/year/domain/po/HyImxfwF.java b/swlscx/src/main/java/com/ruoyi/swlscx/year/domain/po/HyImxfwF.java new file mode 100644 index 0000000..4350eb8 --- /dev/null +++ b/swlscx/src/main/java/com/ruoyi/swlscx/year/domain/po/HyImxfwF.java @@ -0,0 +1,51 @@ +package com.ruoyi.swlscx.year.domain.po; + +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 java.io.Serializable; +import java.math.BigDecimal; +import java.util.Date; +import lombok.Data; + +/** + * 时段最大洪量表 + * @TableName hy_imxfw_f + */ +@TableName(value ="hy_imxfw_f") +@Data +public class HyImxfwF implements Serializable { + /** + * 站码 + */ + private String stcd; + + /** + * 最大洪量时段长 + */ + private String mxwdr; + + /** + * 年 + */ + private Integer yr; + + /** + * 起始日期 + */ + private Date bgdt; + + /** + * 最大洪量 + */ + private BigDecimal mxw; + + /** + * 最大洪量注解码 + */ + private String mxwrc; + + @TableField(exist = false) + private static final long serialVersionUID = 1L; +} \ No newline at end of file diff --git a/swlscx/src/main/java/com/ruoyi/swlscx/year/domain/po/HyMmxpF.java b/swlscx/src/main/java/com/ruoyi/swlscx/year/domain/po/HyMmxpF.java new file mode 100644 index 0000000..bc12db7 --- /dev/null +++ b/swlscx/src/main/java/com/ruoyi/swlscx/year/domain/po/HyMmxpF.java @@ -0,0 +1,51 @@ +package com.ruoyi.swlscx.year.domain.po; + +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 java.io.Serializable; +import java.math.BigDecimal; +import java.util.Date; +import lombok.Data; + +/** + * 分钟时段最大降水量表 + * @TableName hy_mmxp_f + */ +@TableName(value ="hy_mmxp_f") +@Data +public class HyMmxpF implements Serializable { + /** + * 站码 + */ + private String stcd; + + /** + * 最大降水量时段长 + */ + private Integer mxpdr; + + /** + * 年 + */ + private Integer yr; + + /** + * 起时间 + */ + private Date bgdt; + + /** + * 最大降水量 + */ + private BigDecimal mxp; + + /** + * 最大降水量注解码 + */ + private String mxprc; + + @TableField(exist = false) + private static final long serialVersionUID = 1L; +} \ No newline at end of file diff --git a/swlscx/src/main/java/com/ruoyi/swlscx/year/domain/po/HyYrcsF.java b/swlscx/src/main/java/com/ruoyi/swlscx/year/domain/po/HyYrcsF.java new file mode 100644 index 0000000..c9f8571 --- /dev/null +++ b/swlscx/src/main/java/com/ruoyi/swlscx/year/domain/po/HyYrcsF.java @@ -0,0 +1,71 @@ +package com.ruoyi.swlscx.year.domain.po; + +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 java.io.Serializable; +import java.math.BigDecimal; +import java.util.Date; +import lombok.Data; + +/** + * 年含沙量表 + * @TableName hy_yrcs_f + */ +@TableName(value ="hy_yrcs_f") +@Data +public class HyYrcsF implements Serializable { + /** + * 站码 + */ + private String stcd; + + /** + * 年 + */ + private Integer yr; + + /** + * 平均含沙量(千克每立方米) + */ + private BigDecimal avcs; + + /** + * 平均含沙量注解码 + */ + private String avcsrcd; + + /** + * 最大含沙量(千克每立方米) + */ + private BigDecimal mxs; + + /** + * 最大含沙量注解码 + */ + private String mxsrcd; + + /** + * 最大含沙量日期 + */ + private Date mxsdt; + + /** + * 最小含沙量(千克每立方米) + */ + private BigDecimal mns; + + /** + * 最小含沙量注解码 + */ + private String mnsrcd; + + /** + * 最小含沙量日期 + */ + private Date mnsdt; + + @TableField(exist = false) + private static final long serialVersionUID = 1L; +} \ No newline at end of file diff --git a/swlscx/src/main/java/com/ruoyi/swlscx/year/domain/po/HyYrpF.java b/swlscx/src/main/java/com/ruoyi/swlscx/year/domain/po/HyYrpF.java new file mode 100644 index 0000000..bc9029c --- /dev/null +++ b/swlscx/src/main/java/com/ruoyi/swlscx/year/domain/po/HyYrpF.java @@ -0,0 +1,71 @@ +package com.ruoyi.swlscx.year.domain.po; + +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 java.io.Serializable; +import java.math.BigDecimal; +import java.util.Date; +import lombok.Data; + +/** + * 年降水量表 + * @TableName hy_yrp_f + */ +@TableName(value ="hy_yrp_f") +@Data +public class HyYrpF implements Serializable { + /** + * 站码 + */ + private String stcd; + + /** + * 年 + */ + private Integer yr; + + /** + * 降水量(毫米) + */ + private BigDecimal p; + + /** + * 降水量注解码 + */ + private String prcd; + + /** + * 降水日数 + */ + private String pdynum; + + /** + * 降水日数注解码 + */ + private String pdynumrcd; + + /** + * 终霜日期 + */ + private Date frdsdt; + + /** + * 初霜日期 + */ + private Date frapdt; + + /** + * 终雪日期 + */ + private Date sndsdt; + + /** + * 初雪日期 + */ + private Date snapdt; + + @TableField(exist = false) + private static final long serialVersionUID = 1L; +} \ No newline at end of file diff --git a/swlscx/src/main/java/com/ruoyi/swlscx/year/domain/po/HyYrqF.java b/swlscx/src/main/java/com/ruoyi/swlscx/year/domain/po/HyYrqF.java new file mode 100644 index 0000000..1268786 --- /dev/null +++ b/swlscx/src/main/java/com/ruoyi/swlscx/year/domain/po/HyYrqF.java @@ -0,0 +1,91 @@ +package com.ruoyi.swlscx.year.domain.po; + +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 java.io.Serializable; +import java.math.BigDecimal; +import java.util.Date; +import lombok.Data; + +/** + * 年流量表 + * @TableName hy_yrq_f + */ +@TableName(value ="hy_yrq_f") +@Data +public class HyYrqF implements Serializable { + /** + * 站码 + */ + private String stcd; + + /** + * 年 + */ + private Integer yr; + + /** + * 平均流量 + */ + private BigDecimal avq; + + /** + * 平均流量注解码 + */ + private String avqrcd; + + /** + * 最高流量 + */ + private BigDecimal mxq; + + /** + * 最高流量注解码 + */ + private String mxqrcd; + + /** + * 最高流量日期 + */ + private Date mxqdt; + + /** + * 最小流量 + */ + private BigDecimal mnq; + + /** + * 最小流量注解码 + */ + private String mnqrcd; + + /** + * 最小流量日期 + */ + private Date mnqdt; + + /** + * 径流量(万立方米) + */ + private BigDecimal rw; + + /** + * 径流量注解码 + */ + private String rwrcd; + + /** + * 径流模数(立方分米每秒平方千米) + */ + private BigDecimal rm; + + /** + * 径流深(毫米) + */ + private BigDecimal rd; + + @TableField(exist = false) + private static final long serialVersionUID = 1L; +} \ No newline at end of file diff --git a/swlscx/src/main/java/com/ruoyi/swlscx/year/domain/po/HyYrqsF.java b/swlscx/src/main/java/com/ruoyi/swlscx/year/domain/po/HyYrqsF.java new file mode 100644 index 0000000..e9e5d02 --- /dev/null +++ b/swlscx/src/main/java/com/ruoyi/swlscx/year/domain/po/HyYrqsF.java @@ -0,0 +1,91 @@ +package com.ruoyi.swlscx.year.domain.po; + +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 java.io.Serializable; +import java.math.BigDecimal; +import java.util.Date; +import lombok.Data; + +/** + * 年输沙率表 + * @TableName hy_yrqs_f + */ +@TableName(value ="hy_yrqs_f") +@Data +public class HyYrqsF implements Serializable { + /** + * 站码 + */ + private String stcd; + + /** + * 泥沙类型 + */ + private String sdtp; + + /** + * 年 + */ + private Integer yr; + + /** + * 平均输沙率(千克每秒) + */ + private BigDecimal avqs; + + /** + * 平均输沙率注解码 + */ + private String avqsrcd; + + /** + * 最大日平均沙率(千克每秒) + */ + private BigDecimal mxdyqs; + + /** + * 最大日平均沙率注解码 + */ + private String mxdyqsrcd; + + /** + * 最大日平均沙率出现日期 + */ + private Date mxdyqsodt; + + /** + * 输沙量(万吨) + */ + private BigDecimal sw; + + /** + * 输沙量注解码 + */ + private String swpc; + + /** + * 输沙数模 + */ + private BigDecimal sm; + + /** + * 采样仪器型号 + */ + private String simn; + + /** + * 采样效率系数 + */ + private BigDecimal smec; + + /** + * 备注 + */ + private String nt; + + @TableField(exist = false) + private static final long serialVersionUID = 1L; +} \ No newline at end of file diff --git a/swlscx/src/main/java/com/ruoyi/swlscx/year/domain/po/HyYrtdzF.java b/swlscx/src/main/java/com/ruoyi/swlscx/year/domain/po/HyYrtdzF.java new file mode 100644 index 0000000..7bbf414 --- /dev/null +++ b/swlscx/src/main/java/com/ruoyi/swlscx/year/domain/po/HyYrtdzF.java @@ -0,0 +1,301 @@ +package com.ruoyi.swlscx.year.domain.po; + +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 java.io.Serializable; +import java.math.BigDecimal; +import java.util.Date; +import lombok.Data; + +/** + * 年潮位表 + * @TableName hy_yrtdz_f + */ +@TableName(value ="hy_yrtdz_f") +@Data +public class HyYrtdzF implements Serializable { + /** + * 站码 + */ + private String stcd; + + /** + * 年 + */ + private Integer yr; + + /** + * 平均高潮潮位 + */ + private BigDecimal avhtdz; + + /** + * 平均高潮潮位注解码 + */ + private String avhtdzrcd; + + /** + * 最高高潮位 + */ + private BigDecimal hthtdz; + + /** + * 最高高潮位注解码 + */ + private String hthtdzrcd; + + /** + * 最高高潮位出现时间 + */ + private Date hthtdzotm; + + /** + * 最低高潮位 + */ + private BigDecimal lthtdz; + + /** + * 最低高潮位注解码 + */ + private String lthtdzrcd; + + /** + * 最低高潮位出现时间 + */ + private Date lthtdzotm; + + /** + * 平均低潮潮位 + */ + private BigDecimal avltdz; + + /** + * 平均低潮潮位注解码 + */ + private String avltdzrcd; + + /** + * 最高低潮位 + */ + private BigDecimal htltdz; + + /** + * 最高低潮位注解码 + */ + private String htltdzrcd; + + /** + * 最高低潮潮位出现时间 + */ + private Date htltdzotm; + + /** + * 最低低潮位 + */ + private BigDecimal ltltdz; + + /** + * 最低低潮潮位注解码 + */ + private String ltltdzrcd; + + /** + * 最低地潮位出现时间 + */ + private Date ltltdzotm; + + /** + * 平均涨潮潮差 + */ + private BigDecimal avftdr; + + /** + * 平均涨潮潮差注解码 + */ + private String avftdrrcd; + + /** + * 最大涨潮潮差 + */ + private BigDecimal mxfltdr; + + /** + * 最大涨潮潮差注解码 + */ + private String mxfltdrrcd; + + /** + * 最大涨潮潮差（高潮）时间 + */ + private Date mxfltdrhtm; + + /** + * 最小潮潮差 + */ + private BigDecimal mnfltdr; + + /** + * 最小涨潮潮差注解码 + */ + private String mnfltdrrcd; + + /** + * 最小涨潮潮差（高潮）时间 + */ + private Date mnfltdrhtm; + + /** + * 平均涨潮潮差 + */ + private BigDecimal aver; + + /** + * 平均涨潮潮差注解码 + */ + private String averbbrrcd; + + /** + * 最大落潮潮差 + */ + private BigDecimal mxebtdr; + + /** + * 最大落潮潮差注解码 + */ + private String mxebtdrrcd; + + /** + * 最大落潮潮差(高潮)时间 + */ + private Date mxebtdrht; + + /** + * 最小落潮潮差 + */ + private BigDecimal mnebtdr; + + /** + * 最小落潮潮差注解码 + */ + private String mnebtdrrcd; + + /** + * 最小落潮潮差（高潮）时间 + */ + private Date mnebtdrhtm; + + /** + * 平均涨潮历时 + */ + private Integer avftd; + + /** + * 平均涨潮历时注解码 + */ + private String avftdrcd; + + /** + * 最长涨潮历时 + */ + private Integer mxfltddr; + + /** + * 最长涨潮历时注解码 + */ + private String mxfltddrrcd; + + /** + * 最长涨潮历时（高潮）时间 + */ + private Date mxfltddrhtm; + + /** + * 最短涨潮历时 + */ + private Integer mnfltddr; + + /** + * 最短涨潮历时注解码 + */ + private String mnfltddrrcd; + + /** + * 最短涨潮历时（高潮）时间 + */ + private Date mnfltddrhtm; + + /** + * 平均落潮历时 + */ + private Integer avebbdr; + + /** + * 平均落潮历时注解码 + */ + private String avedrc; + + /** + * 最长落潮历时 + */ + private Integer mxebtddr; + + /** + * 最长落潮历时注解码 + */ + private String mxebtddrrcd; + + /** + * 最长落潮历时（高潮）时间 + */ + private Date mxebtddrhtm; + + /** + * 最短落潮历时 + */ + private Integer mnbtddr; + + /** + * 最短落潮历时注解码 + */ + private String mnebtddrrcd; + + /** + * 最短落潮历时（高潮）时间 + */ + private Date mnebtddrhtm; + + /** + * 逐时平均潮位 + */ + private BigDecimal hravtdz; + + /** + * 逐时平均潮位注解码 + */ + private String hravtdzrcd; + + /** + * 平均潮差 + */ + private BigDecimal avtdr; + + /** + * 平均潮差注解码 + */ + private String avtdrrcd; + + /** + * 平均历时 + */ + private Integer avtddr; + + /** + * 平均历时注解码 + */ + private String avtddrrcd; + + @TableField(exist = false) + private static final long serialVersionUID = 1L; +} \ No newline at end of file diff --git a/swlscx/src/main/java/com/ruoyi/swlscx/year/domain/po/HyYrweF.java b/swlscx/src/main/java/com/ruoyi/swlscx/year/domain/po/HyYrweF.java new file mode 100644 index 0000000..b2a0f15 --- /dev/null +++ b/swlscx/src/main/java/com/ruoyi/swlscx/year/domain/po/HyYrweF.java @@ -0,0 +1,97 @@ +package com.ruoyi.swlscx.year.domain.po; + +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 java.io.Serializable; +import java.math.BigDecimal; +import java.util.Date; +import lombok.Data; + +/** + * 年水面蒸发量表 + * @TableName hy_yrwe_f + */ +@TableName(value ="hy_yrwe_f") +@Data +public class HyYrweF implements Serializable { + /** + * 站码 + */ + private String stcd; + + /** + * 蒸发器型式 + */ + private String eetp; + + /** + * 年 + */ + @TableId + private Integer yr; + + /** + * 水面蒸发量(毫米) + */ + private BigDecimal wsfe; + + /** + * 水面蒸发量注解码 + */ + private String wsfercd; + + /** + * 最大日水面蒸发量 + */ + private BigDecimal mxdye; + + /** + * 最大日水面蒸发量注解码 + */ + private String mxdyercd; + + /** + * 最大日水面蒸发量出现日期 + */ + private Date mxdyeodt; + + /** + * 最小日水面蒸发量 + */ + private BigDecimal mndye; + + /** + * 最小日水面蒸发量注解码 + */ + private String mndyercd; + + /** + * 最小日水面蒸发量出现日期 + */ + private Date mndyeodt; + + /** + * 终冰日期 + */ + private Date idsdt; + + /** + * 初冰日期 + */ + private Date icapd; + + /** + * 蒸发场位置特征 + */ + private String eslcch; + + /** + * 备注 + */ + private String nt; + + @TableField(exist = false) + private static final long serialVersionUID = 1L; +} \ No newline at end of file diff --git a/swlscx/src/main/java/com/ruoyi/swlscx/year/domain/po/HyYrwtF.java b/swlscx/src/main/java/com/ruoyi/swlscx/year/domain/po/HyYrwtF.java new file mode 100644 index 0000000..bbc163a --- /dev/null +++ b/swlscx/src/main/java/com/ruoyi/swlscx/year/domain/po/HyYrwtF.java @@ -0,0 +1,71 @@ +package com.ruoyi.swlscx.year.domain.po; + +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 java.io.Serializable; +import java.math.BigDecimal; +import java.util.Date; +import lombok.Data; + +/** + * 年水温表 + * @TableName hy_yrwt_f + */ +@TableName(value ="hy_yrwt_f") +@Data +public class HyYrwtF implements Serializable { + /** + * 站码 + */ + private String stcd; + + /** + * 年 + */ + private Integer yr; + + /** + * 平均水温(摄氏度) + */ + private BigDecimal avwtmp; + + /** + * 平均水温注解码 + */ + private String avwtmprcd; + + /** + * 最高水温(摄氏度) + */ + private BigDecimal mxwtmp; + + /** + * 最高水温注解码 + */ + private String mxwtmprcd; + + /** + * 最高水温日期 + */ + private Date mxwtmpdt; + + /** + * 最低水温(摄氏度) + */ + private BigDecimal mnwtmp; + + /** + * 最低水温注解码 + */ + private String mnwtmprcd; + + /** + * 最低水温日期 + */ + private Date mnwtmpdt; + + @TableField(exist = false) + private static final long serialVersionUID = 1L; +} \ No newline at end of file diff --git a/swlscx/src/main/java/com/ruoyi/swlscx/year/domain/po/HyYrzF.java b/swlscx/src/main/java/com/ruoyi/swlscx/year/domain/po/HyYrzF.java new file mode 100644 index 0000000..a6c0631 --- /dev/null +++ b/swlscx/src/main/java/com/ruoyi/swlscx/year/domain/po/HyYrzF.java @@ -0,0 +1,71 @@ +package com.ruoyi.swlscx.year.domain.po; + +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 java.io.Serializable; +import java.math.BigDecimal; +import java.util.Date; +import lombok.Data; + +/** + * 年水位表 + * @TableName hy_yrz_f + */ +@TableName(value ="hy_yrz_f") +@Data +public class HyYrzF implements Serializable { + /** + * 站码 + */ + private String stcd; + + /** + * 年 + */ + private Integer yr; + + /** + * 平均水位 + */ + private BigDecimal avz; + + /** + * 平均水位注解码 + */ + private String avzrcd; + + /** + * 最高水位 + */ + private BigDecimal htz; + + /** + * 最高水位注解码 + */ + private String htzrcd; + + /** + * 最高水位日期 + */ + private Date htzdt; + + /** + * 最低水位 + */ + private BigDecimal mnz; + + /** + * 最低水位注解码 + */ + private String mnzrcd; + + /** + * 最低水位日期 + */ + private Date mnzdt; + + @TableField(exist = false) + private static final long serialVersionUID = 1L; +} \ No newline at end of file diff --git a/swlscx/src/main/java/com/ruoyi/swlscx/year/domain/vo/HyDmxpFVo.java b/swlscx/src/main/java/com/ruoyi/swlscx/year/domain/vo/HyDmxpFVo.java new file mode 100644 index 0000000..377fa8f --- /dev/null +++ b/swlscx/src/main/java/com/ruoyi/swlscx/year/domain/vo/HyDmxpFVo.java @@ -0,0 +1,62 @@ +package com.ruoyi.swlscx.year.domain.vo; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + +import java.io.Serializable; +import java.math.BigDecimal; +import java.util.Date; + +/** + * 日时段最大降水量 + * @TableName hy_dmxp_f + */ +@Data +public class HyDmxpFVo implements Serializable { + /** + * 站码 + */ + private String stcd; + + /** + * 最大降水量时段长 + */ + private Integer mxpdr; + + /** + * 年 + */ + private Integer yr; + + /** + * 起始日期 + */ + private String bgdt; + + /** + * 最大降水量 + */ + private BigDecimal mxp; + + /** + * 最大降水量注解码 + */ + private String mxprc; + /** + * 行政区划码 + */ + private String addvcd; + + /** + * 流域水系码 + */ + private String lysxm; + + + /**站名**/ + private String stnm; + + + private static final long serialVersionUID = 1L; +} \ No newline at end of file diff --git a/swlscx/src/main/java/com/ruoyi/swlscx/year/domain/vo/HyHmxpFVo.java b/swlscx/src/main/java/com/ruoyi/swlscx/year/domain/vo/HyHmxpFVo.java new file mode 100644 index 0000000..c6fe6ce --- /dev/null +++ b/swlscx/src/main/java/com/ruoyi/swlscx/year/domain/vo/HyHmxpFVo.java @@ -0,0 +1,70 @@ +package com.ruoyi.swlscx.year.domain.vo; + + +import com.alibaba.excel.annotation.format.DateTimeFormat; +import com.baomidou.mybatisplus.annotation.FieldStrategy; +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.math.BigDecimal; +import java.util.Date; + +/** + * + * @author 12974 + * @TableName hy_hmxp_f + */ +@Data +public class HyHmxpFVo implements Serializable { + /** + * 站码 + */ + private String stcd; + + /** + * 最大降水量时段长(小时) + */ + private Integer mxpdr; + + /** + * 年 + */ + private Integer yr; + + /** + * 起时间 + */ + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + private String bgtm; + + /** + * 最大降水量(毫米) + */ + private BigDecimal mxp; + + /** + * 最大降水量注解码 + */ + private String mxprc; + + /** + * 行政区划码 + */ + private String addvcd; + + /** + * 流域水系码 + */ + private String lysxm; + + + /**站名**/ + private String stnm; + + private static final long serialVersionUID = 1L; + + +} \ No newline at end of file diff --git a/swlscx/src/main/java/com/ruoyi/swlscx/year/domain/vo/HyImxfwFVo.java b/swlscx/src/main/java/com/ruoyi/swlscx/year/domain/vo/HyImxfwFVo.java new file mode 100644 index 0000000..e2209d3 --- /dev/null +++ b/swlscx/src/main/java/com/ruoyi/swlscx/year/domain/vo/HyImxfwFVo.java @@ -0,0 +1,63 @@ +package com.ruoyi.swlscx.year.domain.vo; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + +import java.io.Serializable; +import java.math.BigDecimal; +import java.util.Date; + +/** + * 时段最大洪量表 + * @TableName hy_imxfw_f + */ +@Data +public class HyImxfwFVo implements Serializable { + /** + * 站码 + */ + private String stcd; + + /** + * 最大洪量时段长 + */ + private String mxwdr; + + /** + * 年 + */ + private Integer yr; + + /** + * 起始日期 + */ + private String bgdt; + + /** + * 最大洪量 + */ + private BigDecimal mxw; + + /** + * 最大洪量注解码 + */ + private String mxwrc; + + /** + * 行政区划码 + */ + private String addvcd; + + /** + * 流域水系码 + */ + private String lysxm; + + + /**站名**/ + private String stnm; + + + private static final long serialVersionUID = 1L; +} \ No newline at end of file diff --git a/swlscx/src/main/java/com/ruoyi/swlscx/year/domain/vo/HyMmxpFVo.java b/swlscx/src/main/java/com/ruoyi/swlscx/year/domain/vo/HyMmxpFVo.java new file mode 100644 index 0000000..bf2cd7d --- /dev/null +++ b/swlscx/src/main/java/com/ruoyi/swlscx/year/domain/vo/HyMmxpFVo.java @@ -0,0 +1,63 @@ +package com.ruoyi.swlscx.year.domain.vo; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + +import java.io.Serializable; +import java.math.BigDecimal; +import java.util.Date; + +/** + * 分钟时段最大降水量表 + * @TableName hy_mmxp_f + */ +@Data +public class HyMmxpFVo implements Serializable { + /** + * 站码 + */ + private String stcd; + + /** + * 最大降水量时段长 + */ + private Integer mxpdr; + + /** + * 年 + */ + private Integer yr; + + /** + * 起时间 + */ + private String bgdt; + + /** + * 最大降水量 + */ + private BigDecimal mxp; + + /** + * 最大降水量注解码 + */ + private String mxprc; + + + /** + * 行政区划码 + */ + private String addvcd; + + /** + * 流域水系码 + */ + private String lysxm; + + + /**站名**/ + private String stnm; + + private static final long serialVersionUID = 1L; +} \ No newline at end of file diff --git a/swlscx/src/main/java/com/ruoyi/swlscx/year/domain/vo/HyYrcsFVo.java b/swlscx/src/main/java/com/ruoyi/swlscx/year/domain/vo/HyYrcsFVo.java new file mode 100644 index 0000000..ea662f7 --- /dev/null +++ b/swlscx/src/main/java/com/ruoyi/swlscx/year/domain/vo/HyYrcsFVo.java @@ -0,0 +1,82 @@ +package com.ruoyi.swlscx.year.domain.vo; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + +import java.io.Serializable; +import java.math.BigDecimal; +import java.util.Date; + +/** + * 年含沙量表 + * @TableName hy_yrcs_f + */ +@Data +public class HyYrcsFVo implements Serializable { + /** + * 站码 + */ + private String stcd; + + /** + * 年 + */ + private Integer yr; + + /** + * 平均含沙量(千克每立方米) + */ + private BigDecimal avcs; + + /** + * 平均含沙量注解码 + */ + private String avcsrcd; + + /** + * 最大含沙量(千克每立方米) + */ + private BigDecimal mxs; + + /** + * 最大含沙量注解码 + */ + private String mxsrcd; + + /** + * 最大含沙量日期 + */ + private String mxsdt; + + /** + * 最小含沙量(千克每立方米) + */ + private BigDecimal mns; + + /** + * 最小含沙量注解码 + */ + private String mnsrcd; + + /** + * 最小含沙量日期 + */ + private String mnsdt; + + /** + * 行政区划码 + */ + private String addvcd; + + /** + * 流域水系码 + */ + private String lysxm; + + + /**站名**/ + private String stnm; + + private static final long serialVersionUID = 1L; +} \ No newline at end of file diff --git a/swlscx/src/main/java/com/ruoyi/swlscx/year/domain/vo/HyYrpFVo.java b/swlscx/src/main/java/com/ruoyi/swlscx/year/domain/vo/HyYrpFVo.java new file mode 100644 index 0000000..4f41580 --- /dev/null +++ b/swlscx/src/main/java/com/ruoyi/swlscx/year/domain/vo/HyYrpFVo.java @@ -0,0 +1,76 @@ +package com.ruoyi.swlscx.year.domain.vo; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + +import java.io.Serializable; +import java.math.BigDecimal; +import java.util.Date; + +/** + * 年降水量表 + * @TableName hy_yrp_f + */ +@Data +public class HyYrpFVo implements Serializable { + /** + * 站码 + */ + private String stcd; + + /** + * 年 + */ + private Integer yr; + + /** + * 降水量(毫米) + */ + private BigDecimal p; + + /** + * 降水量注解码 + */ + private String prcd; + + /** + * 降水日数 + */ + private String pdynum; + + /** + * 降水日数注解码 + */ + private String pdynumrcd; + + /** + * 终霜日期 + */ + private Date frdsdt; + + /** + * 初霜日期 + */ + private Date frapdt; + + /** + * 终雪日期 + */ + private Date sndsdt; + + /** + * 初雪日期 + */ + private Date snapdt; + + /**站名**/ + private String stnm; + + /** + * 行政区划码 + */ + private String addvcd; + + private static final long serialVersionUID = 1L; +} \ No newline at end of file diff --git a/swlscx/src/main/java/com/ruoyi/swlscx/year/domain/vo/HyYrqFVo.java b/swlscx/src/main/java/com/ruoyi/swlscx/year/domain/vo/HyYrqFVo.java new file mode 100644 index 0000000..9080f09 --- /dev/null +++ b/swlscx/src/main/java/com/ruoyi/swlscx/year/domain/vo/HyYrqFVo.java @@ -0,0 +1,101 @@ +package com.ruoyi.swlscx.year.domain.vo; + +import lombok.Data; + +import java.math.BigDecimal; +import java.util.Date; + +/** + * @Author al + * @Date 2024/9/9 17:02 + * @Description: TODO + * @Version 年流量表 + */ +@Data +public class HyYrqFVo { + + /** + * 站码 + */ + private String stcd; + + /** + * 年 + */ + private Integer yr; + + /** + * 平均流量 + */ + private BigDecimal avq; + + /** + * 平均流量注解码 + */ + private String avqrcd; + + /** + * 最高流量 + */ + private BigDecimal mxq; + + /** + * 最高流量注解码 + */ + private String mxqrcd; + + /** + * 最高流量日期 + */ + private String mxqdt; + + /** + * 最小流量 + */ + private BigDecimal mnq; + + /** + * 最小流量注解码 + */ + private String mnqrcd; + + /** + * 最小流量日期 + */ + private String mnqdt; + + /** + * 径流量(万立方米) + */ + private BigDecimal rw; + + /** + * 径流量注解码 + */ + private String rwrcd; + + /** + * 径流模数(立方分米每秒平方千米) + */ + private BigDecimal rm; + + /** + * 径流深(毫米) + */ + private BigDecimal rd; + + /** + * 站名 + */ + private String stnm; + + + private String addvcd; + + + /** + * 流域水系码 + */ + private String lysxm; + +} diff --git a/swlscx/src/main/java/com/ruoyi/swlscx/year/domain/vo/HyYrqsFVo.java b/swlscx/src/main/java/com/ruoyi/swlscx/year/domain/vo/HyYrqsFVo.java new file mode 100644 index 0000000..4d7f3ea --- /dev/null +++ b/swlscx/src/main/java/com/ruoyi/swlscx/year/domain/vo/HyYrqsFVo.java @@ -0,0 +1,102 @@ +package com.ruoyi.swlscx.year.domain.vo; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + +import java.io.Serializable; +import java.math.BigDecimal; +import java.util.Date; + +/** + * 年输沙率表 + * @TableName hy_yrqs_f + */ +@Data +public class HyYrqsFVo implements Serializable { + /** + * 站码 + */ + private String stcd; + + /** + * 泥沙类型 + */ + private String sdtp; + + /** + * 年 + */ + private Integer yr; + + /** + * 平均输沙率(千克每秒) + */ + private BigDecimal avqs; + + /** + * 平均输沙率注解码 + */ + private String avqsrcd; + + /** + * 最大日平均沙率(千克每秒) + */ + private BigDecimal mxdyqs; + + /** + * 最大日平均沙率注解码 + */ + private String mxdyqsrcd; + + /** + * 最大日平均沙率出现日期 + */ + private String mxdyqsodt; + + /** + * 输沙量(万吨) + */ + private BigDecimal sw; + + /** + * 输沙量注解码 + */ + private String swpc; + + /** + * 输沙数模 + */ + private BigDecimal sm; + + /** + * 采样仪器型号 + */ + private String simn; + + /** + * 采样效率系数 + */ + private BigDecimal smec; + + /** + * 备注 + */ + private String nt; + + /** + * 站名 + */ + private String stnm; + + + private String addvcd; + + + /** + * 流域水系码 + */ + private String lysxm; + + private static final long serialVersionUID = 1L; +} \ No newline at end of file diff --git a/swlscx/src/main/java/com/ruoyi/swlscx/year/domain/vo/HyYrtdzFVo.java b/swlscx/src/main/java/com/ruoyi/swlscx/year/domain/vo/HyYrtdzFVo.java new file mode 100644 index 0000000..7da1a8a --- /dev/null +++ b/swlscx/src/main/java/com/ruoyi/swlscx/year/domain/vo/HyYrtdzFVo.java @@ -0,0 +1,310 @@ +package com.ruoyi.swlscx.year.domain.vo; + +import lombok.Data; + +import java.io.Serializable; +import java.math.BigDecimal; +import java.util.Date; + +/** + * + * @TableName hy_yrz_f + */ +@Data +public class HyYrtdzFVo implements Serializable { + /** + * 站码 + */ + private String stcd; + + /** + * 年 + */ + private Integer yr; + + /** + * 平均高潮潮位 + */ + private BigDecimal avhtdz; + + /** + * 平均高潮潮位注解码 + */ + private String avhtdzrcd; + + /** + * 最高高潮位 + */ + private BigDecimal hthtdz; + + /** + * 最高高潮位注解码 + */ + private String hthtdzrcd; + + /** + * 最高高潮位出现时间 + */ + private String hthtdzotm; + + /** + * 最低高潮位 + */ + private BigDecimal lthtdz; + + /** + * 最低高潮位注解码 + */ + private String lthtdzrcd; + + /** + * 最低高潮位出现时间 + */ + private String lthtdzotm; + + /** + * 平均低潮潮位 + */ + private BigDecimal avltdz; + + /** + * 平均低潮潮位注解码 + */ + private String avltdzrcd; + + /** + * 最高低潮位 + */ + private BigDecimal htltdz; + + /** + * 最高低潮位注解码 + */ + private String htltdzrcd; + + /** + * 最高低潮潮位出现时间 + */ + private String htltdzotm; + + /** + * 最低低潮位 + */ + private BigDecimal ltltdz; + + /** + * 最低低潮潮位注解码 + */ + private String ltltdzrcd; + + /** + * 最低地潮位出现时间 + */ + private String ltltdzotm; + + /** + * 平均涨潮潮差 + */ + private BigDecimal avftdr; + + /** + * 平均涨潮潮差注解码 + */ + private String avftdrrcd; + + /** + * 最大涨潮潮差 + */ + private BigDecimal mxfltdr; + + /** + * 最大涨潮潮差注解码 + */ + private String mxfltdrrcd; + + /** + * 最大涨潮潮差（高潮）时间 + */ + private String mxfltdrhtm; + + /** + * 最小潮潮差 + */ + private BigDecimal mnfltdr; + + /** + * 最小涨潮潮差注解码 + */ + private String mnfltdrrcd; + + /** + * 最小涨潮潮差（高潮）时间 + */ + private String mnfltdrhtm; + + /** + * 平均涨潮潮差 + */ + private BigDecimal aver; + + /** + * 平均涨潮潮差注解码 + */ + private String averbbrrcd; + + /** + * 最大落潮潮差 + */ + private BigDecimal mxebtdr; + + /** + * 最大落潮潮差注解码 + */ + private String mxebtdrrcd; + + /** + * 最大落潮潮差(高潮)时间 + */ + private String mxebtdrht; + + /** + * 最小落潮潮差 + */ + private BigDecimal mnebtdr; + + /** + * 最小落潮潮差注解码 + */ + private String mnebtdrrcd; + + /** + * 最小落潮潮差（高潮）时间 + */ + private String mnebtdrhtm; + + /** + * 平均涨潮历时 + */ + private Integer avftd; + + /** + * 平均涨潮历时注解码 + */ + private String avftdrcd; + + /** + * 最长涨潮历时 + */ + private Integer mxfltddr; + + /** + * 最长涨潮历时注解码 + */ + private String mxfltddrrcd; + + /** + * 最长涨潮历时（高潮）时间 + */ + private String mxfltddrhtm; + + /** + * 最短涨潮历时 + */ + private Integer mnfltddr; + + /** + * 最短涨潮历时注解码 + */ + private String mnfltddrrcd; + + /** + * 最短涨潮历时（高潮）时间 + */ + private String mnfltddrhtm; + + /** + * 平均落潮历时 + */ + private Integer avebbdr; + + /** + * 平均落潮历时注解码 + */ + private String avedrc; + + /** + * 最长落潮历时 + */ + private Integer mxebtddr; + + /** + * 最长落潮历时注解码 + */ + private String mxebtddrrcd; + + /** + * 最长落潮历时（高潮）时间 + */ + private String mxebtddrhtm; + + /** + * 最短落潮历时 + */ + private Integer mnbtddr; + + /** + * 最短落潮历时注解码 + */ + private String mnebtddrrcd; + + /** + * 最短落潮历时（高潮）时间 + */ + private String mnebtddrhtm; + + /** + * 逐时平均潮位 + */ + private BigDecimal hravtdz; + + /** + * 逐时平均潮位注解码 + */ + private String hravtdzrcd; + + /** + * 平均潮差 + */ + private BigDecimal avtdr; + + /** + * 平均潮差注解码 + */ + private String avtdrrcd; + + /** + * 平均历时 + */ + private Integer avtddr; + + /** + * 平均历时注解码 + */ + private String avtddrrcd; + + /** + * 行政区划码 + */ + private String addvcd; + + /** + * 流域水系码 + */ + private String lysxm; + + + /**站名**/ + private String stnm; + + private static final long serialVersionUID = 1L; +} \ No newline at end of file diff --git a/swlscx/src/main/java/com/ruoyi/swlscx/year/domain/vo/HyYrweFVo.java b/swlscx/src/main/java/com/ruoyi/swlscx/year/domain/vo/HyYrweFVo.java new file mode 100644 index 0000000..77a8892 --- /dev/null +++ b/swlscx/src/main/java/com/ruoyi/swlscx/year/domain/vo/HyYrweFVo.java @@ -0,0 +1,98 @@ +package com.ruoyi.swlscx.year.domain.vo; + +import lombok.Data; + +import java.math.BigDecimal; +import java.util.Date; + +/** + * @Author al + * @Date 2024/8/1 10:24 + * @Description: TODO + * @Version + */ + +@Data +public class HyYrweFVo { + + /** + * 站码 + */ + private String stcd; + + /** + * 蒸发器型式 + */ + private String eetp; + + /** + * 年 + */ + private Integer yr; + + /** + * 水面蒸发量(毫米) + */ + private Double wsfe; + + /** + * 水面蒸发量注解码 + */ + private String wsfercd; + + /** + * 最大日水面蒸发量 + */ + private Double mxdye; + + /** + * 最大日水面蒸发量注解码 + */ + private String mxdyercd; + + /** + * 最大日水面蒸发量出现日期 + */ + private String mxdyeodt; + + /** + * 最小日水面蒸发量 + */ + private Double mndye; + + /** + * 最小日水面蒸发量注解码 + */ + private String mndyercd; + + /** + * 最小日水面蒸发量出现日期 + */ + private String mndyeodt; + + /** + * 终冰日期 + */ + private String idsdt; + + /** + * 初冰日期 + */ + private String icapd; + + /** + * 蒸发场位置特征 + */ + private String eslcch; + + /** + * 备注 + */ + private String nt; + + private String stnm; + + private String lysxm; + + private String addvcd; +} diff --git a/swlscx/src/main/java/com/ruoyi/swlscx/year/domain/vo/HyYrwtFVo.java b/swlscx/src/main/java/com/ruoyi/swlscx/year/domain/vo/HyYrwtFVo.java new file mode 100644 index 0000000..2b71d5b --- /dev/null +++ b/swlscx/src/main/java/com/ruoyi/swlscx/year/domain/vo/HyYrwtFVo.java @@ -0,0 +1,74 @@ +package com.ruoyi.swlscx.year.domain.vo; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + +import java.io.Serializable; +import java.math.BigDecimal; +import java.util.Date; + +/** + * 年水温表 + * @TableName hy_yrwt_f + */ +@Data +public class HyYrwtFVo implements Serializable { + /** + * 站码 + */ + private String stcd; + + /** + * 年 + */ + private Integer yr; + + /** + * 平均水温(摄氏度) + */ + private BigDecimal avwtmp; + + /** + * 平均水温注解码 + */ + private String avwtmprcd; + + /** + * 最高水温(摄氏度) + */ + private BigDecimal mxwtmp; + + /** + * 最高水温注解码 + */ + private String mxwtmprcd; + + /** + * 最高水温日期 + */ + private String mxwtmpdt; + + /** + * 最低水温(摄氏度) + */ + private BigDecimal mnwtmp; + + /** + * 最低水温注解码 + */ + private String mnwtmprcd; + + /** + * 最低水温日期 + */ + private Date mnwtmpdt; + + private String stnm; + + private String lysxm; + + private String addvcd; + + private static final long serialVersionUID = 1L; +} \ No newline at end of file diff --git a/swlscx/src/main/java/com/ruoyi/swlscx/year/domain/vo/HyYrzFVo.java b/swlscx/src/main/java/com/ruoyi/swlscx/year/domain/vo/HyYrzFVo.java new file mode 100644 index 0000000..0ec2ff4 --- /dev/null +++ b/swlscx/src/main/java/com/ruoyi/swlscx/year/domain/vo/HyYrzFVo.java @@ -0,0 +1,80 @@ +package com.ruoyi.swlscx.year.domain.vo; + +import lombok.Data; + +import java.math.BigDecimal; +import java.util.Date; + +/** + * @Author al + * @Date 2024/9/9 16:21 + * @Description: TODO + * @Version + */ +@Data +public class HyYrzFVo { + /** + * 站点编码 + */ + private String stcd; + + /** + * 年份 + */ + private Integer yr; + + /** + * 平均值 + */ + private BigDecimal avz; + + /** + * 平均值记录 + */ + private String avzrcd; + + /** + * 最大值 + */ + private BigDecimal htz; + + /** + * 最大值记录 + */ + private String htzrcd; + + /** + * 最大值日期时间 + */ + private String htzdt; + + /** + * 最小值 + */ + private BigDecimal mnz; + + /** + * 最小值记录 + */ + private String mnzrcd; + + /** + * 最小值日期时间 + */ + private String mnzdt; + + + /** + * 行政区划码 + */ + private String addvcd; + + /** + * 流域水系码 + */ + private String lysxm; + + + /**站名**/ + private String stnm; +} diff --git a/swlscx/src/main/java/com/ruoyi/swlscx/year/mapper/HyDmxpFMapper.java b/swlscx/src/main/java/com/ruoyi/swlscx/year/mapper/HyDmxpFMapper.java new file mode 100644 index 0000000..e35bd65 --- /dev/null +++ b/swlscx/src/main/java/com/ruoyi/swlscx/year/mapper/HyDmxpFMapper.java @@ -0,0 +1,33 @@ +package com.ruoyi.swlscx.year.mapper; + +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.ruoyi.swlscx.year.domain.po.HyDmxpF; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.ruoyi.swlscx.year.domain.vo.HyDmxpFVo; +import org.apache.ibatis.annotations.Param; +import org.springframework.security.core.parameters.P; + +import java.util.List; +import java.util.Map; + +/** +* @author 12974 +* @description 针对表【hy_dmxp_f(日时段最大降水量)】的数据库操作Mapper +* @createDate 2024-09-11 10:09:13 +* @Entity com.ruoyi.swlscx.domain.year.po.HyDmxpF +*/ +public interface HyDmxpFMapper extends BaseMapper { + + IPage selecthyDmxpFPageByInfo(Page page,@Param("map") Map map); + + void deleteTempData(); + + void insertTempData(@Param("list") List batch); + + void mergeToData(); +} + + + + diff --git a/swlscx/src/main/java/com/ruoyi/swlscx/year/mapper/HyHmxpFMapper.java b/swlscx/src/main/java/com/ruoyi/swlscx/year/mapper/HyHmxpFMapper.java new file mode 100644 index 0000000..33f9504 --- /dev/null +++ b/swlscx/src/main/java/com/ruoyi/swlscx/year/mapper/HyHmxpFMapper.java @@ -0,0 +1,42 @@ +package com.ruoyi.swlscx.year.mapper; + + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.ruoyi.swlscx.year.domain.po.HyHmxpF; +import com.ruoyi.swlscx.year.domain.vo.HyHmxpFVo; +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; + +import java.util.List; +import java.util.Map; + +/** +* @author 12974 +* @description 针对表【hy_hmxp_f】的数据库操作Mapper +* @createDate 2024-07-23 14:15:25 +* @Entity com/ruoyi/swlscx/domain/po.po.HyHmxpF +*/ +@Mapper +public interface HyHmxpFMapper extends BaseMapper { + + + void batchInsert(@Param("list") List list); + + + /** + * 查询时段最大降雨量表数据 + */ + IPage selecthyMmxpFPageByInfo(Page page, @Param("map") Map map); + + void deleteTempData(); + + void insertTempData(List batch); + + void mergeToData(); +} + + + + diff --git a/swlscx/src/main/java/com/ruoyi/swlscx/year/mapper/HyImxfwFMapper.java b/swlscx/src/main/java/com/ruoyi/swlscx/year/mapper/HyImxfwFMapper.java new file mode 100644 index 0000000..e776134 --- /dev/null +++ b/swlscx/src/main/java/com/ruoyi/swlscx/year/mapper/HyImxfwFMapper.java @@ -0,0 +1,37 @@ +package com.ruoyi.swlscx.year.mapper; + +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.ruoyi.swlscx.year.domain.po.HyImxfwF; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.ruoyi.swlscx.year.domain.vo.HyImxfwFVo; +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; + +import java.util.List; +import java.util.Map; + +/** +* @author 12974 +* @description 针对表【hy_imxfw_f(时段最大洪量表)】的数据库操作Mapper +* @createDate 2024-09-09 17:32:19 +* @Entity com.ruoyi.swlscx.domain.year.po.HyImxfwF +*/ +@Mapper +public interface HyImxfwFMapper extends BaseMapper { + + /** + * 查询时段最大洪量表数据 + */ + IPage selectHyImxfwFPageByInfo(Page page,@Param("map") Map map); + + void deleteTempData(); + + void insertTempData(List batch); + + void mergeToData(); +} + + + + diff --git a/swlscx/src/main/java/com/ruoyi/swlscx/year/mapper/HyMmxpFMapper.java b/swlscx/src/main/java/com/ruoyi/swlscx/year/mapper/HyMmxpFMapper.java new file mode 100644 index 0000000..5f92e4d --- /dev/null +++ b/swlscx/src/main/java/com/ruoyi/swlscx/year/mapper/HyMmxpFMapper.java @@ -0,0 +1,37 @@ +package com.ruoyi.swlscx.year.mapper; + +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.ruoyi.swlscx.year.domain.po.HyMmxpF; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.ruoyi.swlscx.year.domain.vo.HyMmxpFVo; +import org.apache.ibatis.annotations.Param; + +import java.util.List; +import java.util.Map; + +/** +* @author 12974 +* @description 针对表【hy_mmxp_f(分钟时段最大降水量表)】的数据库操作Mapper +* @createDate 2024-09-11 10:09:13 +* @Entity com.ruoyi.swlscx.domain.year.po.HyMmxpF +*/ +public interface HyMmxpFMapper extends BaseMapper { + + void batchInsert(@Param("list") List batchList); + + /** + * 查询分钟时段最大降水量表数据 + */ + IPage selectHyMmxpFPageByInfo(Page page,@Param("map") Map map); + + void insertTempData(@Param("list")List batch); + + void deleteTempData(); + + void mergeToData(); +} + + + + diff --git a/swlscx/src/main/java/com/ruoyi/swlscx/year/mapper/HyYrcsFMapper.java b/swlscx/src/main/java/com/ruoyi/swlscx/year/mapper/HyYrcsFMapper.java new file mode 100644 index 0000000..25e6495 --- /dev/null +++ b/swlscx/src/main/java/com/ruoyi/swlscx/year/mapper/HyYrcsFMapper.java @@ -0,0 +1,37 @@ +package com.ruoyi.swlscx.year.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.ruoyi.swlscx.year.domain.po.HyYrcsF; +import com.ruoyi.swlscx.year.domain.vo.HyYrcsFVo; +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; + +import java.util.List; +import java.util.Map; + +/** +* @author 12974 +* @description 针对表【hy_yrcs_f(年含沙量表)】的数据库操作Mapper +* @createDate 2024-09-05 16:53:36 +* @Entity com.ruoyi.swlscx.domain.po.HyYrcsF +*/ +@Mapper +public interface HyYrcsFMapper extends BaseMapper { + + /** + * 查询年含沙量表数据 + */ + IPage selecthyYrcsFPageByInfo(Page page,@Param("map") Map map); + + void deleteTempData(); + + void insertTempData(@Param("list") List batch); + + void mergeToData(); +} + + + + diff --git a/swlscx/src/main/java/com/ruoyi/swlscx/year/mapper/HyYrpFMapper.java b/swlscx/src/main/java/com/ruoyi/swlscx/year/mapper/HyYrpFMapper.java new file mode 100644 index 0000000..ec51fd3 --- /dev/null +++ b/swlscx/src/main/java/com/ruoyi/swlscx/year/mapper/HyYrpFMapper.java @@ -0,0 +1,51 @@ +package com.ruoyi.swlscx.year.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.ruoyi.swlscx.basic.domain.po.HyStscA; +import com.ruoyi.swlscx.month.domain.vo.HyMptEVo; +import com.ruoyi.swlscx.year.domain.po.HyYrpF; +import com.ruoyi.swlscx.year.domain.vo.HyYrpFVo; +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; + +import java.util.List; +import java.util.Map; + +/** +* @author 12974 +* @description 针对表【hy_yrp_f(年降水量表)】的数据库操作Mapper +* @createDate 2024-09-05 16:53:36 +* @Entity com.ruoyi.swlscx.domain.po.HyYrpF +*/ +@Mapper +public interface HyYrpFMapper extends BaseMapper { + + /** + * 批量添加到临时表中 + */ + void batchInsert(@Param("list") List batchList); + + /** + * 刷新数据 + */ + void batchInsertOrUpdate(); + + /** + * 先清空临时表的数据 + */ + void deleteAll(); + + IPage selectHyMtpDataByPageAndInfo(Page page,@Param("map") Map map); + + void deleteTempData(); + + + void mergeToData(); + +} + + + + diff --git a/swlscx/src/main/java/com/ruoyi/swlscx/year/mapper/HyYrqFMapper.java b/swlscx/src/main/java/com/ruoyi/swlscx/year/mapper/HyYrqFMapper.java new file mode 100644 index 0000000..3ee3ca6 --- /dev/null +++ b/swlscx/src/main/java/com/ruoyi/swlscx/year/mapper/HyYrqFMapper.java @@ -0,0 +1,34 @@ +package com.ruoyi.swlscx.year.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.ruoyi.swlscx.year.domain.po.HyYrqF; +import com.ruoyi.swlscx.year.domain.vo.HyYrqFVo; +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; + +import java.util.List; +import java.util.Map; + +/** +* @author 12974 +* @description 针对表【hy_yrq_f(年流量表)】的数据库操作Mapper +* @createDate 2024-09-05 16:53:36 +* @Entity com.ruoyi.swlscx.domain.po.HyYrqF +*/ +@Mapper +public interface HyYrqFMapper extends BaseMapper { + + IPage selectHyMtqEPageByInfo(Page page,@Param("map") Map map); + + void deleteTempData(); + + void insertTempData(@Param("list") List batch); + + void mergeToData(); +} + + + + diff --git a/swlscx/src/main/java/com/ruoyi/swlscx/year/mapper/HyYrqsFMapper.java b/swlscx/src/main/java/com/ruoyi/swlscx/year/mapper/HyYrqsFMapper.java new file mode 100644 index 0000000..308271c --- /dev/null +++ b/swlscx/src/main/java/com/ruoyi/swlscx/year/mapper/HyYrqsFMapper.java @@ -0,0 +1,37 @@ +package com.ruoyi.swlscx.year.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.ruoyi.swlscx.year.domain.po.HyYrqsF; +import com.ruoyi.swlscx.year.domain.vo.HyYrqsFVo; +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; + +import java.util.List; +import java.util.Map; + +/** +* @author 12974 +* @description 针对表【hy_yrqs_f(年输沙率表)】的数据库操作Mapper +* @createDate 2024-09-05 16:53:36 +* @Entity com.ruoyi.swlscx.domain.po.HyYrqsF +*/ +@Mapper +public interface HyYrqsFMapper extends BaseMapper { + + /** + * 查询年输沙率表数据 + */ + IPage selectHyYrqFPageByInfo(Page page, @Param("map") Map map); + + void deleteTempData(); + + void insertTempData(@Param("list") List batch); + + void mergeToData(); +} + + + + diff --git a/swlscx/src/main/java/com/ruoyi/swlscx/year/mapper/HyYrtdzFMapper.java b/swlscx/src/main/java/com/ruoyi/swlscx/year/mapper/HyYrtdzFMapper.java new file mode 100644 index 0000000..996fd92 --- /dev/null +++ b/swlscx/src/main/java/com/ruoyi/swlscx/year/mapper/HyYrtdzFMapper.java @@ -0,0 +1,34 @@ +package com.ruoyi.swlscx.year.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.ruoyi.swlscx.year.domain.po.HyYrtdzF; +import com.ruoyi.swlscx.year.domain.vo.HyYrtdzFVo; +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; + +import java.util.List; +import java.util.Map; + +/** +* @author 12974 +* @description 针对表【hy_yrtdz_f(年潮位表)】的数据库操作Mapper +* @createDate 2024-09-05 16:53:36 +* @Entity com.ruoyi.swlscx.domain.po.HyYrtdzF +*/ +@Mapper +public interface HyYrtdzFMapper extends BaseMapper { + + IPage selectHyYrtdzFListPageByInfo(Page page,@Param("map") Map map); + + void deleteTempData(); + + void insertTempData(@Param("list") List batch); + + void mergeToData(); +} + + + + diff --git a/swlscx/src/main/java/com/ruoyi/swlscx/year/mapper/HyYrweFMapper.java b/swlscx/src/main/java/com/ruoyi/swlscx/year/mapper/HyYrweFMapper.java new file mode 100644 index 0000000..4c7779a --- /dev/null +++ b/swlscx/src/main/java/com/ruoyi/swlscx/year/mapper/HyYrweFMapper.java @@ -0,0 +1,36 @@ +package com.ruoyi.swlscx.year.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.ruoyi.swlscx.year.domain.po.HyYrweF; +import com.ruoyi.swlscx.year.domain.vo.HyYrweFVo; +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; + +import java.util.List; +import java.util.Map; + +/** +* @author 12974 +* @description 针对表【hy_yrwe_f(年水面蒸发量表)】的数据库操作Mapper +* @createDate 2024-09-05 16:53:36 +* @Entity com.ruoyi.swlscx.domain.po.HyYrweF +*/ +@Mapper +public interface HyYrweFMapper extends BaseMapper { + + + + IPage selechyYrweFListPageByInfo(Page page,@Param("map") Map map); + + void deleteTempData(); + + void insertTempData(@Param("list") List batch); + + void mergeToData(); +} + + + + diff --git a/swlscx/src/main/java/com/ruoyi/swlscx/year/mapper/HyYrwtFMapper.java b/swlscx/src/main/java/com/ruoyi/swlscx/year/mapper/HyYrwtFMapper.java new file mode 100644 index 0000000..df4acdb --- /dev/null +++ b/swlscx/src/main/java/com/ruoyi/swlscx/year/mapper/HyYrwtFMapper.java @@ -0,0 +1,37 @@ +package com.ruoyi.swlscx.year.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.ruoyi.swlscx.year.domain.po.HyYrwtF; +import com.ruoyi.swlscx.year.domain.vo.HyYrwtFVo; +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; + +import java.util.List; +import java.util.Map; + +/** +* @author 12974 +* @description 针对表【hy_yrwt_f(年水温表)】的数据库操作Mapper +* @createDate 2024-09-05 16:53:36 +* @Entity com.ruoyi.swlscx.domain.po.HyYrwtF +*/ +@Mapper +public interface HyYrwtFMapper extends BaseMapper { + + /** + * 查询年水温表数据 + */ + IPage selectHyYrwtFPageByInfo(Page page,@Param("map") Map map); + + void deleteTempData(); + + void insertTempData(@Param("list") List batch); + + void mergeToData(); +} + + + + diff --git a/swlscx/src/main/java/com/ruoyi/swlscx/year/mapper/HyYrzFMapper.java b/swlscx/src/main/java/com/ruoyi/swlscx/year/mapper/HyYrzFMapper.java new file mode 100644 index 0000000..27bb5a7 --- /dev/null +++ b/swlscx/src/main/java/com/ruoyi/swlscx/year/mapper/HyYrzFMapper.java @@ -0,0 +1,34 @@ +package com.ruoyi.swlscx.year.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.ruoyi.swlscx.year.domain.po.HyYrzF; +import com.ruoyi.swlscx.year.domain.vo.HyYrzFVo; +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; + +import java.util.List; +import java.util.Map; + +/** +* @author 12974 +* @description 针对表【hy_yrz_f(年水位表)】的数据库操作Mapper +* @createDate 2024-09-05 16:53:36 +* @Entity com.ruoyi.swlscx.domain.po.HyYrzF +*/ +@Mapper +public interface HyYrzFMapper extends BaseMapper { + + IPage selectHyYrzFPageByInfo(Page page, @Param("map") Map map); + + void deleteTempData(); + + void insertTempData(@Param("list") List batch); + + void mergeToData(); +} + + + + diff --git a/swlscx/src/main/java/com/ruoyi/swlscx/year/service/HyDmxpFService.java b/swlscx/src/main/java/com/ruoyi/swlscx/year/service/HyDmxpFService.java new file mode 100644 index 0000000..082937d --- /dev/null +++ b/swlscx/src/main/java/com/ruoyi/swlscx/year/service/HyDmxpFService.java @@ -0,0 +1,33 @@ +package com.ruoyi.swlscx.year.service; + +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.ruoyi.common.core.page.R; +import com.ruoyi.swlscx.common.PageParams; +import com.ruoyi.swlscx.year.domain.po.HyDmxpF; +import com.baomidou.mybatisplus.extension.service.IService; +import com.ruoyi.swlscx.year.domain.vo.HyDmxpFVo; +import org.springframework.web.multipart.MultipartFile; + +import javax.servlet.http.HttpServletResponse; + +/** +* @author 12974 +* @description 针对表【hy_dmxp_f(日时段最大降水量)】的数据库操作Service +* @createDate 2024-09-11 10:09:13 +*/ +public interface HyDmxpFService extends IService { + /** 导入日时段最大降水量数据*/ + void importHyDmxpFData(MultipartFile file); + + /** + * 查询小时时段最大降水量表数据 + */ + IPage selectMaxDRainListPageByInfo(PageParams pageParams, String startTime, String endTime, String stcd, String stnm); + + /** + * 导出小时时段最大降水量表数据 + */ + R exportDayDmxpFData(HttpServletResponse response, String startTime, String endTime, String stcd, String stnm); + + R importDateTosoft(String startTime, String endTime); +} diff --git a/swlscx/src/main/java/com/ruoyi/swlscx/year/service/HyHmxpFService.java b/swlscx/src/main/java/com/ruoyi/swlscx/year/service/HyHmxpFService.java new file mode 100644 index 0000000..8f4d0c1 --- /dev/null +++ b/swlscx/src/main/java/com/ruoyi/swlscx/year/service/HyHmxpFService.java @@ -0,0 +1,42 @@ +package com.ruoyi.swlscx.year.service; + + +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.service.IService; +import com.ruoyi.common.core.page.R; +import com.ruoyi.swlscx.common.PageParams; +import com.ruoyi.swlscx.year.domain.po.HyHmxpF; +import com.ruoyi.swlscx.year.domain.vo.HyHmxpFVo; +import org.springframework.web.multipart.MultipartFile; + +import javax.servlet.http.HttpServletResponse; + +/** +* @author 12974 +* @description 针对表【hy_hmxp_f】的数据库操作Service +* @createDate 2024-07-23 14:15:25 +*/ +public interface HyHmxpFService extends IService { + + /** + * 导入时段最大降雨量数据 + */ + void importHourMaxRainData(MultipartFile file); + + + /** + * 查询小时时段最大降水量表数据 + */ + IPage selectMaxHRainListPageByInfo(PageParams pageParams, String startTime, String endTime, String stcd, String stnm); + + + /** + * 导出小时时段最大降水量表数据 + */ + R exportHyHmxpFData(HttpServletResponse response, String startTime, String endTime, String stcd, String stnm); + + /** + * 导入小时时段最大降水量表数据到sqlserver + */ + R importDateTosoft(String startTime, String endTime); +} diff --git a/swlscx/src/main/java/com/ruoyi/swlscx/year/service/HyImxfwFService.java b/swlscx/src/main/java/com/ruoyi/swlscx/year/service/HyImxfwFService.java new file mode 100644 index 0000000..2bee488 --- /dev/null +++ b/swlscx/src/main/java/com/ruoyi/swlscx/year/service/HyImxfwFService.java @@ -0,0 +1,38 @@ +package com.ruoyi.swlscx.year.service; + +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.ruoyi.common.core.page.R; +import com.ruoyi.swlscx.common.PageParams; +import com.ruoyi.swlscx.year.domain.po.HyImxfwF; +import com.baomidou.mybatisplus.extension.service.IService; +import com.ruoyi.swlscx.year.domain.vo.HyImxfwFVo; +import org.springframework.web.multipart.MultipartFile; + +import javax.servlet.http.HttpServletResponse; + +/** +* @author 12974 +* @description 针对表【hy_imxfw_f(时段最大洪量表)】的数据库操作Service +* @createDate 2024-09-09 17:32:19 +*/ +public interface HyImxfwFService extends IService { + + + /** + * 导入时段最大洪量表 + */ + void importHyImxfwFData(MultipartFile file); + + + /** + * 查询时段最大洪量表数据 + */ + IPage selectMaxFloodScaleListPageByInfo(PageParams pageParams, String startTime, String endTime, String stcd, String stnm); + + /** + * 导出时段最大洪量表 + */ + R exportMaxFloodScaleList(HttpServletResponse response, String startTime, String endTime, String stcd, String stnm); + + R importDateTosoft(String startTime, String endTime); +} diff --git a/swlscx/src/main/java/com/ruoyi/swlscx/year/service/HyMmxpFService.java b/swlscx/src/main/java/com/ruoyi/swlscx/year/service/HyMmxpFService.java new file mode 100644 index 0000000..d9d369e --- /dev/null +++ b/swlscx/src/main/java/com/ruoyi/swlscx/year/service/HyMmxpFService.java @@ -0,0 +1,39 @@ +package com.ruoyi.swlscx.year.service; + +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.ruoyi.common.core.page.R; +import com.ruoyi.swlscx.common.PageParams; +import com.ruoyi.swlscx.year.domain.po.HyMmxpF; +import com.baomidou.mybatisplus.extension.service.IService; +import com.ruoyi.swlscx.year.domain.vo.HyMmxpFVo; +import org.springframework.web.multipart.MultipartFile; + +import javax.servlet.http.HttpServletResponse; + +/** +* @author 12974 +* @description 针对表【hy_mmxp_f(分钟时段最大降水量表)】的数据库操作Service +* @createDate 2024-09-11 10:09:13 +*/ +public interface HyMmxpFService extends IService { + + /** + * 导入分钟时段最大降水量表 + */ + void importHyMmxpFData(MultipartFile file); + + /** + * 查询分钟时段最大降水量表数据 + */ + IPage selectMaxMRainListPageByInfo(PageParams pageParams, String startTime, String endTime, String stcd, String stnm); + + /** + * 导出分钟时段最大降水量表 + */ + R exportMinMaxRainList(HttpServletResponse response, String startTime, String endTime, String stcd, String stnm); + + /** + * 导入数据到南方片 + */ + R importDateTosoft(String startTime, String endTime); +} diff --git a/swlscx/src/main/java/com/ruoyi/swlscx/year/service/HyYrcsFService.java b/swlscx/src/main/java/com/ruoyi/swlscx/year/service/HyYrcsFService.java new file mode 100644 index 0000000..52bf5f2 --- /dev/null +++ b/swlscx/src/main/java/com/ruoyi/swlscx/year/service/HyYrcsFService.java @@ -0,0 +1,35 @@ +package com.ruoyi.swlscx.year.service; + +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.service.IService; +import com.ruoyi.common.core.page.R; +import com.ruoyi.swlscx.common.PageParams; +import com.ruoyi.swlscx.year.domain.po.HyYrcsF; +import com.ruoyi.swlscx.year.domain.vo.HyYrcsFVo; +import org.springframework.web.multipart.MultipartFile; + +import javax.servlet.http.HttpServletResponse; + +/** +* @author 12974 +* @description 针对表【hy_yrcs_f(年含沙量表)】的数据库操作Service +* @createDate 2024-09-05 16:53:36 +*/ +public interface HyYrcsFService extends IService { + /** + * 导入年含沙量表 + */ + void importHyYrcsFData(MultipartFile file); + + /** + * 查询年含沙量表数据 + */ + IPage getYearSedimentConcentrationList(PageParams pageParams, String startTime, String endTime, String stcd, String stnm); + + /** + * 导出年含沙量表 + */ + R exportSedimentConcentrationList(HttpServletResponse response, String startTime, String endTime, String stcd, String stnm); + + R importDateTosoft(String startTime, String endTime); +} diff --git a/swlscx/src/main/java/com/ruoyi/swlscx/year/service/HyYrpFService.java b/swlscx/src/main/java/com/ruoyi/swlscx/year/service/HyYrpFService.java new file mode 100644 index 0000000..2ca7eea --- /dev/null +++ b/swlscx/src/main/java/com/ruoyi/swlscx/year/service/HyYrpFService.java @@ -0,0 +1,32 @@ +package com.ruoyi.swlscx.year.service; + +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.service.IService; +import com.ruoyi.common.core.page.R; +import com.ruoyi.swlscx.common.PageParams; +import com.ruoyi.swlscx.year.domain.po.HyYrpF; +import com.ruoyi.swlscx.year.domain.vo.HyYrpFVo; +import org.springframework.web.multipart.MultipartFile; + +import javax.servlet.http.HttpServletResponse; + +/** +* @author 12974 +* @description 针对表【hy_yrp_f(年降水量表)】的数据库操作Service +* @createDate 2024-09-05 16:53:36 +*/ +public interface HyYrpFService extends IService { + /** 导入年降水表数据*/ + void importHyYrpFData(MultipartFile file); + /** + * 查询年降水表数据 + */ + IPage selectHyYrpFDataByPageAndInfo(PageParams pageParams, String startTime, String endTime, String stcd, String stnm); + + /** + * 导出年降水表数据 + */ + R exportHyYrpFData(HttpServletResponse response, String startTime, String endTime, String stcd, String stnm); + + R importDateTosoft(String startTime, String endTime); +} diff --git a/swlscx/src/main/java/com/ruoyi/swlscx/year/service/HyYrqFService.java b/swlscx/src/main/java/com/ruoyi/swlscx/year/service/HyYrqFService.java new file mode 100644 index 0000000..98e12d0 --- /dev/null +++ b/swlscx/src/main/java/com/ruoyi/swlscx/year/service/HyYrqFService.java @@ -0,0 +1,33 @@ +package com.ruoyi.swlscx.year.service; + +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.service.IService; +import com.ruoyi.common.core.page.R; +import com.ruoyi.swlscx.common.PageParams; +import com.ruoyi.swlscx.year.domain.po.HyYrqF; +import com.ruoyi.swlscx.year.domain.vo.HyYrqFVo; +import org.springframework.web.multipart.MultipartFile; + +import javax.servlet.http.HttpServletResponse; + +/** +* @author 12974 +* @description 针对表【hy_yrq_f(年流量表)】的数据库操作Service +* @createDate 2024-09-05 16:53:36 +*/ +public interface HyYrqFService extends IService { + + /** 导入年流量数据*/ + void importHyYrpFData(MultipartFile file); + + /**查询年流量表数据*/ + IPage selecHyYrqFListPageByInfo(PageParams pageParams, String startTime, String endTime, String stcd, String stnm); + + + /** + * 导出年流量表 + */ + R exportYearFlowList(HttpServletResponse response, String startTime, String endTime, String stcd, String stnm); + + R importDateTosoft(String startTime, String endTime); +} diff --git a/swlscx/src/main/java/com/ruoyi/swlscx/year/service/HyYrqsFService.java b/swlscx/src/main/java/com/ruoyi/swlscx/year/service/HyYrqsFService.java new file mode 100644 index 0000000..993ae0c --- /dev/null +++ b/swlscx/src/main/java/com/ruoyi/swlscx/year/service/HyYrqsFService.java @@ -0,0 +1,33 @@ +package com.ruoyi.swlscx.year.service; + +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.service.IService; +import com.ruoyi.common.core.page.R; +import com.ruoyi.swlscx.common.PageParams; +import com.ruoyi.swlscx.year.domain.po.HyYrqsF; +import com.ruoyi.swlscx.year.domain.vo.HyYrqsFVo; +import org.springframework.web.multipart.MultipartFile; + +import javax.servlet.http.HttpServletResponse; + +/** +* @author 12974 +* @description 针对表【hy_yrqs_f(年输沙率表)】的数据库操作Service +* @createDate 2024-09-05 16:53:36 +*/ +public interface HyYrqsFService extends IService { + /** 导入年输沙率表据*/ + void importHyYrqsFData(MultipartFile file); + + /** + * 查询年输沙率表数据 + */ + IPage getYearsedimentTransportRateList(PageParams pageParams, String startTime, String endTime, String stcd, String stnm); + + /** + * 导出年输沙率表 + */ + R exportSedimentTransportRateList(HttpServletResponse response, String startTime, String endTime, String stcd, String stnm); + + R importDateTosoft(String startTime, String endTime); +} diff --git a/swlscx/src/main/java/com/ruoyi/swlscx/year/service/HyYrtdzFService.java b/swlscx/src/main/java/com/ruoyi/swlscx/year/service/HyYrtdzFService.java new file mode 100644 index 0000000..230f4a8 --- /dev/null +++ b/swlscx/src/main/java/com/ruoyi/swlscx/year/service/HyYrtdzFService.java @@ -0,0 +1,33 @@ +package com.ruoyi.swlscx.year.service; + +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.service.IService; +import com.ruoyi.common.core.page.R; +import com.ruoyi.swlscx.common.PageParams; +import com.ruoyi.swlscx.year.domain.po.HyYrtdzF; +import com.ruoyi.swlscx.year.domain.vo.HyYrtdzFVo; +import org.springframework.web.multipart.MultipartFile; + +import javax.servlet.http.HttpServletResponse; + +/** +* @author 12974 +* @description 针对表【hy_yrtdz_f(年潮位表)】的数据库操作Service +* @createDate 2024-09-05 16:53:36 +*/ +public interface HyYrtdzFService extends IService { + /** + * 导入年潮位表表 + */ + void importHyMmxpFData(MultipartFile file); + + /**查询年潮位表数据*/ + IPage selectHyYrtdzFListPageByInfo(PageParams pageParams, String startTime, String endTime, String stcd, String stnm); + + /** + * 导出年潮位表 + */ + R exportYearTideLeverList(HttpServletResponse response, String startTime, String endTime, String stcd, String stnm); + + R importDateTosoft(String startTime, String endTime); +} diff --git a/swlscx/src/main/java/com/ruoyi/swlscx/year/service/HyYrweFService.java b/swlscx/src/main/java/com/ruoyi/swlscx/year/service/HyYrweFService.java new file mode 100644 index 0000000..d22efc9 --- /dev/null +++ b/swlscx/src/main/java/com/ruoyi/swlscx/year/service/HyYrweFService.java @@ -0,0 +1,32 @@ +package com.ruoyi.swlscx.year.service; + +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.service.IService; +import com.ruoyi.common.core.page.R; +import com.ruoyi.swlscx.common.PageParams; +import com.ruoyi.swlscx.year.domain.po.HyYrweF; +import com.ruoyi.swlscx.year.domain.vo.HyYrweFVo; +import org.springframework.web.multipart.MultipartFile; + +import javax.servlet.http.HttpServletResponse; + +/** +* @author 12974 +* @description 针对表【hy_yrwe_f(年水面蒸发量表)】的数据库操作Service +* @createDate 2024-09-05 16:53:36 +*/ +public interface HyYrweFService extends IService { + /** 导入年水面蒸发量表数据*/ + void importHyYrweFData(MultipartFile file); + + + /**查询年水面蒸发量表数据*/ + IPage selectHyYrweFListPageByInfo(PageParams pageParams, String startTime, String endTime, String stcd, String stnm); + + /** + * 导出年水面蒸发量表 + */ + R exportYearEvaporationWaterList(HttpServletResponse response, String startTime, String endTime, String stcd, String stnm); + + R importDateTosoft(String startTime, String endTime); +} diff --git a/swlscx/src/main/java/com/ruoyi/swlscx/year/service/HyYrwtFService.java b/swlscx/src/main/java/com/ruoyi/swlscx/year/service/HyYrwtFService.java new file mode 100644 index 0000000..fafc666 --- /dev/null +++ b/swlscx/src/main/java/com/ruoyi/swlscx/year/service/HyYrwtFService.java @@ -0,0 +1,33 @@ +package com.ruoyi.swlscx.year.service; + +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.service.IService; +import com.ruoyi.common.core.page.R; +import com.ruoyi.swlscx.common.PageParams; +import com.ruoyi.swlscx.year.domain.po.HyYrwtF; +import com.ruoyi.swlscx.year.domain.vo.HyYrwtFVo; +import org.springframework.web.multipart.MultipartFile; + +import javax.servlet.http.HttpServletResponse; + +/** +* @author 12974 +* @description 针对表【hy_yrwt_f(年水温表)】的数据库操作Service +* @createDate 2024-09-05 16:53:36 +*/ +public interface HyYrwtFService extends IService { + /** 导入年水温表数据*/ + void importHyYrpFData(MultipartFile file); + + /** + * 查询年水温表数据 + */ + IPage getYearWaterTemperatureList(PageParams pageParams, String startTime, String endTime, String stcd, String stnm); + + /** + * 导出年水温表 + */ + R exportYearWaterTemperatureList(HttpServletResponse response, String startTime, String endTime, String stcd, String stnm); + + R importDateTosoft(String startTime, String endTime); +} diff --git a/swlscx/src/main/java/com/ruoyi/swlscx/year/service/HyYrzFService.java b/swlscx/src/main/java/com/ruoyi/swlscx/year/service/HyYrzFService.java new file mode 100644 index 0000000..691d72f --- /dev/null +++ b/swlscx/src/main/java/com/ruoyi/swlscx/year/service/HyYrzFService.java @@ -0,0 +1,35 @@ +package com.ruoyi.swlscx.year.service; + +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.service.IService; +import com.ruoyi.common.core.page.R; +import com.ruoyi.swlscx.common.PageParams; +import com.ruoyi.swlscx.year.domain.po.HyYrzF; +import com.ruoyi.swlscx.year.domain.vo.HyYrzFVo; +import org.springframework.web.multipart.MultipartFile; + +import javax.servlet.http.HttpServletResponse; + +/** + * @author 12974 + * @description 针对表【hy_yrz_f(年水位表)】的数据库操作Service + * @createDate 2024-09-05 16:53:36 + */ +public interface HyYrzFService extends IService { + /** + * 导入年水位表数据 + */ + void importHyYrpFData(MultipartFile file); + + /** + * 查询年水位表 + **/ + IPage selectHyYrzFPageByInfo(PageParams pageParams, String startTime, String endTime, String stnm, String stcd); + + /** + * 导出年水位表数据 + **/ + R exportYearWaterLeverList(HttpServletResponse response, String startTime, String endTime, String stcd, String stnm); + + R importDateTosoft(String startTime, String endTime); +} diff --git a/swlscx/src/main/java/com/ruoyi/swlscx/year/service/impl/HyDmxpFServiceImpl.java b/swlscx/src/main/java/com/ruoyi/swlscx/year/service/impl/HyDmxpFServiceImpl.java new file mode 100644 index 0000000..8337267 --- /dev/null +++ b/swlscx/src/main/java/com/ruoyi/swlscx/year/service/impl/HyDmxpFServiceImpl.java @@ -0,0 +1,344 @@ +package com.ruoyi.swlscx.year.service.impl; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.ruoyi.common.annotation.DataSource; +import com.ruoyi.common.config.RuoYiConfig; +import com.ruoyi.common.core.page.R; +import com.ruoyi.common.core.text.Convert; +import com.ruoyi.common.enums.DataSourceType; +import com.ruoyi.common.utils.DateUtils; +import com.ruoyi.common.utils.SecurityUtils; +import com.ruoyi.swlscx.basic.domain.po.YcExportTask; +import com.ruoyi.swlscx.basic.service.YcExportTaskService; +import com.ruoyi.swlscx.common.PageParams; +import com.ruoyi.swlscx.year.domain.bo.HyDmxpFBo; +import com.ruoyi.swlscx.year.domain.po.HyDmxpF; +import com.ruoyi.swlscx.year.domain.vo.HyDmxpFVo; +import com.ruoyi.swlscx.year.domain.vo.HyHmxpFVo; +import com.ruoyi.swlscx.year.mapper.HyDmxpFMapper; +import com.ruoyi.swlscx.year.service.HyDmxpFService; +import com.ruoyi.swlscx.common.utils.CommonUtils; +import com.ruoyi.swlscx.common.utils.ExcelUtils; +import com.ruoyi.swlscx.common.utils.Query; +import org.apache.commons.lang3.ObjectUtils; +import org.apache.poi.ss.usermodel.CellStyle; +import org.apache.poi.ss.usermodel.Row; +import org.apache.poi.ss.usermodel.Sheet; +import org.springframework.beans.BeanUtils; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.context.ApplicationContext; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; +import org.springframework.web.multipart.MultipartFile; + +import javax.annotation.Resource; +import javax.servlet.http.HttpServletResponse; +import java.io.File; +import java.util.Date; +import java.util.List; +import java.util.Map; +import java.util.concurrent.CompletableFuture; +import java.util.concurrent.ThreadPoolExecutor; +import java.util.stream.Collectors; + +/** + * @author 12974 + * @description 针对表【hy_dmxp_f(日时段最大降水量)】的数据库操作Service实现 + * @createDate 2024-09-11 10:09:13 + */ +@Service +public class HyDmxpFServiceImpl extends ServiceImpl + implements HyDmxpFService { + + + @Resource + private ThreadPoolExecutor labelThreadPool; + + @Resource + private YcExportTaskService ycExportTaskService; + + /** + * 导入日时段最大降水量数据 + */ + @Override + @Transactional(rollbackFor = Exception.class) + public void importHyDmxpFData(MultipartFile file) { + try { + List hyDmxpFBos = ExcelUtils.readExcel(file.getInputStream(), HyDmxpFBo.class, 2); + List hyDmxpFList = hyDmxpFBos.stream().map(i -> { + HyDmxpF hyDmxpF = new HyDmxpF(); + BeanUtils.copyProperties(i, hyDmxpF); + hyDmxpF.setYr(Convert.toInt(i.getYr())); + hyDmxpF.setMxpdr(Convert.toInt(i.getMxpdr())); + hyDmxpF.setBgdt(DateUtils.parseDate(i.getBgdt())); + hyDmxpF.setMxp(Convert.toBigDecimal(i.getMxp())); + return hyDmxpF; + }).collect(Collectors.toList()); + + this.saveBatch(hyDmxpFList, 5000); + } catch (Exception e) { + e.printStackTrace(); + } + } + + @Override + public IPage selectMaxDRainListPageByInfo(PageParams pageParams, String startTime, String endTime, String stcd, String stnm) { + Map map = CommonUtils.getYearAndDayDataMap(pageParams, startTime, endTime, stcd, stnm); + return this.baseMapper.selecthyDmxpFPageByInfo(new Query().getPage(map), map); + } + + @Override + public R exportDayDmxpFData(HttpServletResponse response, String startTime, String endTime, String stcd, String stnm) { + Long userId = SecurityUtils.getUserId(); + String tableName = "日时时段最大降水量表"; + return taskAndExport(tableName,startTime, endTime, stcd, stnm, userId); + } + + + /** + * 从mysql导入到sqlserver中 + */ + @Transactional(rollbackFor = Exception.class) + @DataSource(DataSourceType.SHARDING) + public void importMysqlToSqlserver(List hyDmxpFVoList) { + List records = hyDmxpFVoList.stream().map(i->{ + HyDmxpF hyDmxpF = new HyDmxpF(); + BeanUtils.copyProperties(i, hyDmxpF); + hyDmxpF.setYr(Convert.toInt(i.getYr())); + hyDmxpF.setMxpdr(Convert.toInt(i.getMxpdr())); + hyDmxpF.setBgdt(DateUtils.parseDate(i.getBgdt())); + hyDmxpF.setMxp(Convert.toBigDecimal(i.getMxp())); + return hyDmxpF; + }).collect(Collectors.toList()); + //先清空临时表的数据 + this.baseMapper.deleteTempData(); + //插入临时表数据 + int batchSize = 50; + for (int i = 0; i < records.size(); i += batchSize) { + int end = Math.min(i + batchSize, records.size()); + List batch = records.subList(i, end); + // 执行批量插入 + this.baseMapper.insertTempData(batch); + } + //从临时表增或修改主表 + this.baseMapper.mergeToData(); + } + + @Resource + private ThreadPoolExecutor importThreadPool; + + @Autowired + private ApplicationContext context; + + @Override + public R importDateTosoft(String startTime, String endTime) { + Long userId = SecurityUtils.getUserId(); + String filename = "日时时段最大降水量表" + startTime + "-" + endTime+"导入到南方片"; + // 查询是否已存在相同条件且未完成的任务 + List ongoingTasks = ycExportTaskService.list( + new QueryWrapper() + .eq("user_id", userId) + .eq("status", 0) // 状态为0表示任务未完成 + .like("filename", "日时时段最大降水量表")); + if (!ongoingTasks.isEmpty()) { + return R.error("当前任务正在下载中，请稍后重试"); + } + YcExportTask ycExportTask = new YcExportTask(); + ycExportTask.setFilename(filename); + ycExportTask.setUserId(userId); + ycExportTask.setStartTime(new Date()); + ycExportTask.setStatus(0); + ycExportTaskService.save(ycExportTask); + CompletableFuture.runAsync(() -> { + try { + IPage pageByInfo = this.selectMaxDRainListPageByInfo(new PageParams(0L, 1000000000L), startTime, endTime, null, null); + + HyDmxpFServiceImpl hyDmxpFService = context.getBean(HyDmxpFServiceImpl.class); + hyDmxpFService.importMysqlToSqlserver(pageByInfo.getRecords()); + ycExportTask.setStatus(2); + } catch (Exception e) { + ycExportTask.setStatus(4); + log.error(e.getMessage()); + R.error("任务下载失败"); + }finally { + ycExportTask.setEndTime(new Date()); + ycExportTaskService.updateById(ycExportTask); + } + }, importThreadPool); + return R.ok("任务已提交"); + } + + private R taskAndExport(String tableName,String startTime, String endTime, String stcd, String stnm, Long userId) { + String startNewTime=""; + String endNewTime=""; + if (ObjectUtils.isNotEmpty(startTime) ){ + startNewTime=startTime.substring(0,4); + } + if (ObjectUtils.isNotEmpty(endTime)){ + endNewTime=endTime.substring(0,4); + } + String filename = tableName + startNewTime + "-" + endNewTime; + // 查询是否已存在相同条件且未完成的任务 + List ongoingTasks = ycExportTaskService.list( + new QueryWrapper() + .eq("user_id", userId) + .eq("filename", filename) + .eq("status", 0) // 状态为0表示任务未完成 + ); + + if (!ongoingTasks.isEmpty()) { + return R.error("当前任务正在下载中，请稍后重试"); + } + + YcExportTask ycExportTask = new YcExportTask(); + String pathPeffix = RuoYiConfig.getExportPath() + + File.separator + userId + File.separator+ + DateUtils.parseDateToStr("yyyy-MM-dd",DateUtils.getNowDate()) + File.separator + + DateUtils.parseDateToStr("HH_mm",DateUtils.getNowDate())+File.separator; + ycExportTask.setFilename(filename); + ycExportTask.setUserId(userId); + ycExportTask.setStartTime(new Date()); + ycExportTask.setStatus(0); + ycExportTask.setFilepath(pathPeffix); + ycExportTaskService.save(ycExportTask); + CompletableFuture.runAsync(() -> { + try { + File dest = new File(pathPeffix); + if (!dest.exists()) { + dest.mkdirs(); + } + String fullPath = pathPeffix + filename; + exportBlackData(fullPath, startTime, endTime, stcd, stnm); + + ycExportTask.setStatus(1); + ycExportTask.setEndTime(new Date()); + ycExportTaskService.updateById(ycExportTask); + } catch (Exception e) { + log.error(e.getMessage(), e); + R.error("任务下载失败"); + } + }, labelThreadPool); + return R.ok("任务已提交，请稍后下载"); + } + + + private void exportBlackData(String tableName, String startTime, String endTime, String stcd, String stnm) { + Map rainMap = CommonUtils.getYearAndDayDataMap(new PageParams(0L, 1000000000L), startTime, endTime, stcd, stnm); + ExcelUtils.excelBackExport2("dayMaxRain.xls", tableName, (Sheet sheet, CellStyle style) -> + dataModel1(rainMap, sheet, style)); + } + + + public int dataModel1(Map map, Sheet sheet, CellStyle style) { + // 批量查询数据 + IPage hyDmxpFVoIPage = this.baseMapper.selecthyDmxpFPageByInfo(new Query().getPage(map), map); + List records = hyDmxpFVoIPage.getRecords(); + + // 定义当前sheet的行号 + int rowIndex = 2; // 从第二行开始写入数据 + // 定义全局序号 + int globalIndex = 1; // 从1开始 + + // 定义当前sheet的编号 + int sheetIndex = 1; + + // 最大行数限制 + int maxRowsPerSheet = 65536; // 对于 .xls 文件，最大行数为 65536 + int batchSize = 1000; // 每次批量处理1000行，减少逐行写入的开销 + + // 复制表头到新sheet的逻辑 + ExcelUtils.copyHeader(sheet, style); + + // 批量处理数据 + for (int i = 0; i < records.size(); i += batchSize) { + // 处理一批数据 + int toIndex = Math.min(i + batchSize, records.size()); + List batchList = records.subList(i, toIndex); + + // 批量写入数据 + for (HyDmxpFVo vo : batchList) { + // 如果当前行数达到最大行数，创建新sheet + if (rowIndex >= maxRowsPerSheet) { + sheetIndex++; + sheet = sheet.getWorkbook().createSheet("日时时段最大降水量表" + sheetIndex); + rowIndex = 2; // 重置行号 + // 复制表头到新sheet + ExcelUtils.copyHeader(sheet, style); + } + + // 创建新行并写入数据 + Row row = ExcelUtils.createRow(sheet, rowIndex); + + // 使用 globalIndex 作为序号 + ExcelUtils.formatCell(row, 0, String.valueOf(globalIndex), style); + ExcelUtils.formatCell(row, 1, vo.getStcd() != null ? vo.getStcd() : "", style); + ExcelUtils.formatCell(row, 2, vo.getStnm() != null ? vo.getStnm() : "", style); + ExcelUtils.formatCell(row, 3, vo.getAddvcd() != null ? vo.getAddvcd() : "", style); + ExcelUtils.formatCell(row, 4, "",style); + ExcelUtils.formatCell(row, 5, vo.getYr() != null ? vo.getYr().toString() : "", style); + ExcelUtils.formatCell(row, 6, vo.getBgdt() != null ? vo.getBgdt() : "", style); + ExcelUtils.formatCell(row, 7, vo.getMxpdr() != null ? vo.getMxpdr().toString() : "", style); + ExcelUtils.formatCell(row, 8, vo.getMxp() != null ? CommonUtils.formatNum(vo.getMxp()) : "", style); + ExcelUtils.formatCell(row, 9, vo.getMxprc() != null ? vo.getMxprc() : "", style); + ExcelUtils.formatCell(row, 10, "", style); + + // 增加行号和全局序号 + rowIndex++; + globalIndex++; + } + } + return 0; + } + + + public void dataModel(Map map, Sheet sheet, CellStyle style) { + // 批量查询数据 + IPage hyDmxpFVoIPage = this.baseMapper.selecthyDmxpFPageByInfo(new Query().getPage(map), map); + List records = hyDmxpFVoIPage.getRecords(); + // 定义当前sheet的行号 + int rowIndex = 2; + // 定义当前sheet的编号 + int sheetIndex = 1; + Row row; + // 最大行数限制 + int maxRowsPerSheet = 65536; // 对于 .xls 文件，最大行数为 65536 + int batchSize = 1000; // 每次批量处理1000行，减少逐行写入的开销 + // 批量处理数据 + for (int i = 0; i < records.size(); i += batchSize) { + // 处理一批数据 + int toIndex = Math.min(i + batchSize, records.size()); + List batchList = records.subList(i, toIndex); + // 批量写入数据 + for (HyDmxpFVo vo : batchList) { + // 如果当前行数达到最大行数，创建新sheet + if (rowIndex >= maxRowsPerSheet) { + sheetIndex++; + sheet = sheet.getWorkbook().createSheet("日时段最大降水量表" + sheetIndex); + rowIndex = 2; // 重置行号 + } + // 创建新行并写入数据 + row = ExcelUtils.createRow(sheet, rowIndex); + //序号 + ExcelUtils.formatCell(row, 0, String.valueOf(rowIndex - 1), style); + ExcelUtils.formatCell(row, 1, vo.getStcd() != null ? vo.getStcd() : "", style); + ExcelUtils.formatCell(row, 2, vo.getStnm() != null ? vo.getStnm() : "", style); + ExcelUtils.formatCell(row, 3, vo.getAddvcd() != null ? vo.getAddvcd() : "", style); + ExcelUtils.formatCell(row, 4, "",style); + ExcelUtils.formatCell(row, 5, vo.getYr() != null ? vo.getYr().toString() : "", style); + ExcelUtils.formatCell(row, 6, vo.getBgdt() != null ? vo.getBgdt() : "", style); + ExcelUtils.formatCell(row, 7, vo.getMxpdr() != null ? vo.getMxpdr().toString() : "", style); + ExcelUtils.formatCell(row, 8, vo.getMxp() != null ? CommonUtils.formatNum(vo.getMxp()) : "", style); + ExcelUtils.formatCell(row, 9, vo.getMxprc() != null ? vo.getMxprc() : "", style); + ExcelUtils.formatCell(row, 10, "", style); + rowIndex++; + } + } + } + +} + + + + diff --git a/swlscx/src/main/java/com/ruoyi/swlscx/year/service/impl/HyHmxpFServiceImpl.java b/swlscx/src/main/java/com/ruoyi/swlscx/year/service/impl/HyHmxpFServiceImpl.java new file mode 100644 index 0000000..7b5e4a1 --- /dev/null +++ b/swlscx/src/main/java/com/ruoyi/swlscx/year/service/impl/HyHmxpFServiceImpl.java @@ -0,0 +1,356 @@ +package com.ruoyi.swlscx.year.service.impl; + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.ruoyi.common.annotation.DataSource; +import com.ruoyi.common.config.RuoYiConfig; +import com.ruoyi.common.core.page.R; +import com.ruoyi.common.core.text.Convert; +import com.ruoyi.common.enums.DataSourceType; +import com.ruoyi.common.utils.DateUtils; +import com.ruoyi.common.utils.SecurityUtils; +import com.ruoyi.common.utils.bean.BeanUtils; +import com.ruoyi.swlscx.basic.domain.po.YcExportTask; +import com.ruoyi.swlscx.basic.service.YcExportTaskService; +import com.ruoyi.swlscx.basic.service.impl.HyStscAServiceImpl; +import com.ruoyi.swlscx.common.PageParams; +import com.ruoyi.swlscx.common.utils.CommonUtils; +import com.ruoyi.swlscx.common.utils.ExcelUtils; +import com.ruoyi.swlscx.common.utils.Query; +import com.ruoyi.swlscx.year.domain.bo.HyHmxpFBo; +import com.ruoyi.swlscx.year.domain.po.HyHmxpF; +import com.ruoyi.swlscx.year.domain.vo.HyHmxpFVo; +import com.ruoyi.swlscx.year.mapper.HyHmxpFMapper; +import com.ruoyi.swlscx.year.service.HyHmxpFService; +import lombok.RequiredArgsConstructor; +import lombok.extern.slf4j.Slf4j; +import org.apache.commons.lang3.ObjectUtils; +import org.apache.poi.ss.usermodel.CellStyle; +import org.apache.poi.ss.usermodel.Row; +import org.apache.poi.ss.usermodel.Sheet; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.context.ApplicationContext; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; +import org.springframework.web.multipart.MultipartFile; + +import javax.annotation.Resource; +import javax.servlet.http.HttpServletResponse; +import java.io.File; +import java.util.Date; +import java.util.List; +import java.util.Map; +import java.util.concurrent.CompletableFuture; +import java.util.concurrent.ThreadPoolExecutor; +import java.util.stream.Collectors; + +/** + * @author 12974 + * @description 针对表【hy_hmxp_f】的数据库操作Service实现 + * @createDate 2024-07-23 14:15:25 + */ +@Service +@Slf4j +@RequiredArgsConstructor +public class HyHmxpFServiceImpl extends ServiceImpl + implements HyHmxpFService { + + @Resource + private ThreadPoolExecutor labelThreadPool; + + @Resource + private YcExportTaskService ycExportTaskService; + + + @Override + @Transactional(rollbackFor = Exception.class) + public void importHourMaxRainData(MultipartFile file) { + try { + List hyHmxpFExcelBos = ExcelUtils.readExcel(file.getInputStream(), HyHmxpFBo.class, 2); + // 获取数据 + List dataList = hyHmxpFExcelBos.parallelStream().map(i -> { + HyHmxpF hyHmxpF = new HyHmxpF(); + BeanUtils.copyProperties(i, hyHmxpF); + hyHmxpF.setMxpdr(Convert.toInt(i.getMxpdr())); + hyHmxpF.setYr(Convert.toInt(i.getYr())); + hyHmxpF.setBgtm(DateUtils.parseDate(i.getBgtm())); + hyHmxpF.setMxp(Convert.toBigDecimal(i.getMxp())); + return hyHmxpF; + }).collect(Collectors.toList()); + for (int i = 0; i < dataList.size(); i += 1000) { + int end = Math.min(i + 1000, dataList.size()); + List batchList = dataList.subList(i, end); + baseMapper.batchInsert(batchList); + } + } catch (Exception e) { + throw new RuntimeException(e); + } + } + + @Override + public IPage selectMaxHRainListPageByInfo(PageParams pageParams, String startTime, String endTime, String stcd, String stnm) { + Map map = CommonUtils.getYearAndDayDataMap(pageParams, startTime, endTime, stcd, stnm); + return this.baseMapper.selecthyMmxpFPageByInfo(new Query().getPage(map), map); + } + + @Override + public R exportHyHmxpFData(HttpServletResponse response, String startTime, String endTime, String stcd, String stnm) { + Long userId = SecurityUtils.getUserId(); + String tableName = "小时时段最大降水量表"; + return taskAndExport(tableName,startTime, endTime, stcd, stnm, userId); + } + + @Resource + private ThreadPoolExecutor importThreadPool; + + @Autowired + private ApplicationContext context; + + /** + * 从mysql导入到sqlserver中 + */ + @Transactional(rollbackFor = Exception.class) + @DataSource(DataSourceType.SHARDING) + public void importMysqlToSqlserver(List hyHmxpFVoList) { + List records = hyHmxpFVoList.stream().map(i->{ + HyHmxpF hyHmxpF = new HyHmxpF(); + BeanUtils.copyProperties(i, hyHmxpF); + hyHmxpF.setMxpdr(Convert.toInt(i.getMxpdr())); + hyHmxpF.setYr(Convert.toInt(i.getYr())); + hyHmxpF.setBgtm(DateUtils.parseDate(i.getBgtm())); + hyHmxpF.setMxp(Convert.toBigDecimal(i.getMxp())); + return hyHmxpF; + }).collect(Collectors.toList()); + //先清空临时表的数据 + this.baseMapper.deleteTempData(); + //插入临时表数据 + int batchSize = 50; + for (int i = 0; i < records.size(); i += batchSize) { + int end = Math.min(i + batchSize, records.size()); + List batch = records.subList(i, end); + // 执行批量插入 + this.baseMapper.insertTempData(batch); + } + //从临时表增或修改主表 + this.baseMapper.mergeToData(); + } + + @Override + public R importDateTosoft(String startTime, String endTime) { + Long userId = SecurityUtils.getUserId(); + String filename = "小时时段最大降水量表" + startTime + "-" + endTime+"导入到南方片"; + // 查询是否已存在相同条件且未完成的任务 + List ongoingTasks = ycExportTaskService.list( + new QueryWrapper() + .eq("user_id", userId) + .eq("status", 0) // 状态为0表示任务未完成 + .like("filename", "小时时段最大降水量表")); + if (!ongoingTasks.isEmpty()) { + return R.error("当前任务正在下载中，请稍后重试"); + } + YcExportTask ycExportTask = new YcExportTask(); + ycExportTask.setFilename(filename); + ycExportTask.setUserId(userId); + ycExportTask.setStartTime(new Date()); + ycExportTask.setStatus(0); + ycExportTaskService.save(ycExportTask); + CompletableFuture.runAsync(() -> { + try { + IPage pageByInfo = this.selectMaxHRainListPageByInfo(new PageParams(0L, 1000000000L), startTime, endTime, null, null); +// IPage pageByInfo = this.selectMaxHRainListPageByInfo(new PageParams(0L, 1000L), null, null, startTime, endTime); + HyHmxpFServiceImpl hyHmxpFService = context.getBean(HyHmxpFServiceImpl.class); + hyHmxpFService.importMysqlToSqlserver(pageByInfo.getRecords()); + ycExportTask.setStatus(2); + } catch (Exception e) { + ycExportTask.setStatus(4); + log.error(e.getMessage()); + R.error("任务下载失败"); + }finally { + ycExportTask.setEndTime(new Date()); + ycExportTaskService.updateById(ycExportTask); + } + }, importThreadPool); + return R.ok("任务已提交"); + } + + private R taskAndExport(String tableName,String startTime, String endTime, String stcd, String stnm, Long userId) { + String startNewTime=""; + String endNewTime=""; + if (ObjectUtils.isNotEmpty(startTime) ){ + startNewTime=startTime.substring(0,4); + } + if (ObjectUtils.isNotEmpty(endTime)){ + endNewTime=endTime.substring(0,4); + } + String filename = tableName + startNewTime + "-" + endNewTime; + // 查询是否已存在相同条件且未完成的任务 + List ongoingTasks = ycExportTaskService.list( + new QueryWrapper() + .eq("user_id", userId) + .eq("filename", filename) + .eq("status", 0) // 状态为0表示任务未完成 + ); + if (!ongoingTasks.isEmpty()) { + return R.error("当前任务正在下载中，请稍后重试"); + } + YcExportTask ycExportTask = new YcExportTask(); + String pathPeffix = RuoYiConfig.getExportPath() + + File.separator + userId + File.separator+ + DateUtils.parseDateToStr("yyyy-MM-dd",DateUtils.getNowDate()) + File.separator + + DateUtils.parseDateToStr("HH_mm",DateUtils.getNowDate())+File.separator; + ycExportTask.setFilename(filename); + ycExportTask.setUserId(userId); + ycExportTask.setStartTime(new Date()); + ycExportTask.setStatus(0); + ycExportTask.setFilepath(pathPeffix); + ycExportTaskService.save(ycExportTask); + CompletableFuture.runAsync(() -> { + try { + File dest = new File(pathPeffix); + if (!dest.exists()) { + dest.mkdirs(); + } + String fullPath = pathPeffix + filename; + exportBlackData(fullPath, startTime, endTime, stcd, stnm); + + ycExportTask.setStatus(1); + ycExportTask.setEndTime(new Date()); + ycExportTaskService.updateById(ycExportTask); + } catch (Exception e) { + log.error(e.getMessage(), e); + R.error("任务下载失败"); + } + }, labelThreadPool); + return R.ok("任务已提交，请稍后下载"); + } + + private void exportBlackData(String tableName, String startTime, String endTime, String stcd, String stnm) { + Map rainMap = CommonUtils.getYearAndDayDataMap(new PageParams(0L, 1000000000L), startTime, endTime, stcd, stnm); + ExcelUtils.excelBackExport2("hourMaxRain.xls", tableName, (Sheet sheet, CellStyle style) -> + dataModel1(rainMap, sheet, style)); + } + + private void exportData(HttpServletResponse response, String startTime, String endTime, String stcd, String stnm) { + Map rainMap = CommonUtils.getYearAndDayDataMap(new PageParams(0L, 100000L), startTime, endTime, stcd, stnm); + ExcelUtils.excelExport(response, "hourMaxRain.xls", "小时时段最大降水量表", (Sheet sheet, CellStyle style) -> { + dataModel(rainMap, sheet, style); + }); + } + + public void dataModel(Map map, Sheet sheet, CellStyle style) { + // 批量查询数据 + IPage hyHmxpFVoIPage = this.baseMapper.selecthyMmxpFPageByInfo(new Query().getPage(map), map); + List records = hyHmxpFVoIPage.getRecords(); + // 定义当前sheet的行号 + int rowIndex = 2; + // 定义当前sheet的编号 + int sheetIndex = 1; + Row row; + // 最大行数限制 + int maxRowsPerSheet = 65536; // 对于 .xls 文件，最大行数为 65536 + int batchSize = 1000; // 每次批量处理1000行，减少逐行写入的开销 + // 批量处理数据 + for (int i = 0; i < records.size(); i += batchSize) { + // 处理一批数据 + int toIndex = Math.min(i + batchSize, records.size()); + List batchList = records.subList(i, toIndex); + // 批量写入数据 + for (HyHmxpFVo vo : batchList) { + // 如果当前行数达到最大行数，创建新sheet + if (rowIndex >= maxRowsPerSheet) { + sheetIndex++; + sheet = sheet.getWorkbook().createSheet("小时时段最大降水量表" + sheetIndex); + rowIndex = 2; // 重置行号 + } + // 创建新行并写入数据 + row = ExcelUtils.createRow(sheet, rowIndex); + //序号 + ExcelUtils.formatCell(row, 0, String.valueOf(rowIndex - 1), style); + ExcelUtils.formatCell(row, 1, vo.getStcd() != null ? vo.getStcd() : "", style); + ExcelUtils.formatCell(row, 2, vo.getStnm() != null ? vo.getStnm() : "", style); + ExcelUtils.formatCell(row, 3, vo.getAddvcd() != null ? vo.getAddvcd() : "", style); + ExcelUtils.formatCell(row, 4, "", style); + ExcelUtils.formatCell(row, 5, vo.getYr() != null ? vo.getYr().toString() : "", style); + ExcelUtils.formatCell(row, 6, vo.getBgtm() != null ? vo.getBgtm() : "", style); + ExcelUtils.formatCell(row, 7, vo.getMxpdr() != null ? vo.getMxpdr().toString() : "", style); + ExcelUtils.formatCell(row, 8, vo.getMxp() != null ? vo.getMxp().toString() : "", style); + ExcelUtils.formatCell(row, 9, vo.getMxprc() != null ? vo.getMxprc() : "", style); + ExcelUtils.formatCell(row, 10, "", style); + rowIndex++; + } + } + } + + + public int dataModel1(Map map, Sheet sheet, CellStyle style) { + // 批量查询数据 + IPage hyHmxpFVoIPage = this.baseMapper.selecthyMmxpFPageByInfo( + new Query().getPage(map), map); + List records = hyHmxpFVoIPage.getRecords(); + + // 定义当前sheet的行号 + int rowIndex = 2; // 从第二行开始写入数据 + // 定义全局序号 + int globalIndex = 1; // 从1开始 + + // 定义当前sheet的编号 + int sheetIndex = 1; + + // 最大行数限制 + int maxRowsPerSheet = 65536; // 对于 .xls 文件，最大行数为 65536 + int batchSize = 1000; // 每次批量处理1000行，减少逐行写入的开销 + + // 复制表头到新sheet的逻辑 + ExcelUtils.copyHeader(sheet, style); + + // 批量处理数据 + for (int i = 0; i < records.size(); i += batchSize) { + // 处理一批数据 + int toIndex = Math.min(i + batchSize, records.size()); + List batchList = records.subList(i, toIndex); + + // 批量写入数据 + for (HyHmxpFVo vo : batchList) { + // 如果当前行数达到最大行数，创建新sheet + if (rowIndex >= maxRowsPerSheet) { + sheetIndex++; + sheet = sheet.getWorkbook().createSheet("小时时段最大降水量表" + sheetIndex); + rowIndex = 2; // 重置行号 + // 复制表头到新sheet + ExcelUtils.copyHeader(sheet, style); + } + + // 创建新行并写入数据 + Row row = ExcelUtils.createRow(sheet, rowIndex); + + // 使用 globalIndex 作为序号 + ExcelUtils.formatCell(row, 0, String.valueOf(globalIndex), style); + ExcelUtils.formatCell(row, 1, vo.getStcd() != null ? vo.getStcd() : "", style); + ExcelUtils.formatCell(row, 2, vo.getStnm() != null ? vo.getStnm() : "", style); + ExcelUtils.formatCell(row, 3, vo.getAddvcd() != null ? vo.getAddvcd() : "", style); + ExcelUtils.formatCell(row, 4, "", style); + ExcelUtils.formatCell(row, 5, vo.getYr() != null ? vo.getYr().toString() : "", style); + ExcelUtils.formatCell(row, 6, vo.getBgtm() != null ? vo.getBgtm() : "", style); + ExcelUtils.formatCell(row, 7, vo.getMxpdr() != null ? vo.getMxpdr().toString() : "", style); + ExcelUtils.formatCell(row, 8, vo.getMxp() != null ? vo.getMxp().toString() : "", style); + ExcelUtils.formatCell(row, 9, vo.getMxprc() != null ? vo.getMxprc() : "", style); + ExcelUtils.formatCell(row, 10, "", style); + + // 增加行号和全局序号 + rowIndex++; + globalIndex++; + } + } + return 0; + } + + + +} + + + + + diff --git a/swlscx/src/main/java/com/ruoyi/swlscx/year/service/impl/HyImxfwFServiceImpl.java b/swlscx/src/main/java/com/ruoyi/swlscx/year/service/impl/HyImxfwFServiceImpl.java new file mode 100644 index 0000000..b8a4580 --- /dev/null +++ b/swlscx/src/main/java/com/ruoyi/swlscx/year/service/impl/HyImxfwFServiceImpl.java @@ -0,0 +1,348 @@ +package com.ruoyi.swlscx.year.service.impl; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.ruoyi.common.annotation.DataSource; +import com.ruoyi.common.config.RuoYiConfig; +import com.ruoyi.common.core.page.R; +import com.ruoyi.common.core.text.Convert; +import com.ruoyi.common.enums.DataSourceType; +import com.ruoyi.common.utils.DateUtils; +import com.ruoyi.common.utils.SecurityUtils; +import com.ruoyi.common.utils.bean.BeanUtils; +import com.ruoyi.swlscx.basic.domain.po.YcExportTask; +import com.ruoyi.swlscx.basic.service.YcExportTaskService; +import com.ruoyi.swlscx.common.PageParams; +import com.ruoyi.swlscx.year.domain.bo.HyImxfwFBo; +import com.ruoyi.swlscx.year.domain.po.HyHmxpF; +import com.ruoyi.swlscx.year.domain.po.HyImxfwF; +import com.ruoyi.swlscx.year.domain.vo.HyHmxpFVo; +import com.ruoyi.swlscx.year.domain.vo.HyImxfwFVo; +import com.ruoyi.swlscx.year.service.HyImxfwFService; +import com.ruoyi.swlscx.year.mapper.HyImxfwFMapper; +import com.ruoyi.swlscx.common.utils.CommonUtils; +import com.ruoyi.swlscx.common.utils.ExcelUtils; +import com.ruoyi.swlscx.common.utils.Query; +import org.apache.commons.lang3.ObjectUtils; +import org.apache.poi.ss.usermodel.CellStyle; +import org.apache.poi.ss.usermodel.Row; +import org.apache.poi.ss.usermodel.Sheet; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.context.ApplicationContext; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; +import org.springframework.web.multipart.MultipartFile; + +import javax.annotation.Resource; +import javax.servlet.http.HttpServletResponse; +import java.io.File; +import java.util.Date; +import java.util.List; +import java.util.Map; +import java.util.concurrent.CompletableFuture; +import java.util.concurrent.ThreadPoolExecutor; +import java.util.stream.Collectors; + +/** +* @author 12974 +* @description 针对表【hy_imxfw_f(时段最大洪量表)】的数据库操作Service实现 +* @createDate 2024-09-09 17:32:19 +*/ +@Service +public class HyImxfwFServiceImpl extends ServiceImpl + implements HyImxfwFService{ + + @Resource + private ThreadPoolExecutor labelThreadPool; + + @Resource + private YcExportTaskService ycExportTaskService; + + /** + * 导入月平均泥沙颗粒级配表数据 + */ + @Override + @Transactional(rollbackFor = Exception.class) + public void importHyImxfwFData(MultipartFile file) { + try { + List hyImxfwFBos = ExcelUtils.readExcel(file.getInputStream(), HyImxfwFBo.class, 2); + // 获取数据 + List dataList = hyImxfwFBos.parallelStream().map(i -> { + HyImxfwF hyImxfwF = new HyImxfwF(); + BeanUtils.copyProperties(i, hyImxfwF); + hyImxfwF.setYr(Convert.toInt(i.getYr())); + hyImxfwF.setBgdt(DateUtils.parseDate(i.getBgdt().split("\\.")[0])); + hyImxfwF.setMxw(Convert.toBigDecimal(i.getMxw())); + return hyImxfwF; + }).collect(Collectors.toList()); + this.saveBatch(dataList,10000); + } catch (Exception e) { + throw new RuntimeException(e); + } + } + + /** + * 查询时段最大洪量表数据 + */ + @Override + public IPage selectMaxFloodScaleListPageByInfo(PageParams pageParams, String startTime, String endTime, String stcd, String stnm) { + Map map = CommonUtils.getYearAndDayDataMap(pageParams, startTime, endTime, stcd, stnm); + return this.baseMapper.selectHyImxfwFPageByInfo(new Query().getPage(map), map); + } + + /** + * 导出时段最大洪量表 + */ + @Override + public R exportMaxFloodScaleList(HttpServletResponse response, String startTime, String endTime, String stcd, String stnm) { + + Long userId = SecurityUtils.getUserId(); + String tableName = "时段最大洪量表"; + return taskAndExport(tableName,startTime, endTime, stcd, stnm, userId); + } + + @Resource + private ThreadPoolExecutor importThreadPool; + + @Autowired + private ApplicationContext context; + + + /** + * 从mysql导入到sqlserver中 + */ + @Transactional(rollbackFor = Exception.class) + @DataSource(DataSourceType.SHARDING) + public void importMysqlToSqlserver(List hyImxfwFVoList) { + List records = hyImxfwFVoList.stream().map(i->{ + HyImxfwF hyImxfwF = new HyImxfwF(); + BeanUtils.copyProperties(i, hyImxfwF); + hyImxfwF.setYr(Convert.toInt(i.getYr())); + hyImxfwF.setBgdt(DateUtils.parseDate(i.getBgdt().split("\\.")[0])); + hyImxfwF.setMxw(Convert.toBigDecimal(i.getMxw())); + return hyImxfwF; + }).collect(Collectors.toList()); + //先清空临时表的数据 + this.baseMapper.deleteTempData(); + //插入临时表数据 + int batchSize = 50; + for (int i = 0; i < records.size(); i += batchSize) { + int end = Math.min(i + batchSize, records.size()); + List batch = records.subList(i, end); + // 执行批量插入 + this.baseMapper.insertTempData(batch); + } + //从临时表增或修改主表 + this.baseMapper.mergeToData(); + } + + + + @Override + public R importDateTosoft(String startTime, String endTime) { + Long userId = SecurityUtils.getUserId(); + String filename = "时段最大洪量表" + startTime + "-" + endTime+"导入到南方片"; + // 查询是否已存在相同条件且未完成的任务 + List ongoingTasks = ycExportTaskService.list( + new QueryWrapper() + .eq("user_id", userId) + .eq("status", 0) // 状态为0表示任务未完成 + .like("filename", "时段最大洪量表")); + if (!ongoingTasks.isEmpty()) { + return R.error("当前任务正在下载中，请稍后重试"); + } + YcExportTask ycExportTask = new YcExportTask(); + ycExportTask.setFilename(filename); + ycExportTask.setUserId(userId); + ycExportTask.setStartTime(new Date()); + ycExportTask.setStatus(0); + ycExportTaskService.save(ycExportTask); + CompletableFuture.runAsync(() -> { + try { + IPage pageByInfo = this.selectMaxFloodScaleListPageByInfo(new PageParams(0L, 1000000000L), startTime, endTime, null, null); +// IPage pageByInfo = this.selectMaxHRainListPageByInfo(new PageParams(0L, 1000000000L), null, null, startTime, endTime); + HyImxfwFServiceImpl hyImxfwFService = context.getBean(HyImxfwFServiceImpl.class); + hyImxfwFService.importMysqlToSqlserver(pageByInfo.getRecords()); + ycExportTask.setStatus(2); + } catch (Exception e) { + ycExportTask.setStatus(4); + log.error(e.getMessage()); + R.error("任务下载失败"); + }finally { + ycExportTask.setEndTime(new Date()); + ycExportTaskService.updateById(ycExportTask); + } + }, importThreadPool); + return R.ok("任务已提交"); + } + + private R taskAndExport(String tableName,String startTime, String endTime, String stcd, String stnm, Long userId) { + String startNewTime=""; + String endNewTime=""; + if (ObjectUtils.isNotEmpty(startTime) ){ + startNewTime=startTime.substring(0,4); + } + if (ObjectUtils.isNotEmpty(endTime)){ + endNewTime=endTime.substring(0,4); + } + String filename = tableName + startNewTime + "-" + endNewTime; + // 查询是否已存在相同条件且未完成的任务 + List ongoingTasks = ycExportTaskService.list( + new QueryWrapper() + .eq("user_id", userId) + .eq("filename", filename) + .eq("status", 0) // 状态为0表示任务未完成 + ); + + if (!ongoingTasks.isEmpty()) { + return R.error("当前任务正在下载中，请稍后重试"); + } + + YcExportTask ycExportTask = new YcExportTask(); + String pathPeffix = RuoYiConfig.getExportPath() + + File.separator + userId + File.separator+ + DateUtils.parseDateToStr("yyyy-MM-dd",DateUtils.getNowDate()) + File.separator + + DateUtils.parseDateToStr("HH_mm",DateUtils.getNowDate())+File.separator; + ycExportTask.setFilename(filename); + ycExportTask.setUserId(userId); + ycExportTask.setStartTime(new Date()); + ycExportTask.setStatus(0); + ycExportTask.setFilepath(pathPeffix); + ycExportTaskService.save(ycExportTask); + CompletableFuture.runAsync(() -> { + try { + File dest = new File(pathPeffix); + if (!dest.exists()) { + dest.mkdirs(); + } + String fullPath = pathPeffix + filename; + exportBlackData(fullPath, startTime, endTime, stcd, stnm); + + ycExportTask.setStatus(1); + ycExportTask.setEndTime(new Date()); + ycExportTaskService.updateById(ycExportTask); + } catch (Exception e) { + log.error(e.getMessage(), e); + R.error("任务下载失败"); + } + }, labelThreadPool); + return R.ok("任务已提交，请稍后下载"); + } + + private void exportBlackData(String tableName, String startTime, String endTime, String stcd, String stnm) { + Map rainMap = CommonUtils.getYearAndDayDataMap(new PageParams(0L, 1000000000L), startTime, endTime, stcd, stnm); + ExcelUtils.excelBackExport2("maxFloodScale.xls", tableName, (Sheet sheet, CellStyle style) -> + dataModel1(rainMap, sheet, style)); + } + + public int dataModel1(Map map, Sheet sheet, CellStyle style) { + // 批量查询数据 + IPage hyImxfwFVoIPage = this.baseMapper.selectHyImxfwFPageByInfo(new Query().getPage(map), map); + List records = hyImxfwFVoIPage.getRecords(); + + // 定义当前sheet的行号 + int rowIndex = 2; // 从第二行开始写入数据 + // 定义全局序号 + int globalIndex = 1; // 从1开始 + + // 定义当前sheet的编号 + int sheetIndex = 1; + + // 最大行数限制 + int maxRowsPerSheet = 65536; // 对于 .xls 文件，最大行数为 65536 + int batchSize = 1000; // 每次批量处理1000行，减少逐行写入的开销 + + // 复制表头到新sheet的逻辑 + ExcelUtils.copyHeader(sheet, style); + + // 批量处理数据 + for (int i = 0; i < records.size(); i += batchSize) { + // 处理一批数据 + int toIndex = Math.min(i + batchSize, records.size()); + List batchList = records.subList(i, toIndex); + + // 批量写入数据 + for (HyImxfwFVo vo : batchList) { + // 如果当前行数达到最大行数，创建新sheet + if (rowIndex >= maxRowsPerSheet) { + sheetIndex++; + sheet = sheet.getWorkbook().createSheet("时段最大洪量表" + sheetIndex); + rowIndex = 2; // 重置行号 + // 复制表头到新sheet + ExcelUtils.copyHeader(sheet, style); + } + + // 创建新行并写入数据 + Row row = ExcelUtils.createRow(sheet, rowIndex); + + // 使用 globalIndex 作为序号 + ExcelUtils.formatCell(row, 0, String.valueOf(globalIndex), style); + ExcelUtils.formatCell(row, 1, vo.getStcd() != null ? vo.getStcd() : "", style); + ExcelUtils.formatCell(row, 2, vo.getStnm() != null ? vo.getStnm() : "", style); + ExcelUtils.formatCell(row, 3, vo.getAddvcd() != null ? vo.getAddvcd() : "", style); + ExcelUtils.formatCell(row, 4, "",style); + ExcelUtils.formatCell(row, 5, vo.getYr() != null ? vo.getYr().toString() : "", style); + ExcelUtils.formatCell(row, 6, vo.getBgdt() != null ? vo.getBgdt() : "", style); + ExcelUtils.formatCell(row, 7, vo.getMxwdr() != null ? vo.getMxwdr() : "", style); + ExcelUtils.formatCell(row, 8, vo.getMxw() != null ? CommonUtils.formatNum(vo.getMxw()) : "", style); + ExcelUtils.formatCell(row, 9, vo.getMxwrc() != null ? vo.getMxwrc() : "", style); + ExcelUtils.formatCell(row, 10, "", style); + + // 增加行号和全局序号 + rowIndex++; + globalIndex++; + } + } + return 0; + } + + + public void dataModel(Map map, Sheet sheet, CellStyle style) { + // 批量查询数据 + IPage hyImxfwFVoIPage = this.baseMapper.selectHyImxfwFPageByInfo(new Query().getPage(map), map); + List records = hyImxfwFVoIPage.getRecords(); + // 定义当前sheet的行号 + int rowIndex = 2; + // 定义当前sheet的编号 + int sheetIndex = 1; + Row row; + // 最大行数限制 + int maxRowsPerSheet = 65536; // 对于 .xls 文件，最大行数为 65536 + int batchSize = 1000; // 每次批量处理1000行，减少逐行写入的开销 + // 批量处理数据 + for (int i = 0; i < records.size(); i += batchSize) { + // 处理一批数据 + int toIndex = Math.min(i + batchSize, records.size()); + List batchList = records.subList(i, toIndex); + // 批量写入数据 + for (HyImxfwFVo vo : batchList) { + // 如果当前行数达到最大行数，创建新sheet + if (rowIndex >= maxRowsPerSheet) { + sheetIndex++; + sheet = sheet.getWorkbook().createSheet("小时时段最大降水量表" + sheetIndex); + rowIndex = 2; // 重置行号 + } + // 创建新行并写入数据 + row = ExcelUtils.createRow(sheet, rowIndex); + //序号 + ExcelUtils.formatCell(row, 0, String.valueOf(rowIndex - 1), style); + ExcelUtils.formatCell(row, 1, vo.getStcd() != null ? vo.getStcd() : "", style); + ExcelUtils.formatCell(row, 2, vo.getStnm() != null ? vo.getStnm() : "", style); + ExcelUtils.formatCell(row, 3, vo.getAddvcd() != null ? vo.getAddvcd() : "", style); + ExcelUtils.formatCell(row, 4, "",style); + ExcelUtils.formatCell(row, 5, vo.getYr() != null ? vo.getYr().toString() : "", style); + ExcelUtils.formatCell(row, 6, vo.getBgdt() != null ? vo.getBgdt() : "", style); + ExcelUtils.formatCell(row, 7, vo.getMxwdr() != null ? vo.getMxwdr() : "", style); + ExcelUtils.formatCell(row, 8, vo.getMxw() != null ? CommonUtils.formatNum(vo.getMxw()) : "", style); + ExcelUtils.formatCell(row, 9, vo.getMxwrc() != null ? vo.getMxwrc() : "", style); + ExcelUtils.formatCell(row, 10, "", style); + rowIndex++; + } + } + } +} + + + + diff --git a/swlscx/src/main/java/com/ruoyi/swlscx/year/service/impl/HyMmxpFServiceImpl.java b/swlscx/src/main/java/com/ruoyi/swlscx/year/service/impl/HyMmxpFServiceImpl.java new file mode 100644 index 0000000..b6dff3f --- /dev/null +++ b/swlscx/src/main/java/com/ruoyi/swlscx/year/service/impl/HyMmxpFServiceImpl.java @@ -0,0 +1,349 @@ +package com.ruoyi.swlscx.year.service.impl; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.ruoyi.common.annotation.DataSource; +import com.ruoyi.common.config.RuoYiConfig; +import com.ruoyi.common.core.page.R; +import com.ruoyi.common.core.text.Convert; +import com.ruoyi.common.enums.DataSourceType; +import com.ruoyi.common.utils.DateUtils; +import com.ruoyi.common.utils.SecurityUtils; +import com.ruoyi.common.utils.bean.BeanUtils; +import com.ruoyi.swlscx.basic.domain.po.YcExportTask; +import com.ruoyi.swlscx.basic.service.YcExportTaskService; +import com.ruoyi.swlscx.common.PageParams; +import com.ruoyi.swlscx.year.domain.bo.HyMmxpFBo; +import com.ruoyi.swlscx.year.domain.po.HyMmxpF; +import com.ruoyi.swlscx.year.domain.vo.HyMmxpFVo; +import com.ruoyi.swlscx.year.service.HyMmxpFService; +import com.ruoyi.swlscx.year.mapper.HyMmxpFMapper; +import com.ruoyi.swlscx.common.utils.CommonUtils; +import com.ruoyi.swlscx.common.utils.ExcelUtils; +import com.ruoyi.swlscx.common.utils.Query; +import org.apache.commons.lang3.ObjectUtils; +import org.apache.poi.ss.usermodel.CellStyle; +import org.apache.poi.ss.usermodel.Row; +import org.apache.poi.ss.usermodel.Sheet; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.context.ApplicationContext; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; +import org.springframework.web.multipart.MultipartFile; + +import javax.annotation.Resource; +import javax.servlet.http.HttpServletResponse; +import java.io.File; +import java.util.Date; +import java.util.List; +import java.util.Map; +import java.util.concurrent.CompletableFuture; +import java.util.concurrent.ThreadPoolExecutor; +import java.util.stream.Collectors; + +/** +* @author 12974 +* @description 针对表【hy_mmxp_f(分钟时段最大降水量表)】的数据库操作Service实现 +* @createDate 2024-09-11 10:09:13 +*/ +@Service +public class HyMmxpFServiceImpl extends ServiceImpl + implements HyMmxpFService{ + + @Resource + private ThreadPoolExecutor labelThreadPool; + + @Resource + private YcExportTaskService ycExportTaskService; + + @Resource + private ThreadPoolExecutor importThreadPool; + + @Autowired + private ApplicationContext context; + + + /** + * 导入分钟时段最大降水量表数据 + */ + @Override + @Transactional(rollbackFor = Exception.class) + public void importHyMmxpFData(MultipartFile file) { + try { + List hyMmxpFBos = ExcelUtils.readExcel(file.getInputStream(), HyMmxpFBo.class, 2); + // 获取数据 + List dataList = hyMmxpFBos.parallelStream().map(i -> { + HyMmxpF hyMmxpF = new HyMmxpF(); + BeanUtils.copyProperties(i, hyMmxpF); + hyMmxpF.setYr(Convert.toInt(i.getYr())); + hyMmxpF.setMxpdr(Convert.toInt(i.getMxpdr())); + hyMmxpF.setBgdt(DateUtils.parseDate(i.getBgdt())); + hyMmxpF.setMxp(Convert.toBigDecimal(i.getMxp())); + return hyMmxpF; + }).collect(Collectors.toList()); + for (int i = 0; i < dataList.size(); i += 2000) { + int end = Math.min(i + 1000, dataList.size()); + List batchList = dataList.subList(i, end); + baseMapper.batchInsert(batchList); + } + } catch (Exception e) { + throw new RuntimeException(e); + } + } + + /** + * 查询分钟时段最大降水量表数据 + */ + @Override + public IPage selectMaxMRainListPageByInfo(PageParams pageParams, String startTime, String endTime, String stcd, String stnm) { + Map map = CommonUtils.getYearAndDayDataMap(pageParams, startTime, endTime, stcd, stnm); + return this.baseMapper.selectHyMmxpFPageByInfo(new Query().getPage(map), map); + } + + /** + * 导出分钟时段最大降水量表 + */ + @Override + public R exportMinMaxRainList(HttpServletResponse response, String startTime, String endTime, String stcd, String stnm) { + Long userId = SecurityUtils.getUserId(); + String tableName = "分钟时段最大降水量表"; + return taskAndExport(tableName,startTime, endTime, stcd, stnm, userId); + } + + /** + * 从mysql导入到sqlserver中 + */ + @Transactional(rollbackFor = Exception.class) + @DataSource(DataSourceType.SHARDING) + public void importMysqlToSqlserver(List hyMmxpFVoList) { + List records = hyMmxpFVoList.stream().map(i->{ + HyMmxpF hyMmxpF = new HyMmxpF(); + BeanUtils.copyProperties(i, hyMmxpF); + hyMmxpF.setYr(Convert.toInt(i.getYr())); + hyMmxpF.setMxpdr(Convert.toInt(i.getMxpdr())); + hyMmxpF.setBgdt(DateUtils.parseDate(i.getBgdt())); + hyMmxpF.setMxp(Convert.toBigDecimal(i.getMxp())); + return hyMmxpF; + }).collect(Collectors.toList()); + //先清空临时表的数据 + this.baseMapper.deleteTempData(); + //插入临时表数据 + int batchSize = 50; + for (int i = 0; i < records.size(); i += batchSize) { + int end = Math.min(i + batchSize, records.size()); + List batch = records.subList(i, end); + // 执行批量插入 + this.baseMapper.insertTempData(batch); + } + //从临时表增或修改主表 + this.baseMapper.mergeToData(); + } + + @Override + public R importDateTosoft(String startTime, String endTime) { + Long userId = SecurityUtils.getUserId(); + String filename = "分钟时段最大降水量表" + startTime + "-" + endTime+"导入到南方片"; + // 查询是否已存在相同条件且未完成的任务 + List ongoingTasks = ycExportTaskService.list( + new QueryWrapper() + .eq("user_id", userId) + .eq("status", 0) // 状态为0表示任务未完成 + .like("filename", "分钟时段最大降水量表")); + if (!ongoingTasks.isEmpty()) { + return R.error("当前任务正在下载中，请稍后重试"); + } + YcExportTask ycExportTask = new YcExportTask(); + ycExportTask.setFilename(filename); + ycExportTask.setUserId(userId); + ycExportTask.setStartTime(new Date()); + ycExportTask.setStatus(0); + ycExportTaskService.save(ycExportTask); + CompletableFuture.runAsync(() -> { + try { + IPage pageByInfo = this.selectMaxMRainListPageByInfo(new PageParams(0L, 1000000000L), startTime, endTime, null, null); + HyMmxpFServiceImpl hyMmxpFService = context.getBean(HyMmxpFServiceImpl.class); + hyMmxpFService.importMysqlToSqlserver(pageByInfo.getRecords()); + ycExportTask.setStatus(2); + } catch (Exception e) { + ycExportTask.setStatus(4); + log.error("异常："+e.getMessage()); + R.error("任务下载失败"); + }finally { + ycExportTask.setEndTime(new Date()); + ycExportTaskService.updateById(ycExportTask); + } + }, importThreadPool); + return R.ok("任务已提交"); + } + + private R taskAndExport(String tableName,String startTime, String endTime, String stcd, String stnm, Long userId) { + String startNewTime=""; + String endNewTime=""; + if (ObjectUtils.isNotEmpty(startTime) ){ + startNewTime=startTime.substring(0,4); + } + if (ObjectUtils.isNotEmpty(endTime)){ + endNewTime=endTime.substring(0,4); + } + String filename = tableName + startNewTime + "-" + endNewTime; + // 查询是否已存在相同条件且未完成的任务 + List ongoingTasks = ycExportTaskService.list( + new QueryWrapper() + .eq("user_id", userId) + .eq("filename", filename) + .eq("status", 0) // 状态为0表示任务未完成 + ); + + if (!ongoingTasks.isEmpty()) { + return R.error("当前任务正在下载中，请稍后重试"); + } + + YcExportTask ycExportTask = new YcExportTask(); + String pathPeffix = RuoYiConfig.getExportPath() + + File.separator + userId + File.separator+ + DateUtils.parseDateToStr("yyyy-MM-dd",DateUtils.getNowDate()) + File.separator + + DateUtils.parseDateToStr("HH_mm",DateUtils.getNowDate())+File.separator; + ycExportTask.setFilename(filename); + ycExportTask.setUserId(userId); + ycExportTask.setStartTime(new Date()); + ycExportTask.setStatus(0); + ycExportTask.setFilepath(pathPeffix); + ycExportTaskService.save(ycExportTask); + CompletableFuture.runAsync(() -> { + try { + File dest = new File(pathPeffix); + if (!dest.exists()) { + dest.mkdirs(); + } + String fullPath = pathPeffix + filename; + exportBlackData(fullPath, startTime, endTime, stcd, stnm); + + ycExportTask.setStatus(1); + ycExportTask.setEndTime(new Date()); + ycExportTaskService.updateById(ycExportTask); + } catch (Exception e) { + log.error(e.getMessage(), e); + R.error("任务下载失败"); + } + }, labelThreadPool); + return R.ok("任务已提交，请稍后下载"); + } + + private void exportBlackData(String tableName, String startTime, String endTime, String stcd, String stnm) { + Map rainMap = CommonUtils.getYearAndDayDataMap(new PageParams(0L, 1000000000L), startTime, endTime, stcd, stnm); + ExcelUtils.excelBackExport2("minMaxRain.xls", tableName, (Sheet sheet, CellStyle style) -> + dataModel1(rainMap, sheet, style)); + } + + public void dataModel(Map map, Sheet sheet, CellStyle style) { + // 批量查询数据 + IPage hyMtqEPageByInfo = this.baseMapper.selectHyMmxpFPageByInfo(new Query().getPage(map), map); + List records = hyMtqEPageByInfo.getRecords(); + // 定义当前sheet的行号 + int rowIndex = 2; + // 定义当前sheet的编号 + int sheetIndex = 1; + Row row; + // 最大行数限制 + int maxRowsPerSheet = 65536; // 对于 .xls 文件，最大行数为 65536 + int batchSize = 1000; // 每次批量处理1000行，减少逐行写入的开销 + // 批量处理数据 + for (int i = 0; i < records.size(); i += batchSize) { + // 处理一批数据 + int toIndex = Math.min(i + batchSize, records.size()); + List batchList = records.subList(i, toIndex); + // 批量写入数据 + for (HyMmxpFVo vo : batchList) { + // 如果当前行数达到最大行数，创建新sheet + if (rowIndex >= maxRowsPerSheet) { + sheetIndex++; + sheet = sheet.getWorkbook().createSheet("分钟时段最大降水量表" + sheetIndex); + rowIndex = 2; // 重置行号 + } + // 创建新行并写入数据 + row = ExcelUtils.createRow(sheet, rowIndex); + //序号 + ExcelUtils.formatCell(row, 0, String.valueOf(rowIndex - 1), style); + ExcelUtils.formatCell(row, 1, vo.getStcd() != null ? vo.getStcd() : "", style); + ExcelUtils.formatCell(row, 2, vo.getStnm() != null ? vo.getStnm() : "", style); + ExcelUtils.formatCell(row, 3, vo.getAddvcd() != null ? vo.getAddvcd() : "", style); + ExcelUtils.formatCell(row, 4, "",style); + ExcelUtils.formatCell(row, 5, vo.getYr() != null ? vo.getYr().toString() : "", style); + ExcelUtils.formatCell(row, 6, vo.getBgdt() != null ? vo.getBgdt() : "", style); + ExcelUtils.formatCell(row, 7, vo.getMxpdr() != null ? vo.getMxpdr().toString() : "", style); + ExcelUtils.formatCell(row, 8, vo.getMxp() != null ? CommonUtils.formatNum(vo.getMxp()) : "", style); + ExcelUtils.formatCell(row, 9, vo.getMxprc() != null ? vo.getMxprc() : "", style); + ExcelUtils.formatCell(row, 10, "", style); + rowIndex++; + } + } + } + + public int dataModel1(Map map, Sheet sheet, CellStyle style) { + // 批量查询数据 + IPage hyMtqEPageByInfo = this.baseMapper. + selectHyMmxpFPageByInfo(new Query().getPage(map), map); + List records = hyMtqEPageByInfo.getRecords(); + + // 定义当前sheet的行号 + int rowIndex = 2; // 从第二行开始写入数据 + // 定义全局序号 + int globalIndex = 1; // 从1开始 + + // 定义当前sheet的编号 + int sheetIndex = 1; + + // 最大行数限制 + int maxRowsPerSheet = 65536; // 对于 .xls 文件，最大行数为 65536 + int batchSize = 1000; // 每次批量处理1000行，减少逐行写入的开销 + + // 复制表头到新sheet的逻辑 + ExcelUtils.copyHeader(sheet, style); + + // 批量处理数据 + for (int i = 0; i < records.size(); i += batchSize) { + // 处理一批数据 + int toIndex = Math.min(i + batchSize, records.size()); + List batchList = records.subList(i, toIndex); + + // 批量写入数据 + for (HyMmxpFVo vo : batchList) { + // 如果当前行数达到最大行数，创建新sheet + if (rowIndex >= maxRowsPerSheet) { + sheetIndex++; + sheet = sheet.getWorkbook().createSheet("分钟时段最大降水量表" + sheetIndex); + rowIndex = 2; // 重置行号 + // 复制表头到新sheet + ExcelUtils.copyHeader(sheet, style); + } + + // 创建新行并写入数据 + Row row = ExcelUtils.createRow(sheet, rowIndex); + + // 使用 globalIndex 作为序号 + ExcelUtils.formatCell(row, 0, String.valueOf(globalIndex), style); + ExcelUtils.formatCell(row, 1, vo.getStcd() != null ? vo.getStcd() : "", style); + ExcelUtils.formatCell(row, 2, vo.getStnm() != null ? vo.getStnm() : "", style); + ExcelUtils.formatCell(row, 3, vo.getAddvcd() != null ? vo.getAddvcd() : "", style); + ExcelUtils.formatCell(row, 4, "",style); + ExcelUtils.formatCell(row, 5, vo.getYr() != null ? vo.getYr().toString() : "", style); + ExcelUtils.formatCell(row, 6, vo.getBgdt() != null ? vo.getBgdt() : "", style); + ExcelUtils.formatCell(row, 7, vo.getMxpdr() != null ? vo.getMxpdr().toString() : "", style); + ExcelUtils.formatCell(row, 8, vo.getMxp() != null ? CommonUtils.formatNum(vo.getMxp()) : "", style); + ExcelUtils.formatCell(row, 9, vo.getMxprc() != null ? vo.getMxprc() : "", style); + ExcelUtils.formatCell(row, 10, "", style); + + // 增加行号和全局序号 + rowIndex++; + globalIndex++; + } + } + return 0; + } + +} + + + + diff --git a/swlscx/src/main/java/com/ruoyi/swlscx/year/service/impl/HyYrcsFServiceImpl.java b/swlscx/src/main/java/com/ruoyi/swlscx/year/service/impl/HyYrcsFServiceImpl.java new file mode 100644 index 0000000..c8fb20f --- /dev/null +++ b/swlscx/src/main/java/com/ruoyi/swlscx/year/service/impl/HyYrcsFServiceImpl.java @@ -0,0 +1,366 @@ +package com.ruoyi.swlscx.year.service.impl; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.ruoyi.common.annotation.DataSource; +import com.ruoyi.common.config.RuoYiConfig; +import com.ruoyi.common.core.page.R; +import com.ruoyi.common.core.text.Convert; +import com.ruoyi.common.enums.DataSourceType; +import com.ruoyi.common.utils.DateUtils; +import com.ruoyi.common.utils.SecurityUtils; +import com.ruoyi.common.utils.bean.BeanUtils; +import com.ruoyi.swlscx.basic.domain.po.YcExportTask; +import com.ruoyi.swlscx.basic.service.YcExportTaskService; +import com.ruoyi.swlscx.common.PageParams; +import com.ruoyi.swlscx.year.domain.bo.HyYrcsFBo; +import com.ruoyi.swlscx.year.domain.po.HyHmxpF; +import com.ruoyi.swlscx.year.domain.po.HyYrcsF; +import com.ruoyi.swlscx.year.domain.vo.HyHmxpFVo; +import com.ruoyi.swlscx.year.domain.vo.HyYrcsFVo; +import com.ruoyi.swlscx.year.mapper.HyYrcsFMapper; +import com.ruoyi.swlscx.year.service.HyYrcsFService; +import com.ruoyi.swlscx.common.utils.CommonUtils; +import com.ruoyi.swlscx.common.utils.ExcelUtils; +import com.ruoyi.swlscx.common.utils.Query; +import org.apache.commons.lang3.ObjectUtils; +import org.apache.poi.ss.usermodel.CellStyle; +import org.apache.poi.ss.usermodel.Row; +import org.apache.poi.ss.usermodel.Sheet; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.context.ApplicationContext; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; +import org.springframework.web.multipart.MultipartFile; + +import javax.annotation.Resource; +import javax.servlet.http.HttpServletResponse; +import java.io.File; +import java.util.Date; +import java.util.List; +import java.util.Map; +import java.util.concurrent.CompletableFuture; +import java.util.concurrent.ThreadPoolExecutor; +import java.util.stream.Collectors; + +/** + * @author 12974 + * @description 针对表【hy_yrcs_f(年含沙量表)】的数据库操作Service实现 + * @createDate 2024-09-05 16:53:36 + */ +@Service +public class HyYrcsFServiceImpl extends ServiceImpl + implements HyYrcsFService { + + @Resource + private ThreadPoolExecutor labelThreadPool; + + @Resource + private YcExportTaskService ycExportTaskService; + + /** + * 导入年含沙量表 + */ + @Override + @Transactional(rollbackFor = Exception.class) + public void importHyYrcsFData(MultipartFile file) { + try { + List hyYrcsFBos = ExcelUtils.readExcel(file.getInputStream(), HyYrcsFBo.class, 2); + // 获取数据 + List dataList = hyYrcsFBos.parallelStream().map(i -> { + HyYrcsF hyYrcsF = new HyYrcsF(); + BeanUtils.copyProperties(i, hyYrcsF); + hyYrcsF.setYr(Convert.toInt(i.getYr())); + hyYrcsF.setAvcs(Convert.toBigDecimal(i.getAvcs())); + hyYrcsF.setMxs(Convert.toBigDecimal(i.getMxs())); + hyYrcsF.setMxsdt(DateUtils.parseDate(i.getMxsdt())); + hyYrcsF.setMns(Convert.toBigDecimal(i.getMns())); + hyYrcsF.setMnsdt(DateUtils.parseDate(i.getMnsdt())); + return hyYrcsF; + }).collect(Collectors.toList()); + + + this.saveBatch(dataList, 5000); + } catch (Exception e) { + throw new RuntimeException(e); + } + } + + /** + * 查询年含沙量表数据 + */ + @Override + public IPage getYearSedimentConcentrationList(PageParams pageParams, String startTime, String endTime, String stcd, String stnm) { + Map map = CommonUtils.getYearAndDayDataMap(pageParams, startTime, endTime, stcd, stnm); + return this.baseMapper.selecthyYrcsFPageByInfo(new Query().getPage(map), map); + } + + /** + * 导出年含沙量表 + */ + @Override + public R exportSedimentConcentrationList(HttpServletResponse response, String startTime, String endTime, String stcd, String stnm) { + + Long userId = SecurityUtils.getUserId(); + String tableName = "年含沙量表"; + return taskAndExport(tableName,startTime, endTime, stcd, stnm, userId); + +// Map rainMap = CommonUtils.getYearAndDayDataMap(new PageParams(0L, 100000L), startTime, endTime, stcd, stnm); +// ExcelUtils.excelExport(response, "sedimentConcentration.xls", "年含沙量表", (Sheet sheet, CellStyle style) -> { +// dataModel(rainMap, sheet, style); +// }); + } + + + @Resource + private ThreadPoolExecutor importThreadPool; + + @Autowired + private ApplicationContext context; + + /** + * 从mysql导入到sqlserver中 + */ + @Transactional(rollbackFor = Exception.class) + @DataSource(DataSourceType.SHARDING) + public void importMysqlToSqlserver(List hyYrcsFVoList) { + List records = hyYrcsFVoList.stream().map(i->{ + HyYrcsF hyYrcsF = new HyYrcsF(); + BeanUtils.copyProperties(i, hyYrcsF); + hyYrcsF.setYr(Convert.toInt(i.getYr())); + hyYrcsF.setAvcs(Convert.toBigDecimal(i.getAvcs())); + hyYrcsF.setMxs(Convert.toBigDecimal(i.getMxs())); + hyYrcsF.setMxsdt(DateUtils.parseDate(i.getMxsdt())); + hyYrcsF.setMns(Convert.toBigDecimal(i.getMns())); + hyYrcsF.setMnsdt(DateUtils.parseDate(i.getMnsdt())); + return hyYrcsF; + }).collect(Collectors.toList()); + //先清空临时表的数据 + this.baseMapper.deleteTempData(); + //插入临时表数据 + int batchSize = 50; + for (int i = 0; i < records.size(); i += batchSize) { + int end = Math.min(i + batchSize, records.size()); + List batch = records.subList(i, end); + // 执行批量插入 + this.baseMapper.insertTempData(batch); + } + //从临时表增或修改主表 + this.baseMapper.mergeToData(); + } + + @Override + public R importDateTosoft(String startTime, String endTime) { + Long userId = SecurityUtils.getUserId(); + String filename = "年含沙量表" + startTime + "-" + endTime+"导入到南方片"; + // 查询是否已存在相同条件且未完成的任务 + List ongoingTasks = ycExportTaskService.list( + new QueryWrapper() + .eq("user_id", userId) + .eq("status", 0) // 状态为0表示任务未完成 + .like("filename", "年含沙量表")); + if (!ongoingTasks.isEmpty()) { + return R.error("当前任务正在下载中，请稍后重试"); + } + YcExportTask ycExportTask = new YcExportTask(); + ycExportTask.setFilename(filename); + ycExportTask.setUserId(userId); + ycExportTask.setStartTime(new Date()); + ycExportTask.setStatus(0); + ycExportTaskService.save(ycExportTask); + CompletableFuture.runAsync(() -> { + try { + IPage pageByInfo = this.getYearSedimentConcentrationList(new PageParams(0L, 1000000000L), startTime, endTime, null, null); +// IPage pageByInfo = this.selectMaxHRainListPageByInfo(new PageParams(0L, 1000000000L), null, null, startTime, endTime); + HyYrcsFServiceImpl hyYrcsFService = context.getBean(HyYrcsFServiceImpl.class); + hyYrcsFService.importMysqlToSqlserver(pageByInfo.getRecords()); + ycExportTask.setStatus(2); + } catch (Exception e) { + ycExportTask.setStatus(4); + log.error(e.getMessage()); + R.error("任务下载失败"); + }finally { + ycExportTask.setEndTime(new Date()); + ycExportTaskService.updateById(ycExportTask); + } + }, importThreadPool); + return R.ok("任务已提交"); + } + + private R taskAndExport(String tableName,String startTime, String endTime, String stcd, String stnm, Long userId) { + String startNewTime=""; + String endNewTime=""; + if (ObjectUtils.isNotEmpty(startTime) ){ + startNewTime=startTime.substring(0,4); + } + if (ObjectUtils.isNotEmpty(endTime)){ + endNewTime=endTime.substring(0,4); + } + String filename = tableName + startNewTime + "-" + endNewTime; + // 查询是否已存在相同条件且未完成的任务 + List ongoingTasks = ycExportTaskService.list( + new QueryWrapper() + .eq("user_id", userId) + .eq("filename", filename) + .eq("status", 0) // 状态为0表示任务未完成 + ); + + if (!ongoingTasks.isEmpty()) { + return R.error("当前任务正在下载中，请稍后重试"); + } + + YcExportTask ycExportTask = new YcExportTask(); + String pathPeffix = RuoYiConfig.getExportPath() + + File.separator + userId + File.separator+ + DateUtils.parseDateToStr("yyyy-MM-dd",DateUtils.getNowDate()) + File.separator + + DateUtils.parseDateToStr("HH_mm",DateUtils.getNowDate())+File.separator; + ycExportTask.setFilename(filename); + ycExportTask.setUserId(userId); + ycExportTask.setStartTime(new Date()); + ycExportTask.setStatus(0); + ycExportTask.setFilepath(pathPeffix); + ycExportTaskService.save(ycExportTask); + CompletableFuture.runAsync(() -> { + try { + File dest = new File(pathPeffix); + if (!dest.exists()) { + dest.mkdirs(); + } + String fullPath = pathPeffix + filename; + exportBlackData(fullPath, startTime, endTime, stcd, stnm); + + ycExportTask.setStatus(1); + ycExportTask.setEndTime(new Date()); + ycExportTaskService.updateById(ycExportTask); + } catch (Exception e) { + log.error(e.getMessage(), e); + R.error("任务下载失败"); + } + }, labelThreadPool); + return R.ok("任务已提交，请稍后下载"); + } + + private void exportBlackData(String tableName, String startTime, String endTime, String stcd, String stnm) { + Map rainMap = CommonUtils.getYearAndDayDataMap(new PageParams(0L, 1000000000L), startTime, endTime, stcd, stnm); + ExcelUtils.excelBackExport2("sedimentConcentration.xls", tableName, (Sheet sheet, CellStyle style) -> + dataModel1(rainMap, sheet, style)); + } + + public int dataModel1(Map map, Sheet sheet, CellStyle style) { + // 批量查询数据 + IPage hyYrcsFVoIPage = this.baseMapper.selecthyYrcsFPageByInfo(new Query().getPage(map), map); + List records = hyYrcsFVoIPage.getRecords(); + + // 定义当前sheet的行号 + int rowIndex = 2; // 从第二行开始写入数据 + // 定义全局序号 + int globalIndex = 1; // 从1开始 + + // 定义当前sheet的编号 + int sheetIndex = 1; + + // 最大行数限制 + int maxRowsPerSheet = 65536; // 对于 .xls 文件，最大行数为 65536 + int batchSize = 1000; // 每次批量处理1000行，减少逐行写入的开销 + + // 复制表头到新sheet的逻辑 + ExcelUtils.copyHeader(sheet, style); + + // 批量处理数据 + for (int i = 0; i < records.size(); i += batchSize) { + // 处理一批数据 + int toIndex = Math.min(i + batchSize, records.size()); + List batchList = records.subList(i, toIndex); + + // 批量写入数据 + for (HyYrcsFVo vo : batchList) { + // 如果当前行数达到最大行数，创建新sheet + if (rowIndex >= maxRowsPerSheet) { + sheetIndex++; + sheet = sheet.getWorkbook().createSheet("年含沙量表" + sheetIndex); + rowIndex = 2; // 重置行号 + // 复制表头到新sheet + ExcelUtils.copyHeader(sheet, style); + } + + // 创建新行并写入数据 + Row row = ExcelUtils.createRow(sheet, rowIndex); + + // 使用 globalIndex 作为序号 + ExcelUtils.formatCell(row, 0, String.valueOf(globalIndex), style); + ExcelUtils.formatCell(row, 1, vo.getStcd() != null ? vo.getStcd() : "", style); + ExcelUtils.formatCell(row, 2, vo.getStnm() != null ? vo.getStnm() : "", style); + ExcelUtils.formatCell(row, 3, vo.getAddvcd() != null ? vo.getAddvcd() : "", style); + ExcelUtils.formatCell(row, 4, "", style); + ExcelUtils.formatCell(row, 5, vo.getYr() != null ? vo.getYr().toString() : "", style); + ExcelUtils.formatCell(row, 6, vo.getAvcs() != null ? CommonUtils.formatNum(vo.getAvcs()) : "", style); + ExcelUtils.formatCell(row, 7, vo.getAvcsrcd() != null ? vo.getAddvcd() : "", style); + ExcelUtils.formatCell(row, 8, vo.getMxs() != null ? CommonUtils.formatNum(vo.getMxs()) : "", style); + ExcelUtils.formatCell(row, 9, vo.getMxsrcd() != null ? vo.getMxsrcd() : "", style); + ExcelUtils.formatCell(row, 10, vo.getMxsdt() != null ? vo.getMxsdt() : "", style); + ExcelUtils.formatCell(row, 11, vo.getMns() != null ? CommonUtils.formatNum(vo.getMns()) : "", style); + ExcelUtils.formatCell(row, 12, vo.getMnsrcd() != null ? vo.getMnsrcd() : "", style); + ExcelUtils.formatCell(row, 13, vo.getMnsdt() != null ? vo.getMnsdt() : "", style); + ExcelUtils.formatCell(row, 14, "", style); + + // 增加行号和全局序号 + rowIndex++; + globalIndex++; + } + } + return 0; + } + + public void dataModel(Map map, Sheet sheet, CellStyle style) { + // 批量查询数据 + IPage hyYrcsFVoIPage = this.baseMapper.selecthyYrcsFPageByInfo(new Query().getPage(map), map); + List records = hyYrcsFVoIPage.getRecords(); + // 定义当前sheet的行号 + int rowIndex = 2; + // 定义当前sheet的编号 + int sheetIndex = 1; + Row row; + // 最大行数限制 + int maxRowsPerSheet = 65536; // 对于 .xls 文件，最大行数为 65536 + int batchSize = 1000; // 每次批量处理1000行，减少逐行写入的开销 + // 批量处理数据 + for (int i = 0; i < records.size(); i += batchSize) { + // 处理一批数据 + int toIndex = Math.min(i + batchSize, records.size()); + List batchList = records.subList(i, toIndex); + // 批量写入数据 + for (HyYrcsFVo vo : batchList) { + // 如果当前行数达到最大行数，创建新sheet + if (rowIndex >= maxRowsPerSheet) { + sheetIndex++; + sheet = sheet.getWorkbook().createSheet("年含沙量表" + sheetIndex); + rowIndex = 2; // 重置行号 + } + // 创建新行并写入数据 + row = ExcelUtils.createRow(sheet, rowIndex); + //序号 + ExcelUtils.formatCell(row, 0, String.valueOf(rowIndex - 1), style); + ExcelUtils.formatCell(row, 1, vo.getStcd() != null ? vo.getStcd() : "", style); + ExcelUtils.formatCell(row, 2, vo.getStnm() != null ? vo.getStnm() : "", style); + ExcelUtils.formatCell(row, 3, vo.getAddvcd() != null ? vo.getAddvcd() : "", style); + ExcelUtils.formatCell(row, 4, "", style); + ExcelUtils.formatCell(row, 5, vo.getYr() != null ? vo.getYr().toString() : "", style); + ExcelUtils.formatCell(row, 6, vo.getAvcs() != null ? CommonUtils.formatNum(vo.getAvcs()) : "", style); + ExcelUtils.formatCell(row, 7, vo.getAvcsrcd() != null ? vo.getAddvcd() : "", style); + ExcelUtils.formatCell(row, 8, vo.getMxs() != null ? CommonUtils.formatNum(vo.getMxs()) : "", style); + ExcelUtils.formatCell(row, 9, vo.getMxsrcd() != null ? vo.getMxsrcd() : "", style); + ExcelUtils.formatCell(row, 10, vo.getMxsdt() != null ? vo.getMxsdt() : "", style); + ExcelUtils.formatCell(row, 11, vo.getMns() != null ? CommonUtils.formatNum(vo.getMns()) : "", style); + ExcelUtils.formatCell(row, 12, vo.getMnsrcd() != null ? vo.getMnsrcd() : "", style); + ExcelUtils.formatCell(row, 13, vo.getMnsdt() != null ? vo.getMnsdt() : "", style); + ExcelUtils.formatCell(row, 14, "", style); + rowIndex++; + } + } + } +} + + + + diff --git a/swlscx/src/main/java/com/ruoyi/swlscx/year/service/impl/HyYrpFServiceImpl.java b/swlscx/src/main/java/com/ruoyi/swlscx/year/service/impl/HyYrpFServiceImpl.java new file mode 100644 index 0000000..b705d9c --- /dev/null +++ b/swlscx/src/main/java/com/ruoyi/swlscx/year/service/impl/HyYrpFServiceImpl.java @@ -0,0 +1,364 @@ +package com.ruoyi.swlscx.year.service.impl; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.ruoyi.common.annotation.DataSource; +import com.ruoyi.common.config.RuoYiConfig; +import com.ruoyi.common.core.page.R; +import com.ruoyi.common.core.text.Convert; +import com.ruoyi.common.enums.DataSourceType; +import com.ruoyi.common.utils.DateUtils; +import com.ruoyi.common.utils.SecurityUtils; +import com.ruoyi.swlscx.basic.domain.po.YcExportTask; +import com.ruoyi.swlscx.basic.service.YcExportTaskService; +import com.ruoyi.swlscx.common.PageParams; +import com.ruoyi.swlscx.common.utils.CommonUtils; +import com.ruoyi.swlscx.common.utils.ExcelUtils; +import com.ruoyi.swlscx.common.utils.Query; +import com.ruoyi.swlscx.month.domain.vo.HyMptEVo; +import com.ruoyi.swlscx.year.domain.bo.HyYrpFBo; +import com.ruoyi.swlscx.year.domain.po.HyYrpF; +import com.ruoyi.swlscx.year.domain.vo.HyYrpFVo; +import com.ruoyi.swlscx.year.mapper.HyYrpFMapper; +import com.ruoyi.swlscx.year.service.HyYrpFService; +import org.apache.commons.lang3.ObjectUtils; +import org.apache.poi.ss.usermodel.CellStyle; +import org.apache.poi.ss.usermodel.Row; +import org.apache.poi.ss.usermodel.Sheet; +import org.springframework.beans.BeanUtils; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.context.ApplicationContext; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; +import org.springframework.web.multipart.MultipartFile; + +import javax.annotation.Resource; +import javax.servlet.http.HttpServletResponse; +import java.io.File; +import java.util.Date; +import java.util.List; +import java.util.Map; +import java.util.concurrent.CompletableFuture; +import java.util.concurrent.ThreadPoolExecutor; +import java.util.stream.Collectors; + +/** + * @author 12974 + * @description 针对表【hy_yrp_f(年降水量表)】的数据库操作Service实现 + * @createDate 2024-09-05 16:53:36 + */ +@Service +public class HyYrpFServiceImpl extends ServiceImpl + implements HyYrpFService { + + + @Resource + private ThreadPoolExecutor labelThreadPool; + + @Resource + private YcExportTaskService ycExportTaskService; + + @Resource + private ThreadPoolExecutor importThreadPool; + + @Autowired + private ApplicationContext context; + + /** + * 导入年降水表数据 + */ + @Override + @Transactional(rollbackFor = Exception.class) + public void importHyYrpFData(MultipartFile file) { + try { + List hyYrpFBos = ExcelUtils.readExcel(file.getInputStream(), HyYrpFBo.class, 2); + List hyYrpFList = hyYrpFBos.stream().map(i -> { + HyYrpF hyYrpF = new HyYrpF(); + BeanUtils.copyProperties(i, hyYrpF); + hyYrpF.setYr(Convert.toInt(i.getYr())); + hyYrpF.setP(Convert.toBigDecimal(i.getP())); + hyYrpF.setFrdsdt(DateUtils.parseDate(i.getFrdsdt())); + hyYrpF.setFrapdt(DateUtils.parseDate(i.getFrapdt())); + hyYrpF.setSndsdt(DateUtils.parseDate(i.getSndsdt())); + hyYrpF.setSnapdt(DateUtils.parseDate(i.getSnapdt())); + return hyYrpF; + }).collect(Collectors.toList()); + //先清空临时表的数据 + this.baseMapper.deleteAll(); + //先插入到临时表中 从临时表中更新过去 + for (int i = 0; i < hyYrpFList.size(); i += 1000) { + int end = Math.min(i + 1000, hyYrpFList.size()); + List batchList = hyYrpFList.subList(i, end); + this.baseMapper.batchInsert(batchList); + } + //重临时表中把数据刷过去 + this.baseMapper.batchInsertOrUpdate(); + } catch (Exception e) { + e.printStackTrace(); + } + } + + /** + * 查询年降水表数据 + */ + @Override + public IPage selectHyYrpFDataByPageAndInfo(PageParams pageParams, String startTime, String endTime, String stcd, String stnm) { + Map map = CommonUtils.getYearAndDayDataMap(pageParams, startTime, endTime, stcd, stnm); + return this.baseMapper.selectHyMtpDataByPageAndInfo(new Query().getPage(map), map); + } + + @Override + public R exportHyYrpFData(HttpServletResponse response, String startTime, String endTime, String stcd, String stnm) { + Long userId = SecurityUtils.getUserId(); + String tableName = "年降水表"; + return taskAndExport(tableName, startTime, endTime, stcd, stnm, userId); + } + + @Override + public R importDateTosoft(String startTime, String endTime) { + Long userId = SecurityUtils.getUserId(); + String filename = "年降水表" + startTime + "-" + endTime+"导入到南方片"; + // 查询是否已存在相同条件且未完成的任务 + List ongoingTasks = ycExportTaskService.list( + new QueryWrapper() + .eq("user_id", userId) + .eq("status", 0) // 状态为0表示任务未完成 + .like("filename", "年降水表")); + if (!ongoingTasks.isEmpty()) { + return R.error("当前任务正在下载中，请稍后重试"); + } + YcExportTask ycExportTask = new YcExportTask(); + ycExportTask.setFilename(filename); + ycExportTask.setUserId(userId); + ycExportTask.setStartTime(new Date()); + ycExportTask.setStatus(0); + ycExportTaskService.save(ycExportTask); + CompletableFuture.runAsync(() -> { + try { + IPage hyYrpFVoIPage = this.selectHyYrpFDataByPageAndInfo(new PageParams(0L, 1000000000L), startTime, endTime, null, null); + HyYrpFServiceImpl hyYrpFService = context.getBean(HyYrpFServiceImpl.class); + hyYrpFService.importMysqlToSqlserver(hyYrpFVoIPage.getRecords()); + ycExportTask.setStatus(2); + } catch (Exception e) { + ycExportTask.setStatus(4); + log.error(e.getMessage()); + R.error("任务下载失败"); + }finally { + ycExportTask.setEndTime(new Date()); + ycExportTaskService.updateById(ycExportTask); + } + }, importThreadPool); + return R.ok("任务已提交"); + } + + + /** + * 从mysql导入到sqlserver中 + */ + @Transactional(rollbackFor = Exception.class) + @DataSource(DataSourceType.SHARDING) + public void importMysqlToSqlserver(List hyYrpFVoList) { + List records = hyYrpFVoList.stream().map(i->{ + HyYrpF hyYrpF = new HyYrpF(); + BeanUtils.copyProperties(i, hyYrpF); + hyYrpF.setYr(Convert.toInt(i.getYr())); + hyYrpF.setP(Convert.toBigDecimal(i.getP())); + hyYrpF.setFrdsdt(DateUtils.parseDate(i.getFrdsdt())); + hyYrpF.setFrapdt(DateUtils.parseDate(i.getFrapdt())); + hyYrpF.setSndsdt(DateUtils.parseDate(i.getSndsdt())); + hyYrpF.setSnapdt(DateUtils.parseDate(i.getSnapdt())); + return hyYrpF; + }).collect(Collectors.toList()); + //先清空临时表的数据 + this.baseMapper.deleteTempData(); + //插入临时表数据 + int batchSize = 50; + for (int i = 0; i < records.size(); i += batchSize) { + int end = Math.min(i + batchSize, records.size()); + List batch = records.subList(i, end); + // 执行批量插入 + this.baseMapper.batchInsert(batch); + } + //从临时表增或修改主表 + this.baseMapper.mergeToData(); + } + + + private R taskAndExport(String tableName, String startTime, String endTime, String stcd, String stnm, Long userId) { + String startNewTime = ""; + String endNewTime = ""; + if (ObjectUtils.isNotEmpty(startTime)) { + startNewTime = startTime.substring(0, 4); + } + if (ObjectUtils.isNotEmpty(endTime)) { + endNewTime = endTime.substring(0, 4); + } + String filename = tableName + startNewTime + "-" + endNewTime; + // 查询是否已存在相同条件且未完成的任务 + List ongoingTasks = ycExportTaskService.list( + new QueryWrapper() + .eq("user_id", userId) + .eq("filename", filename) + .eq("status", 0) // 状态为0表示任务未完成 + ); + + if (!ongoingTasks.isEmpty()) { + return R.error("当前任务正在下载中，请稍后重试"); + } + + YcExportTask ycExportTask = new YcExportTask(); + String pathPeffix = RuoYiConfig.getExportPath() + + File.separator + userId + File.separator + + DateUtils.parseDateToStr("yyyy-MM-dd", DateUtils.getNowDate()) + File.separator + + DateUtils.parseDateToStr("HH_mm", DateUtils.getNowDate()) + File.separator; + ycExportTask.setFilename(filename); + ycExportTask.setUserId(userId); + ycExportTask.setStartTime(new Date()); + ycExportTask.setStatus(0); + ycExportTask.setFilepath(pathPeffix); + ycExportTaskService.save(ycExportTask); + CompletableFuture.runAsync(() -> { + try { + File dest = new File(pathPeffix); + if (!dest.exists()) { + dest.mkdirs(); + } + String fullPath = pathPeffix + filename; + exportBlackData(fullPath, startTime, endTime, stcd, stnm); + + ycExportTask.setStatus(1); + ycExportTask.setEndTime(new Date()); + ycExportTaskService.updateById(ycExportTask); + } catch (Exception e) { + log.error(e.getMessage(), e); + R.error("任务下载失败"); + } + }, labelThreadPool); + return R.ok("任务已提交，请稍后下载"); + } + + private void exportBlackData(String tableName, String startTime, String endTime, String stcd, String stnm) { + Map rainMap = CommonUtils.getYearAndDayDataMap(new PageParams(0L, 1000000000L), startTime, endTime, stcd, stnm); + ExcelUtils.excelBackExport2("yearRain.xls", tableName, (Sheet sheet, CellStyle style) -> + dataModel1(rainMap, sheet, style)); + } + + + public void rainModel(Map map, Sheet sheet, CellStyle style) { + // 批量查询数据 + IPage hyYrpFVoIPage = this.baseMapper.selectHyMtpDataByPageAndInfo(new Query().getPage(map), map); + List records = hyYrpFVoIPage.getRecords(); + // 定义当前sheet的行号 + int rowIndex = 2; + // 定义当前sheet的编号 + int sheetIndex = 1; + Row row; + // 最大行数限制 + int maxRowsPerSheet = 65536; // 对于 .xls 文件，最大行数为 65536 + int batchSize = 1000; // 每次批量处理1000行，减少逐行写入的开销 + // 批量处理数据 + for (int i = 0; i < records.size(); i += batchSize) { + // 处理一批数据 + int toIndex = Math.min(i + batchSize, records.size()); + List batchList = records.subList(i, toIndex); + // 批量写入数据 + for (HyYrpFVo vo : batchList) { + // 如果当前行数达到最大行数，创建新sheet + if (rowIndex >= maxRowsPerSheet) { + sheetIndex++; + sheet = sheet.getWorkbook().createSheet("月降水表_" + sheetIndex); + rowIndex = 2; // 重置行号 + } + // 创建新行并写入数据 + row = ExcelUtils.createRow(sheet, rowIndex); + //序号 + ExcelUtils.formatCell(row, 0, String.valueOf(rowIndex - 1), style); + ExcelUtils.formatCell(row, 1, vo.getStcd() != null ? vo.getStcd() : "", style); + ExcelUtils.formatCell(row, 2, vo.getStnm() != null ? vo.getStnm() : "", style); + ExcelUtils.formatCell(row, 3, vo.getAddvcd() != null ? vo.getAddvcd() : "", style); + ExcelUtils.formatCell(row, 4, "", style); + ExcelUtils.formatCell(row, 5, vo.getYr() != null ? vo.getYr().toString() : "", style); + ExcelUtils.formatCell(row, 6, vo.getP() != null ? vo.getP().toString() : "", style); + ExcelUtils.formatCell(row, 7, vo.getPrcd() != null ? vo.getPrcd() : "", style); + ExcelUtils.formatCell(row, 8, vo.getPdynum() != null ? vo.getPdynum() : "", style); + ExcelUtils.formatCell(row, 9, vo.getPdynumrcd() != null ? vo.getPdynumrcd() : "", style); + ExcelUtils.formatCell(row, 10, vo.getFrdsdt() != null ? vo.getFrdsdt().toString() : "", style); + ExcelUtils.formatCell(row, 11, vo.getFrapdt() != null ? vo.getFrapdt().toString() : "", style); + ExcelUtils.formatCell(row, 12, vo.getSndsdt() != null ? vo.getSndsdt().toString() : "", style); + ExcelUtils.formatCell(row, 13, vo.getSnapdt() != null ? vo.getSnapdt().toString() : "", style); + rowIndex++; + } + } + } + + public int dataModel1(Map map, Sheet sheet, CellStyle style) { + // 批量查询数据 + IPage hyYrpFVoIPage = this.baseMapper.selectHyMtpDataByPageAndInfo(new Query().getPage(map), map); + List records = hyYrpFVoIPage.getRecords(); + + // 定义当前sheet的行号 + int rowIndex = 2; // 从第二行开始写入数据 + // 定义全局序号 + int globalIndex = 1; // 从1开始 + + // 定义当前sheet的编号 + int sheetIndex = 1; + + // 最大行数限制 + int maxRowsPerSheet = 65536; // 对于 .xls 文件，最大行数为 65536 + int batchSize = 1000; // 每次批量处理1000行，减少逐行写入的开销 + + // 复制表头到新sheet的逻辑 + ExcelUtils.copyHeader(sheet, style); + + // 批量处理数据 + for (int i = 0; i < records.size(); i += batchSize) { + // 处理一批数据 + int toIndex = Math.min(i + batchSize, records.size()); + List batchList = records.subList(i, toIndex); + + // 批量写入数据 + for (HyYrpFVo vo : batchList) { + // 如果当前行数达到最大行数，创建新sheet + if (rowIndex >= maxRowsPerSheet) { + sheetIndex++; + sheet = sheet.getWorkbook().createSheet("小时时段最大降水量表" + sheetIndex); + rowIndex = 2; // 重置行号 + // 复制表头到新sheet + ExcelUtils.copyHeader(sheet, style); + } + + // 创建新行并写入数据 + Row row = ExcelUtils.createRow(sheet, rowIndex); + + // 使用 globalIndex 作为序号 + ExcelUtils.formatCell(row, 0, String.valueOf(globalIndex), style); + ExcelUtils.formatCell(row, 1, vo.getStcd() != null ? vo.getStcd() : "", style); + ExcelUtils.formatCell(row, 2, vo.getStnm() != null ? vo.getStnm() : "", style); + ExcelUtils.formatCell(row, 3, vo.getAddvcd() != null ? vo.getAddvcd() : "", style); + ExcelUtils.formatCell(row, 4, "", style); + ExcelUtils.formatCell(row, 5, vo.getYr() != null ? vo.getYr().toString() : "", style); + ExcelUtils.formatCell(row, 6, vo.getP() != null ? vo.getP().toString() : "", style); + ExcelUtils.formatCell(row, 7, vo.getPrcd() != null ? vo.getPrcd() : "", style); + ExcelUtils.formatCell(row, 8, vo.getPdynum() != null ? vo.getPdynum() : "", style); + ExcelUtils.formatCell(row, 9, vo.getPdynumrcd() != null ? vo.getPdynumrcd() : "", style); + ExcelUtils.formatCell(row, 10, vo.getFrdsdt() != null ? vo.getFrdsdt().toString() : "", style); + ExcelUtils.formatCell(row, 11, vo.getFrapdt() != null ? vo.getFrapdt().toString() : "", style); + ExcelUtils.formatCell(row, 12, vo.getSndsdt() != null ? vo.getSndsdt().toString() : "", style); + ExcelUtils.formatCell(row, 13, vo.getSnapdt() != null ? vo.getSnapdt().toString() : "", style); + + // 增加行号和全局序号 + rowIndex++; + globalIndex++; + } + } + return 0; + } + + +} + + + + diff --git a/swlscx/src/main/java/com/ruoyi/swlscx/year/service/impl/HyYrqFServiceImpl.java b/swlscx/src/main/java/com/ruoyi/swlscx/year/service/impl/HyYrqFServiceImpl.java new file mode 100644 index 0000000..1f17039 --- /dev/null +++ b/swlscx/src/main/java/com/ruoyi/swlscx/year/service/impl/HyYrqFServiceImpl.java @@ -0,0 +1,366 @@ +package com.ruoyi.swlscx.year.service.impl; + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.ruoyi.common.annotation.DataSource; +import com.ruoyi.common.config.RuoYiConfig; +import com.ruoyi.common.core.page.R; +import com.ruoyi.common.core.text.Convert; +import com.ruoyi.common.enums.DataSourceType; +import com.ruoyi.common.utils.DateUtils; +import com.ruoyi.common.utils.SecurityUtils; +import com.ruoyi.swlscx.basic.domain.po.YcExportTask; +import com.ruoyi.swlscx.basic.service.YcExportTaskService; +import com.ruoyi.swlscx.common.PageParams; +import com.ruoyi.swlscx.year.domain.bo.HyYrqFBo; +import com.ruoyi.swlscx.year.domain.po.HyHmxpF; +import com.ruoyi.swlscx.year.domain.po.HyYrqF; +import com.ruoyi.swlscx.year.domain.vo.HyHmxpFVo; +import com.ruoyi.swlscx.year.domain.vo.HyYrqFVo; +import com.ruoyi.swlscx.year.mapper.HyYrqFMapper; +import com.ruoyi.swlscx.year.service.HyYrqFService; +import com.ruoyi.swlscx.common.utils.CommonUtils; +import com.ruoyi.swlscx.common.utils.ExcelUtils; +import com.ruoyi.swlscx.common.utils.Query; +import org.apache.commons.lang3.ObjectUtils; +import org.apache.poi.ss.usermodel.CellStyle; +import org.apache.poi.ss.usermodel.Row; +import org.apache.poi.ss.usermodel.Sheet; +import org.springframework.beans.BeanUtils; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.context.ApplicationContext; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; +import org.springframework.web.multipart.MultipartFile; + +import javax.annotation.Resource; +import javax.servlet.http.HttpServletResponse; +import java.io.File; +import java.util.*; +import java.util.concurrent.CompletableFuture; +import java.util.concurrent.ThreadPoolExecutor; +import java.util.stream.Collectors; + +/** +* @author 12974 +* @description 针对表【hy_yrq_f(年流量表)】的数据库操作Service实现 +* @createDate 2024-09-05 16:53:36 +*/ +@Service +public class HyYrqFServiceImpl extends ServiceImpl + implements HyYrqFService { + + @Resource + private ThreadPoolExecutor labelThreadPool; + + @Resource + private YcExportTaskService ycExportTaskService; + + /** + * 年流量表 + */ + @Override + @Transactional(rollbackFor = Exception.class) + public void importHyYrpFData(MultipartFile file) { + try { + List hyYrqFBos = ExcelUtils.readExcel(file.getInputStream(), HyYrqFBo.class, 2); + List hyYrpFList = hyYrqFBos.stream().map(i -> { + HyYrqF hyYrqF = new HyYrqF(); + BeanUtils.copyProperties(i, hyYrqF); + hyYrqF.setYr(Convert.toInt(i.getYr())); + hyYrqF.setAvq(Convert.toBigDecimal(i.getAvq())); + hyYrqF.setMxq(Convert.toBigDecimal(i.getMxq())); + hyYrqF.setMxqdt(DateUtils.parseDate(i.getMxqdt())); + hyYrqF.setMnq(Convert.toBigDecimal(i.getMnq())); + hyYrqF.setMnqdt(DateUtils.parseDate(i.getMnqdt())); + hyYrqF.setRw(Convert.toBigDecimal(i.getRw())); + hyYrqF.setRm(Convert.toBigDecimal(i.getRm())); + hyYrqF.setRd(Convert.toBigDecimal(i.getRd())); + return hyYrqF; + }).collect(Collectors.toList()); + this.saveBatch(hyYrpFList,10000); + } catch (Exception e) { + e.printStackTrace(); + } + } + + @Override + public IPage selecHyYrqFListPageByInfo(PageParams pageParams, String startTime, String endTime, String stcd, String stnm) { + Map map = CommonUtils.getYearAndDayDataMap(pageParams, startTime, endTime, stcd, stnm); + return this.baseMapper.selectHyMtqEPageByInfo(new Query().getPage(map), map); + } + + @Override + public R exportYearFlowList(HttpServletResponse response, String startTime, String endTime, String stcd, String stnm) { + + Long userId = SecurityUtils.getUserId(); + String tableName = "年流量表"; + return taskAndExport(tableName,startTime, endTime, stcd, stnm, userId); + + } + + @Resource + private ThreadPoolExecutor importThreadPool; + + @Autowired + private ApplicationContext context; + + /** + * 从mysql导入到sqlserver中 + */ + @Transactional(rollbackFor = Exception.class) + @DataSource(DataSourceType.SHARDING) + public void importMysqlToSqlserver(List hyYrqFVoList) { + List records = hyYrqFVoList.stream().map(i->{ + HyYrqF hyYrqF = new HyYrqF(); + BeanUtils.copyProperties(i, hyYrqF); + hyYrqF.setYr(Convert.toInt(i.getYr())); + hyYrqF.setAvq(Convert.toBigDecimal(i.getAvq())); + hyYrqF.setMxq(Convert.toBigDecimal(i.getMxq())); + hyYrqF.setMxqdt(DateUtils.parseDate(i.getMxqdt())); + hyYrqF.setMnq(Convert.toBigDecimal(i.getMnq())); + hyYrqF.setMnqdt(DateUtils.parseDate(i.getMnqdt())); + hyYrqF.setRw(Convert.toBigDecimal(i.getRw())); + hyYrqF.setRm(Convert.toBigDecimal(i.getRm())); + hyYrqF.setRd(Convert.toBigDecimal(i.getRd())); + return hyYrqF; + }).collect(Collectors.toList()); + //先清空临时表的数据 + this.baseMapper.deleteTempData(); + //插入临时表数据 + int batchSize = 50; + for (int i = 0; i < records.size(); i += batchSize) { + int end = Math.min(i + batchSize, records.size()); + List batch = records.subList(i, end); + // 执行批量插入 + this.baseMapper.insertTempData(batch); + } + //从临时表增或修改主表 + this.baseMapper.mergeToData(); + } + + + @Override + public R importDateTosoft(String startTime, String endTime) { + Long userId = SecurityUtils.getUserId(); + String filename = "年水位表" + startTime + "-" + endTime+"导入到南方片"; + // 查询是否已存在相同条件且未完成的任务 + List ongoingTasks = ycExportTaskService.list( + new QueryWrapper() + .eq("user_id", userId) + .eq("status", 0) // 状态为0表示任务未完成 + .like("filename", "年水位表")); + if (!ongoingTasks.isEmpty()) { + return R.error("当前任务正在下载中，请稍后重试"); + } + YcExportTask ycExportTask = new YcExportTask(); + ycExportTask.setFilename(filename); + ycExportTask.setUserId(userId); + ycExportTask.setStartTime(new Date()); + ycExportTask.setStatus(0); + ycExportTaskService.save(ycExportTask); + CompletableFuture.runAsync(() -> { + try { + IPage pageByInfo = this.selecHyYrqFListPageByInfo(new PageParams(0L, 1000000000L), startTime, endTime, null, null); +// IPage pageByInfo = this.selectMaxHRainListPageByInfo(new PageParams(0L, 1000000000L), null, null, startTime, endTime); + HyYrqFServiceImpl hyYrqFService = context.getBean(HyYrqFServiceImpl.class); + hyYrqFService.importMysqlToSqlserver(pageByInfo.getRecords()); + ycExportTask.setStatus(2); + } catch (Exception e) { + ycExportTask.setStatus(4); + log.error(e.getMessage()); + R.error("任务下载失败"); + }finally { + ycExportTask.setEndTime(new Date()); + ycExportTaskService.updateById(ycExportTask); + } + }, importThreadPool); + return R.ok("任务已提交"); + } + + private R taskAndExport(String tableName,String startTime, String endTime, String stcd, String stnm, Long userId) { + String startNewTime=""; + String endNewTime=""; + if (ObjectUtils.isNotEmpty(startTime) ){ + startNewTime=startTime.substring(0,4); + } + if (ObjectUtils.isNotEmpty(endTime)){ + endNewTime=endTime.substring(0,4); + } + String filename = tableName + startNewTime + "-" + endNewTime; + // 查询是否已存在相同条件且未完成的任务 + List ongoingTasks = ycExportTaskService.list( + new QueryWrapper() + .eq("user_id", userId) + .eq("filename", filename) + .eq("status", 0) // 状态为0表示任务未完成 + ); + + if (!ongoingTasks.isEmpty()) { + return R.error("当前任务正在下载中，请稍后重试"); + } + + YcExportTask ycExportTask = new YcExportTask(); + String pathPeffix = RuoYiConfig.getExportPath() + + File.separator + userId + File.separator+ + DateUtils.parseDateToStr("yyyy-MM-dd",DateUtils.getNowDate()) + File.separator + + DateUtils.parseDateToStr("HH_mm",DateUtils.getNowDate())+File.separator; + ycExportTask.setFilename(filename); + ycExportTask.setUserId(userId); + ycExportTask.setStartTime(new Date()); + ycExportTask.setStatus(0); + ycExportTask.setFilepath(pathPeffix); + ycExportTaskService.save(ycExportTask); + CompletableFuture.runAsync(() -> { + try { + File dest = new File(pathPeffix); + if (!dest.exists()) { + dest.mkdirs(); + } + String fullPath = pathPeffix + filename; + exportBlackData(fullPath, startTime, endTime, stcd, stnm); + + ycExportTask.setStatus(1); + ycExportTask.setEndTime(new Date()); + ycExportTaskService.updateById(ycExportTask); + } catch (Exception e) { + log.error(e.getMessage(), e); + R.error("任务下载失败"); + } + }, labelThreadPool); + return R.ok("任务已提交，请稍后下载"); + } + + private void exportBlackData(String tableName, String startTime, String endTime, String stcd, String stnm) { + Map rainMap = CommonUtils.getYearAndDayDataMap(new PageParams(0L, 1000000000L), startTime, endTime, stcd, stnm); + ExcelUtils.excelBackExport2("yearFlow.xls", tableName, (Sheet sheet, CellStyle style) -> + dataModel1(rainMap, sheet, style)); + } + + public int dataModel1(Map map, Sheet sheet, CellStyle style) { + // 批量查询数据 + IPage hyYrqFVoIPage = this.baseMapper.selectHyMtqEPageByInfo(new Query().getPage(map), map); + List records = hyYrqFVoIPage.getRecords(); + + // 定义当前sheet的行号 + int rowIndex = 2; // 从第二行开始写入数据 + // 定义全局序号 + int globalIndex = 1; // 从1开始 + + // 定义当前sheet的编号 + int sheetIndex = 1; + + // 最大行数限制 + int maxRowsPerSheet = 65536; // 对于 .xls 文件，最大行数为 65536 + int batchSize = 1000; // 每次批量处理1000行，减少逐行写入的开销 + + // 复制表头到新sheet的逻辑 + ExcelUtils.copyHeader(sheet, style); + + // 批量处理数据 + for (int i = 0; i < records.size(); i += batchSize) { + // 处理一批数据 + int toIndex = Math.min(i + batchSize, records.size()); + List batchList = records.subList(i, toIndex); + + // 批量写入数据 + for (HyYrqFVo vo : batchList) { + // 如果当前行数达到最大行数，创建新sheet + if (rowIndex >= maxRowsPerSheet) { + sheetIndex++; + sheet = sheet.getWorkbook().createSheet("年流量表" + sheetIndex); + rowIndex = 2; // 重置行号 + // 复制表头到新sheet + ExcelUtils.copyHeader(sheet, style); + } + + // 创建新行并写入数据 + Row row = ExcelUtils.createRow(sheet, rowIndex); + + // 使用 globalIndex 作为序号 + ExcelUtils.formatCell(row, 0, String.valueOf(globalIndex), style); + ExcelUtils.formatCell(row, 1, vo.getStcd() != null ? vo.getStcd() : "", style); + ExcelUtils.formatCell(row, 2, vo.getStnm() != null ? vo.getStnm() : "", style); + ExcelUtils.formatCell(row, 3, vo.getAddvcd() != null ? vo.getAddvcd() : "", style); + ExcelUtils.formatCell(row, 4, "",style); + ExcelUtils.formatCell(row, 5, vo.getYr() != null ? vo.getYr().toString() : "", style); + ExcelUtils.formatCell(row, 6, vo.getAvq() != null ? CommonUtils.formatNum(vo.getAvq()) : "", style); + ExcelUtils.formatCell(row, 7, vo.getAvqrcd() != null ? vo.getAvqrcd() : "", style); + ExcelUtils.formatCell(row, 8, vo.getMxq() != null ? CommonUtils.formatNum(vo.getMxq()) : "", style); + ExcelUtils.formatCell(row, 9, vo.getMxqrcd() != null ? vo.getMxqrcd() : "", style); + ExcelUtils.formatCell(row, 10, vo.getMxqdt() != null ? vo.getMxqdt() : "", style); + ExcelUtils.formatCell(row, 11, vo.getMnq() != null ? CommonUtils.formatNum(vo.getMnq()) : "", style); + ExcelUtils.formatCell(row, 12, vo.getMnqrcd() != null ? vo.getMnqrcd() : "", style); + ExcelUtils.formatCell(row, 13, vo.getMnqdt() != null ? vo.getMnqdt() : "", style); + ExcelUtils.formatCell(row, 14, vo.getRw() != null ? CommonUtils.formatNum(vo.getRw()) : "", style); + ExcelUtils.formatCell(row, 15, vo.getRwrcd() != null ? vo.getRwrcd() : "", style); + ExcelUtils.formatCell(row, 16, vo.getRm() != null ? CommonUtils.formatNum(vo.getRm()) : "", style); + ExcelUtils.formatCell(row, 17, vo.getRd() != null ? CommonUtils.formatNum(vo.getRd()) : "", style); + ExcelUtils.formatCell(row, 18, "", style); + // 增加行号和全局序号 + rowIndex++; + globalIndex++; + } + } + return 0; + } + + + public void dataModel(Map map, Sheet sheet, CellStyle style) { + // 批量查询数据 + IPage hyYrqFVoIPage = this.baseMapper.selectHyMtqEPageByInfo(new Query().getPage(map), map); + List records = hyYrqFVoIPage.getRecords(); + // 定义当前sheet的行号 + int rowIndex = 2; + // 定义当前sheet的编号 + int sheetIndex = 1; + Row row; + // 最大行数限制 + int maxRowsPerSheet = 65536; // 对于 .xls 文件，最大行数为 65536 + int batchSize = 1000; // 每次批量处理1000行，减少逐行写入的开销 + // 批量处理数据 + for (int i = 0; i < records.size(); i += batchSize) { + // 处理一批数据 + int toIndex = Math.min(i + batchSize, records.size()); + List batchList = records.subList(i, toIndex); + // 批量写入数据 + for (HyYrqFVo vo : batchList) { + // 如果当前行数达到最大行数，创建新sheet + if (rowIndex >= maxRowsPerSheet) { + sheetIndex++; + sheet = sheet.getWorkbook().createSheet("小时时段最大降水量表" + sheetIndex); + rowIndex = 2; // 重置行号 + } + // 创建新行并写入数据 + row = ExcelUtils.createRow(sheet, rowIndex); + //序号 + ExcelUtils.formatCell(row, 0, String.valueOf(rowIndex - 1), style); + ExcelUtils.formatCell(row, 1, vo.getStcd() != null ? vo.getStcd() : "", style); + ExcelUtils.formatCell(row, 2, vo.getStnm() != null ? vo.getStnm() : "", style); + ExcelUtils.formatCell(row, 3, vo.getAddvcd() != null ? vo.getAddvcd() : "", style); + ExcelUtils.formatCell(row, 4, "",style); + ExcelUtils.formatCell(row, 5, vo.getYr() != null ? vo.getYr().toString() : "", style); + ExcelUtils.formatCell(row, 6, vo.getAvq() != null ? CommonUtils.formatNum(vo.getAvq()) : "", style); + ExcelUtils.formatCell(row, 7, vo.getAvqrcd() != null ? vo.getAvqrcd() : "", style); + ExcelUtils.formatCell(row, 8, vo.getMxq() != null ? CommonUtils.formatNum(vo.getMxq()) : "", style); + ExcelUtils.formatCell(row, 9, vo.getMxqrcd() != null ? vo.getMxqrcd() : "", style); + ExcelUtils.formatCell(row, 10, vo.getMxqdt() != null ? vo.getMxqdt() : "", style); + ExcelUtils.formatCell(row, 11, vo.getMnq() != null ? CommonUtils.formatNum(vo.getMnq()) : "", style); + ExcelUtils.formatCell(row, 12, vo.getMnqrcd() != null ? vo.getMnqrcd() : "", style); + ExcelUtils.formatCell(row, 13, vo.getMnqdt() != null ? vo.getMnqdt() : "", style); + ExcelUtils.formatCell(row, 14, vo.getRw() != null ? CommonUtils.formatNum(vo.getRw()) : "", style); + ExcelUtils.formatCell(row, 15, vo.getRwrcd() != null ? vo.getRwrcd() : "", style); + ExcelUtils.formatCell(row, 16, vo.getRm() != null ? CommonUtils.formatNum(vo.getRm()) : "", style); + ExcelUtils.formatCell(row, 17, vo.getRd() != null ? CommonUtils.formatNum(vo.getRd()) : "", style); + ExcelUtils.formatCell(row, 18, "", style); + rowIndex++; + } + } + } +} + + + + diff --git a/swlscx/src/main/java/com/ruoyi/swlscx/year/service/impl/HyYrqsFServiceImpl.java b/swlscx/src/main/java/com/ruoyi/swlscx/year/service/impl/HyYrqsFServiceImpl.java new file mode 100644 index 0000000..f8cbde7 --- /dev/null +++ b/swlscx/src/main/java/com/ruoyi/swlscx/year/service/impl/HyYrqsFServiceImpl.java @@ -0,0 +1,371 @@ +package com.ruoyi.swlscx.year.service.impl; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.ruoyi.common.annotation.DataSource; +import com.ruoyi.common.config.RuoYiConfig; +import com.ruoyi.common.core.page.R; +import com.ruoyi.common.core.text.Convert; +import com.ruoyi.common.enums.DataSourceType; +import com.ruoyi.common.utils.DateUtils; +import com.ruoyi.common.utils.SecurityUtils; +import com.ruoyi.swlscx.basic.domain.po.YcExportTask; +import com.ruoyi.swlscx.basic.service.YcExportTaskService; +import com.ruoyi.swlscx.common.PageParams; +import com.ruoyi.swlscx.year.domain.bo.HyYrqsFBo; +import com.ruoyi.swlscx.year.domain.po.HyYrqsF; +import com.ruoyi.swlscx.year.domain.vo.HyYrqsFVo; +import com.ruoyi.swlscx.year.mapper.HyYrqsFMapper; +import com.ruoyi.swlscx.year.service.HyYrqsFService; +import com.ruoyi.swlscx.common.utils.CommonUtils; +import com.ruoyi.swlscx.common.utils.ExcelUtils; +import com.ruoyi.swlscx.common.utils.Query; +import org.apache.commons.lang3.ObjectUtils; +import org.apache.poi.ss.usermodel.CellStyle; +import org.apache.poi.ss.usermodel.Row; +import org.apache.poi.ss.usermodel.Sheet; +import org.springframework.beans.BeanUtils; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.context.ApplicationContext; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; +import org.springframework.web.multipart.MultipartFile; + +import javax.annotation.Resource; +import javax.servlet.http.HttpServletResponse; +import java.io.File; +import java.util.Date; +import java.util.List; +import java.util.Map; +import java.util.concurrent.CompletableFuture; +import java.util.concurrent.ThreadPoolExecutor; +import java.util.stream.Collectors; + +/** +* @author 12974 +* @description 针对表【hy_yrqs_f(年输沙率表)】的数据库操作Service实现 +* @createDate 2024-09-05 16:53:36 +*/ +@Service +public class HyYrqsFServiceImpl extends ServiceImpl + implements HyYrqsFService { + + @Resource + private ThreadPoolExecutor labelThreadPool; + + @Resource + private YcExportTaskService ycExportTaskService; + + @Override + @Transactional(rollbackFor = Exception.class) + public void importHyYrqsFData(MultipartFile file) { + try { + List hyYrqsFBos = ExcelUtils.readExcel(file.getInputStream(), HyYrqsFBo.class, 2); + List hyYrpFList = hyYrqsFBos.stream().map(i -> { + HyYrqsF hyYrqsF = new HyYrqsF(); + BeanUtils.copyProperties(i, hyYrqsF); + hyYrqsF.setYr(Convert.toInt(i.getYr())); + hyYrqsF.setAvqs(Convert.toBigDecimal(i.getAvqs())); + hyYrqsF.setMxdyqs(Convert.toBigDecimal(i.getMxdyqs())); + hyYrqsF.setMxdyqsodt(DateUtils.parseDate(i.getMxdyqsodt())); + hyYrqsF.setSw(Convert.toBigDecimal(i.getSw())); + hyYrqsF.setSm(Convert.toBigDecimal(i.getSm())); + hyYrqsF.setSmec(Convert.toBigDecimal(i.getSmec())); + return hyYrqsF; + }).collect(Collectors.toList()); + this.saveBatch(hyYrpFList, 10000); + } catch (Exception e) { + e.printStackTrace(); + } + } + + /** + * 查询年输沙率表数据 + */ + @Override + public IPage getYearsedimentTransportRateList(PageParams pageParams, String startTime, String endTime, String stcd, String stnm) { + Map map = CommonUtils.getYearAndDayDataMap(pageParams, startTime, endTime, stcd, stnm); + return this.baseMapper.selectHyYrqFPageByInfo(new Query().getPage(map), map); + + } + + /** + * 导出年输沙率表 + */ + @Override + public R exportSedimentTransportRateList(HttpServletResponse response, String startTime, String endTime, String stcd, String stnm) { + + Long userId = SecurityUtils.getUserId(); + String tableName = "年输沙率表"; + return taskAndExport(tableName,startTime, endTime, stcd, stnm, userId); + +// +// Map rainMap = CommonUtils.getYearAndDayDataMap(new PageParams(0L, 100000L), startTime, endTime, stcd, stnm); +// ExcelUtils.excelExport(response, "sedimentTransportRate.xls", "年输沙率表", (Sheet sheet, CellStyle style) -> { +// dataModel(rainMap, sheet, style); +// }); + } + + @Resource + private ThreadPoolExecutor importThreadPool; + + @Autowired + private ApplicationContext context; + + /** + * 从mysql导入到sqlserver中 + */ + @Transactional(rollbackFor = Exception.class) + @DataSource(DataSourceType.SHARDING) + public void importMysqlToSqlserver(List hyYrqsFVoList) { + List records = hyYrqsFVoList.stream().map(i->{ + HyYrqsF hyYrqsF = new HyYrqsF(); + BeanUtils.copyProperties(i, hyYrqsF); + hyYrqsF.setYr(Convert.toInt(i.getYr())); + hyYrqsF.setAvqs(Convert.toBigDecimal(i.getAvqs())); + hyYrqsF.setMxdyqs(Convert.toBigDecimal(i.getMxdyqs())); + hyYrqsF.setMxdyqsodt(DateUtils.parseDate(i.getMxdyqsodt())); + hyYrqsF.setSw(Convert.toBigDecimal(i.getSw())); + hyYrqsF.setSm(Convert.toBigDecimal(i.getSm())); + hyYrqsF.setSmec(Convert.toBigDecimal(i.getSmec())); + return hyYrqsF; + }).collect(Collectors.toList()); + //先清空临时表的数据 + this.baseMapper.deleteTempData(); + //插入临时表数据 + int batchSize = 50; + for (int i = 0; i < records.size(); i += batchSize) { + int end = Math.min(i + batchSize, records.size()); + List batch = records.subList(i, end); + // 执行批量插入 + this.baseMapper.insertTempData(batch); + } + //从临时表增或修改主表 + this.baseMapper.mergeToData(); + } + + @Override + public R importDateTosoft(String startTime, String endTime) { + Long userId = SecurityUtils.getUserId(); + String filename = "年输沙率表" + startTime + "-" + endTime+"导入到南方片"; + // 查询是否已存在相同条件且未完成的任务 + List ongoingTasks = ycExportTaskService.list( + new QueryWrapper() + .eq("user_id", userId) + .eq("status", 0) // 状态为0表示任务未完成 + .like("filename", "年输沙率表")); + if (!ongoingTasks.isEmpty()) { + return R.error("当前任务正在下载中，请稍后重试"); + } + YcExportTask ycExportTask = new YcExportTask(); + ycExportTask.setFilename(filename); + ycExportTask.setUserId(userId); + ycExportTask.setStartTime(new Date()); + ycExportTask.setStatus(0); + ycExportTaskService.save(ycExportTask); + CompletableFuture.runAsync(() -> { + try { + IPage pageByInfo = this.getYearsedimentTransportRateList(new PageParams(0L, 1000000000L), startTime, endTime, null, null); +// IPage pageByInfo = this.selectMaxHRainListPageByInfo(new PageParams(0L, 1000L), null, null, startTime, endTime); + HyYrqsFServiceImpl hyYrqsFService = context.getBean(HyYrqsFServiceImpl.class); + hyYrqsFService.importMysqlToSqlserver(pageByInfo.getRecords()); + ycExportTask.setStatus(2); + } catch (Exception e) { + ycExportTask.setStatus(4); + log.error(e.getMessage()); + R.error("任务下载失败"); + }finally { + ycExportTask.setEndTime(new Date()); + ycExportTaskService.updateById(ycExportTask); + } + }, importThreadPool); + return R.ok("任务已提交"); + } + + + private R taskAndExport(String tableName,String startTime, String endTime, String stcd, String stnm, Long userId) { + String startNewTime=""; + String endNewTime=""; + if (ObjectUtils.isNotEmpty(startTime) ){ + startNewTime=startTime.substring(0,4); + } + if (ObjectUtils.isNotEmpty(endTime)){ + endNewTime=endTime.substring(0,4); + } + String filename = tableName + startNewTime + "-" + endNewTime; + // 查询是否已存在相同条件且未完成的任务 + List ongoingTasks = ycExportTaskService.list( + new QueryWrapper() + .eq("user_id", userId) + .eq("filename", filename) + .eq("status", 0) // 状态为0表示任务未完成 + ); + + if (!ongoingTasks.isEmpty()) { + return R.error("当前任务正在下载中，请稍后重试"); + } + + YcExportTask ycExportTask = new YcExportTask(); + String pathPeffix = RuoYiConfig.getExportPath() + + File.separator + userId + File.separator+ + DateUtils.parseDateToStr("yyyy-MM-dd",DateUtils.getNowDate()) + File.separator + + DateUtils.parseDateToStr("HH_mm",DateUtils.getNowDate())+File.separator; + ycExportTask.setFilename(filename); + ycExportTask.setUserId(userId); + ycExportTask.setStartTime(new Date()); + ycExportTask.setStatus(0); + ycExportTask.setFilepath(pathPeffix); + ycExportTaskService.save(ycExportTask); + CompletableFuture.runAsync(() -> { + try { + File dest = new File(pathPeffix); + if (!dest.exists()) { + dest.mkdirs(); + } + String fullPath = pathPeffix + filename; + exportBlackData(fullPath, startTime, endTime, stcd, stnm); + + ycExportTask.setStatus(1); + ycExportTask.setEndTime(new Date()); + ycExportTaskService.updateById(ycExportTask); + } catch (Exception e) { + log.error(e.getMessage(), e); + R.error("任务下载失败"); + } + }, labelThreadPool); + return R.ok("任务已提交，请稍后下载"); + } + + + private void exportBlackData(String tableName, String startTime, String endTime, String stcd, String stnm) { + Map rainMap = CommonUtils.getYearAndDayDataMap(new PageParams(0L, 1000000000L), startTime, endTime, stcd, stnm); + ExcelUtils.excelBackExport2("sedimentTransportRate.xls", tableName, (Sheet sheet, CellStyle style) -> + dataModel1(rainMap, sheet, style)); + } + + public int dataModel1(Map map, Sheet sheet, CellStyle style) { + // 批量查询数据 + IPage hyYrqsFVoIPage = this.baseMapper.selectHyYrqFPageByInfo(new Query().getPage(map), map); + List records = hyYrqsFVoIPage.getRecords(); + + // 定义当前sheet的行号 + int rowIndex = 2; // 从第二行开始写入数据 + // 定义全局序号 + int globalIndex = 1; // 从1开始 + + // 定义当前sheet的编号 + int sheetIndex = 1; + + // 最大行数限制 + int maxRowsPerSheet = 65536; // 对于 .xls 文件，最大行数为 65536 + int batchSize = 1000; // 每次批量处理1000行，减少逐行写入的开销 + + // 复制表头到新sheet的逻辑 + ExcelUtils.copyHeader(sheet, style); + + // 批量处理数据 + for (int i = 0; i < records.size(); i += batchSize) { + // 处理一批数据 + int toIndex = Math.min(i + batchSize, records.size()); + List batchList = records.subList(i, toIndex); + + // 批量写入数据 + for (HyYrqsFVo vo : batchList) { + // 如果当前行数达到最大行数，创建新sheet + if (rowIndex >= maxRowsPerSheet) { + sheetIndex++; + sheet = sheet.getWorkbook().createSheet("年输沙率表" + sheetIndex); + rowIndex = 2; // 重置行号 + // 复制表头到新sheet + ExcelUtils.copyHeader(sheet, style); + } + + // 创建新行并写入数据 + Row row = ExcelUtils.createRow(sheet, rowIndex); + + // 使用 globalIndex 作为序号 + ExcelUtils.formatCell(row, 0, String.valueOf(globalIndex), style); + ExcelUtils.formatCell(row, 1, vo.getStcd() != null ? vo.getStcd() : "", style); + ExcelUtils.formatCell(row, 2, vo.getStnm() != null ? vo.getStnm() : "", style); + ExcelUtils.formatCell(row, 3, vo.getAddvcd() != null ? vo.getAddvcd() : "", style); + ExcelUtils.formatCell(row, 4, "",style); + ExcelUtils.formatCell(row, 5, vo.getYr() != null ? vo.getYr().toString() : "", style); + ExcelUtils.formatCell(row, 6, vo.getSdtp() != null ? vo.getSdtp() : "", style); + ExcelUtils.formatCell(row, 7, vo.getAvqs() != null ? CommonUtils.formatNum(vo.getAvqs()) : "", style); + ExcelUtils.formatCell(row, 8, vo.getAvqsrcd() != null ? vo.getAvqsrcd() : "", style); + ExcelUtils.formatCell(row, 9, vo.getMxdyqs() != null ? CommonUtils.formatNum(vo.getMxdyqs()) : "", style); + ExcelUtils.formatCell(row, 10, vo.getMxdyqsrcd() != null ? vo.getMxdyqsrcd() : "", style); + ExcelUtils.formatCell(row, 11, vo.getMxdyqsodt() != null ? vo.getMxdyqsodt() : "", style); + ExcelUtils.formatCell(row, 12, vo.getSw() != null ? CommonUtils.formatNum(vo.getSw()) : "", style); + ExcelUtils.formatCell(row, 13, vo.getSwpc() != null ? vo.getSwpc() : "", style); + ExcelUtils.formatCell(row, 14, vo.getSm() != null ? CommonUtils.formatNum(vo.getSm()) : "", style); + ExcelUtils.formatCell(row, 15, vo.getSimn() != null ? vo.getSimn() : "", style); + ExcelUtils.formatCell(row, 16, vo.getSmec() != null ? CommonUtils.formatNum(vo.getSmec()) : "", style); + ExcelUtils.formatCell(row, 17, vo.getNt() != null ? vo.getNt() : "", style); + ExcelUtils.formatCell(row, 18, "", style); + + // 增加行号和全局序号 + rowIndex++; + globalIndex++; + } + } + return 0; + } + + public void dataModel(Map map, Sheet sheet, CellStyle style) { + // 批量查询数据 + IPage hyYrqsFVoIPage = this.baseMapper.selectHyYrqFPageByInfo(new Query().getPage(map), map); + List records = hyYrqsFVoIPage.getRecords(); + // 定义当前sheet的行号 + int rowIndex = 2; + // 定义当前sheet的编号 + int sheetIndex = 1; + Row row; + // 最大行数限制 + int maxRowsPerSheet = 65536; // 对于 .xls 文件，最大行数为 65536 + int batchSize = 1000; // 每次批量处理1000行，减少逐行写入的开销 + // 批量处理数据 + for (int i = 0; i < records.size(); i += batchSize) { + // 处理一批数据 + int toIndex = Math.min(i + batchSize, records.size()); + List batchList = records.subList(i, toIndex); + // 批量写入数据 + for (HyYrqsFVo vo : batchList) { + // 如果当前行数达到最大行数，创建新sheet + if (rowIndex >= maxRowsPerSheet) { + sheetIndex++; + sheet = sheet.getWorkbook().createSheet("小时时段最大降水量表" + sheetIndex); + rowIndex = 2; // 重置行号 + } + // 创建新行并写入数据 + row = ExcelUtils.createRow(sheet, rowIndex); + //序号 + ExcelUtils.formatCell(row, 0, String.valueOf(rowIndex - 1), style); + ExcelUtils.formatCell(row, 1, vo.getStcd() != null ? vo.getStcd() : "", style); + ExcelUtils.formatCell(row, 2, vo.getStnm() != null ? vo.getStnm() : "", style); + ExcelUtils.formatCell(row, 3, vo.getAddvcd() != null ? vo.getAddvcd() : "", style); + ExcelUtils.formatCell(row, 4, "",style); + ExcelUtils.formatCell(row, 5, vo.getYr() != null ? vo.getYr().toString() : "", style); + ExcelUtils.formatCell(row, 6, vo.getSdtp() != null ? vo.getSdtp() : "", style); + ExcelUtils.formatCell(row, 7, vo.getAvqs() != null ? CommonUtils.formatNum(vo.getAvqs()) : "", style); + ExcelUtils.formatCell(row, 8, vo.getAvqsrcd() != null ? vo.getAvqsrcd() : "", style); + ExcelUtils.formatCell(row, 9, vo.getMxdyqs() != null ? CommonUtils.formatNum(vo.getMxdyqs()) : "", style); + ExcelUtils.formatCell(row, 10, vo.getMxdyqsrcd() != null ? vo.getMxdyqsrcd() : "", style); + ExcelUtils.formatCell(row, 11, vo.getMxdyqsodt() != null ? vo.getMxdyqsodt() : "", style); + ExcelUtils.formatCell(row, 12, vo.getSw() != null ? CommonUtils.formatNum(vo.getSw()) : "", style); + ExcelUtils.formatCell(row, 13, vo.getSwpc() != null ? vo.getSwpc() : "", style); + ExcelUtils.formatCell(row, 14, vo.getSm() != null ? CommonUtils.formatNum(vo.getSm()) : "", style); + ExcelUtils.formatCell(row, 15, vo.getSimn() != null ? vo.getSimn() : "", style); + ExcelUtils.formatCell(row, 16, vo.getSmec() != null ? CommonUtils.formatNum(vo.getSmec()) : "", style); + ExcelUtils.formatCell(row, 17, vo.getNt() != null ? vo.getNt() : "", style); + ExcelUtils.formatCell(row, 18, "", style); + rowIndex++; + } + } + } +} + + + + diff --git a/swlscx/src/main/java/com/ruoyi/swlscx/year/service/impl/HyYrtdzFServiceImpl.java b/swlscx/src/main/java/com/ruoyi/swlscx/year/service/impl/HyYrtdzFServiceImpl.java new file mode 100644 index 0000000..80ed2f0 --- /dev/null +++ b/swlscx/src/main/java/com/ruoyi/swlscx/year/service/impl/HyYrtdzFServiceImpl.java @@ -0,0 +1,481 @@ +package com.ruoyi.swlscx.year.service.impl; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.ruoyi.common.annotation.DataSource; +import com.ruoyi.common.config.RuoYiConfig; +import com.ruoyi.common.core.page.R; +import com.ruoyi.common.core.text.Convert; +import com.ruoyi.common.enums.DataSourceType; +import com.ruoyi.common.utils.DateUtils; +import com.ruoyi.common.utils.SecurityUtils; +import com.ruoyi.common.utils.bean.BeanUtils; +import com.ruoyi.swlscx.basic.domain.po.YcExportTask; +import com.ruoyi.swlscx.basic.service.YcExportTaskService; +import com.ruoyi.swlscx.common.PageParams; +import com.ruoyi.swlscx.year.domain.bo.HyYrtdzFBo; +import com.ruoyi.swlscx.year.domain.po.HyHmxpF; +import com.ruoyi.swlscx.year.domain.po.HyYrtdzF; +import com.ruoyi.swlscx.year.domain.vo.HyHmxpFVo; +import com.ruoyi.swlscx.year.domain.vo.HyYrtdzFVo; +import com.ruoyi.swlscx.year.mapper.HyYrtdzFMapper; +import com.ruoyi.swlscx.year.service.HyYrtdzFService; +import com.ruoyi.swlscx.common.utils.CommonUtils; +import com.ruoyi.swlscx.common.utils.ExcelUtils; +import com.ruoyi.swlscx.common.utils.Query; +import org.apache.commons.lang3.ObjectUtils; +import org.apache.poi.ss.usermodel.CellStyle; +import org.apache.poi.ss.usermodel.Row; +import org.apache.poi.ss.usermodel.Sheet; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.context.ApplicationContext; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; +import org.springframework.web.multipart.MultipartFile; + +import javax.annotation.Resource; +import javax.servlet.http.HttpServletResponse; +import java.io.File; +import java.util.*; +import java.util.concurrent.CompletableFuture; +import java.util.concurrent.ThreadPoolExecutor; +import java.util.stream.Collectors; + +/** +* @author 12974 +* @description 针对表【hy_yrtdz_f(年潮位表)】的数据库操作Service实现 +* @createDate 2024-09-05 16:53:36 +*/ +@Service +public class HyYrtdzFServiceImpl extends ServiceImpl + implements HyYrtdzFService { + + @Resource + private ThreadPoolExecutor labelThreadPool; + + @Resource + private YcExportTaskService ycExportTaskService; + + + + /** + * 导入年潮位表表数据 + */ + @Override + @Transactional(rollbackFor = Exception.class) + public void importHyMmxpFData(MultipartFile file) { + try { + List hyYrtdzFBos = ExcelUtils.readExcel(file.getInputStream(), HyYrtdzFBo.class, 2); + // 获取数据 + List dataList = hyYrtdzFBos.parallelStream().map(i -> { + HyYrtdzF hyYrtdzF = new HyYrtdzF(); + BeanUtils.copyProperties(i, hyYrtdzF); + hyYrtdzF.setYr(Convert.toInt(i.getYr())); + hyYrtdzF.setAvhtdz(Convert.toBigDecimal(i.getAvhtdz())); + hyYrtdzF.setHthtdz(Convert.toBigDecimal(i.getHthtdz())); + hyYrtdzF.setHthtdzotm(DateUtils.parseDate(i.getHthtdzotm().split("\\.")[0])); + hyYrtdzF.setLthtdz(Convert.toBigDecimal(i.getLthtdz())); + hyYrtdzF.setLthtdzotm(DateUtils.parseDate(i.getLthtdzotm().split("\\.")[0])); + hyYrtdzF.setAvltdz(Convert.toBigDecimal(i.getAvltdz())); + hyYrtdzF.setHtltdz(Convert.toBigDecimal(i.getHtltdz())); + hyYrtdzF.setHtltdzotm(DateUtils.parseDate(i.getHtltdzotm().split("\\.")[0])); + hyYrtdzF.setLtltdz(Convert.toBigDecimal(i.getLtltdz())); + hyYrtdzF.setLtltdzotm(DateUtils.parseDate(i.getLtltdzotm().split("\\.")[0])); + hyYrtdzF.setAvftdr(Convert.toBigDecimal(i.getAvftdr())); + hyYrtdzF.setMxfltdr(Convert.toBigDecimal(i.getMxfltdr())); + hyYrtdzF.setMxfltdrhtm(DateUtils.parseDate(i.getMxfltdrhtm().split("\\.")[0])); + hyYrtdzF.setMnfltdr(Convert.toBigDecimal(i.getMnfltdr())); + hyYrtdzF.setMnfltdrhtm(DateUtils.parseDate(i.getMnfltdrhtm().split("\\.")[0])); + hyYrtdzF.setAver(Convert.toBigDecimal(i.getAver())); + hyYrtdzF.setMxebtdr(Convert.toBigDecimal(i.getMxebtdr())); + hyYrtdzF.setMxebtdrht(DateUtils.parseDate(i.getMxebtdrht().split("\\.")[0])); + hyYrtdzF.setMnebtdr(Convert.toBigDecimal(i.getMnebtdr())); + hyYrtdzF.setMnebtdrhtm(DateUtils.parseDate(i.getMnebtdrhtm().split("\\.")[0])); + hyYrtdzF.setAvftd(Convert.toInt(i.getAvftd())); + hyYrtdzF.setMxfltddr(Convert.toInt(i.getMxfltddr())); + hyYrtdzF.setMxfltddrhtm(DateUtils.parseDate(i.getMxfltddrhtm().split("\\.")[0])); + hyYrtdzF.setMnfltddr(Convert.toInt(i.getMnfltddr())); + hyYrtdzF.setMnfltddrhtm(DateUtils.parseDate(i.getMnfltddrhtm().split("\\.")[0])); + hyYrtdzF.setAvebbdr(Convert.toInt(i.getAvebbdr())); + hyYrtdzF.setMxebtddr(Convert.toInt(i.getMxebtddr())); + hyYrtdzF.setMxebtddrhtm(DateUtils.parseDate(i.getMxebtddrhtm().split("\\.")[0])); + hyYrtdzF.setMnbtddr(Convert.toInt(i.getMnbtddr())); + hyYrtdzF.setMnebtddrhtm(DateUtils.parseDate(i.getMnebtddrhtm().split("\\.")[0])); + hyYrtdzF.setHravtdz(Convert.toBigDecimal(i.getHravtdz())); + hyYrtdzF.setAvtdr(Convert.toBigDecimal(i.getAvtdr())); + hyYrtdzF.setAvtddr(Convert.toInt(i.getAvtddr())); + return hyYrtdzF; + }).collect(Collectors.toList()); + + this.saveBatch(dataList,10000); + } catch (Exception e) { + throw new RuntimeException(e); + } + } + + /** + * 查询年潮位表数据 + */ + @Override + public IPage selectHyYrtdzFListPageByInfo(PageParams pageParams, String startTime, String endTime, String stcd, String stnm) { + Map map = CommonUtils.getYearAndDayDataMap(pageParams, startTime, endTime, stcd, stnm); + return this.baseMapper.selectHyYrtdzFListPageByInfo(new Query().getPage(map), map); + } + + @Override + public R exportYearTideLeverList(HttpServletResponse response, String startTime, String endTime, String stcd, String stnm) { + + Long userId = SecurityUtils.getUserId(); + String tableName = "年潮位表"; + return taskAndExport(tableName,startTime, endTime, stcd, stnm, userId); +// +// Map rainMap = CommonUtils.getYearAndDayDataMap(new PageParams(0L, 100000L), startTime, endTime, stcd, stnm); +// ExcelUtils.excelExport(response, "yearTideLever.xls", "年潮位表", (Sheet sheet, CellStyle style) -> { +// dataModel(rainMap, sheet, style); +// }); + } + + @Resource + private ThreadPoolExecutor importThreadPool; + + @Autowired + private ApplicationContext context; + + /** + * 从mysql导入到sqlserver中 + */ + @Transactional(rollbackFor = Exception.class) + @DataSource(DataSourceType.SHARDING) + public void importMysqlToSqlserver(List hyYrtdzFVoList) { + List records = hyYrtdzFVoList.stream().map(i->{ + HyYrtdzF hyYrtdzF = new HyYrtdzF(); + BeanUtils.copyProperties(i, hyYrtdzF); + hyYrtdzF.setYr(Convert.toInt(i.getYr())); + hyYrtdzF.setAvhtdz(Convert.toBigDecimal(i.getAvhtdz())); + hyYrtdzF.setHthtdz(Convert.toBigDecimal(i.getHthtdz())); + hyYrtdzF.setHthtdzotm(DateUtils.parseDate(i.getHthtdzotm().split("\\.")[0])); + hyYrtdzF.setLthtdz(Convert.toBigDecimal(i.getLthtdz())); + hyYrtdzF.setLthtdzotm(DateUtils.parseDate(i.getLthtdzotm().split("\\.")[0])); + hyYrtdzF.setAvltdz(Convert.toBigDecimal(i.getAvltdz())); + hyYrtdzF.setHtltdz(Convert.toBigDecimal(i.getHtltdz())); + hyYrtdzF.setHtltdzotm(DateUtils.parseDate(i.getHtltdzotm().split("\\.")[0])); + hyYrtdzF.setLtltdz(Convert.toBigDecimal(i.getLtltdz())); + hyYrtdzF.setLtltdzotm(DateUtils.parseDate(i.getLtltdzotm().split("\\.")[0])); + hyYrtdzF.setAvftdr(Convert.toBigDecimal(i.getAvftdr())); + hyYrtdzF.setMxfltdr(Convert.toBigDecimal(i.getMxfltdr())); + hyYrtdzF.setMxfltdrhtm(DateUtils.parseDate(i.getMxfltdrhtm().split("\\.")[0])); + hyYrtdzF.setMnfltdr(Convert.toBigDecimal(i.getMnfltdr())); + hyYrtdzF.setMnfltdrhtm(DateUtils.parseDate(i.getMnfltdrhtm().split("\\.")[0])); + hyYrtdzF.setAver(Convert.toBigDecimal(i.getAver())); + hyYrtdzF.setMxebtdr(Convert.toBigDecimal(i.getMxebtdr())); + hyYrtdzF.setMxebtdrht(DateUtils.parseDate(i.getMxebtdrht().split("\\.")[0])); + hyYrtdzF.setMnebtdr(Convert.toBigDecimal(i.getMnebtdr())); + hyYrtdzF.setMnebtdrhtm(DateUtils.parseDate(i.getMnebtdrhtm().split("\\.")[0])); + hyYrtdzF.setAvftd(Convert.toInt(i.getAvftd())); + hyYrtdzF.setMxfltddr(Convert.toInt(i.getMxfltddr())); + hyYrtdzF.setMxfltddrhtm(DateUtils.parseDate(i.getMxfltddrhtm().split("\\.")[0])); + hyYrtdzF.setMnfltddr(Convert.toInt(i.getMnfltddr())); + hyYrtdzF.setMnfltddrhtm(DateUtils.parseDate(i.getMnfltddrhtm().split("\\.")[0])); + hyYrtdzF.setAvebbdr(Convert.toInt(i.getAvebbdr())); + hyYrtdzF.setMxebtddr(Convert.toInt(i.getMxebtddr())); + hyYrtdzF.setMxebtddrhtm(DateUtils.parseDate(i.getMxebtddrhtm().split("\\.")[0])); + hyYrtdzF.setMnbtddr(Convert.toInt(i.getMnbtddr())); + hyYrtdzF.setMnebtddrhtm(DateUtils.parseDate(i.getMnebtddrhtm().split("\\.")[0])); + hyYrtdzF.setHravtdz(Convert.toBigDecimal(i.getHravtdz())); + hyYrtdzF.setAvtdr(Convert.toBigDecimal(i.getAvtdr())); + hyYrtdzF.setAvtddr(Convert.toInt(i.getAvtddr())); + return hyYrtdzF; + }).collect(Collectors.toList()); + //先清空临时表的数据 + this.baseMapper.deleteTempData(); + //插入临时表数据 + int batchSize = 50; + for (int i = 0; i < records.size(); i += batchSize) { + int end = Math.min(i + batchSize, records.size()); + List batch = records.subList(i, end); + // 执行批量插入 + this.baseMapper.insertTempData(batch); + } + //从临时表增或修改主表 + this.baseMapper.mergeToData(); + } + + + @Override + public R importDateTosoft(String startTime, String endTime) { + return null; + } + + + private R taskAndExport(String tableName,String startTime, String endTime, String stcd, String stnm, Long userId) { + String startNewTime=""; + String endNewTime=""; + if (ObjectUtils.isNotEmpty(startTime) ){ + startNewTime=startTime.substring(0,4); + } + if (ObjectUtils.isNotEmpty(endTime)){ + endNewTime=endTime.substring(0,4); + } + String filename = tableName + startNewTime + "-" + endNewTime; + // 查询是否已存在相同条件且未完成的任务 + List ongoingTasks = ycExportTaskService.list( + new QueryWrapper() + .eq("user_id", userId) + .eq("filename", filename) + .eq("status", 0) // 状态为0表示任务未完成 + ); + + if (!ongoingTasks.isEmpty()) { + return R.error("当前任务正在下载中，请稍后重试"); + } + + YcExportTask ycExportTask = new YcExportTask(); + String pathPeffix = RuoYiConfig.getExportPath() + + File.separator + userId + File.separator+ + DateUtils.parseDateToStr("yyyy-MM-dd",DateUtils.getNowDate()) + File.separator + + DateUtils.parseDateToStr("HH_mm",DateUtils.getNowDate())+File.separator; + ycExportTask.setFilename(filename); + ycExportTask.setUserId(userId); + ycExportTask.setStartTime(new Date()); + ycExportTask.setStatus(0); + ycExportTask.setFilepath(pathPeffix); + ycExportTaskService.save(ycExportTask); + CompletableFuture.runAsync(() -> { + try { + File dest = new File(pathPeffix); + if (!dest.exists()) { + dest.mkdirs(); + } + String fullPath = pathPeffix + filename; + exportBlackData(fullPath, startTime, endTime, stcd, stnm); + + ycExportTask.setStatus(1); + ycExportTask.setEndTime(new Date()); + ycExportTaskService.updateById(ycExportTask); + } catch (Exception e) { + log.error(e.getMessage(), e); + R.error("任务下载失败"); + } + }, labelThreadPool); + return R.ok("任务已提交，请稍后下载"); + } + + + private void exportBlackData(String tableName, String startTime, String endTime, String stcd, String stnm) { + Map rainMap = CommonUtils.getYearAndDayDataMap(new PageParams(0L, 1000000000L), startTime, endTime, stcd, stnm); + ExcelUtils.excelBackExport2("yearTideLever.xls", tableName, (Sheet sheet, CellStyle style) -> + dataModel1(rainMap, sheet, style)); + } + + public int dataModel1(Map map, Sheet sheet, CellStyle style) { + // 批量查询数据 + IPage HyYrtdzFListPageByInfo = this.baseMapper.selectHyYrtdzFListPageByInfo(new Query().getPage(map), map); + List records = HyYrtdzFListPageByInfo.getRecords(); + + // 定义当前sheet的行号 + int rowIndex = 2; // 从第二行开始写入数据 + // 定义全局序号 + int globalIndex = 1; // 从1开始 + + // 定义当前sheet的编号 + int sheetIndex = 1; + + // 最大行数限制 + int maxRowsPerSheet = 65536; // 对于 .xls 文件，最大行数为 65536 + int batchSize = 1000; // 每次批量处理1000行，减少逐行写入的开销 + + // 复制表头到新sheet的逻辑 + ExcelUtils.copyHeader(sheet, style); + + // 批量处理数据 + for (int i = 0; i < records.size(); i += batchSize) { + // 处理一批数据 + int toIndex = Math.min(i + batchSize, records.size()); + List batchList = records.subList(i, toIndex); + + // 批量写入数据 + for (HyYrtdzFVo vo : batchList) { + // 如果当前行数达到最大行数，创建新sheet + if (rowIndex >= maxRowsPerSheet) { + sheetIndex++; + sheet = sheet.getWorkbook().createSheet("年潮位表" + sheetIndex); + rowIndex = 2; // 重置行号 + // 复制表头到新sheet + ExcelUtils.copyHeader(sheet, style); + } + + // 创建新行并写入数据 + Row row = ExcelUtils.createRow(sheet, rowIndex); + + // 使用 globalIndex 作为序号 + ExcelUtils.formatCell(row, 0, String.valueOf(globalIndex), style); + ExcelUtils.formatCell(row, 1, vo.getStcd() != null ? vo.getStcd() : "", style); + ExcelUtils.formatCell(row, 2, vo.getStnm() != null ? vo.getStnm() : "", style); + ExcelUtils.formatCell(row, 3, vo.getAddvcd() != null ? vo.getAddvcd() : "", style); + ExcelUtils.formatCell(row, 4, "", style); + ExcelUtils.formatCell(row, 5, vo.getYr() != null ? vo.getYr().toString() : "", style); + ExcelUtils.formatCell(row, 6, vo.getAvhtdz() != null ? CommonUtils.formatNum(vo.getAvhtdz()) : "", style); + ExcelUtils.formatCell(row, 7, vo.getAvhtdzrcd() != null ? vo.getAvhtdzrcd() : "", style); + ExcelUtils.formatCell(row, 8, vo.getHthtdz() != null ? CommonUtils.formatNum(vo.getHthtdz()) : "", style); + ExcelUtils.formatCell(row, 9, vo.getHthtdzrcd() != null ? vo.getHthtdzrcd() : "", style); + ExcelUtils.formatCell(row, 10, vo.getHthtdzotm() != null ? vo.getHthtdzotm() : "", style); + ExcelUtils.formatCell(row, 11, vo.getLthtdz() != null ? CommonUtils.formatNum(vo.getLthtdz()) : "", style); + ExcelUtils.formatCell(row, 12, vo.getLthtdzrcd() != null ? vo.getLthtdzrcd() : "", style); + ExcelUtils.formatCell(row, 13, vo.getLthtdzotm() != null ? vo.getLthtdzotm() : "", style); + ExcelUtils.formatCell(row, 14, vo.getAvltdz() != null ? CommonUtils.formatNum(vo.getAvltdz()) : "", style); + ExcelUtils.formatCell(row, 15, vo.getAvltdzrcd() != null ? vo.getAvltdzrcd() : "", style); + ExcelUtils.formatCell(row, 16, vo.getHtltdz() != null ? CommonUtils.formatNum(vo.getHtltdz()) : "", style); + ExcelUtils.formatCell(row, 17, vo.getHtltdzrcd() != null ? vo.getHtltdzrcd() : "", style); + ExcelUtils.formatCell(row, 18, vo.getHtltdzotm() != null ? vo.getHtltdzotm() : "", style); + ExcelUtils.formatCell(row, 19, vo.getLtltdz() != null ? CommonUtils.formatNum(vo.getLtltdz()) : "", style); + ExcelUtils.formatCell(row, 20, vo.getLtltdzrcd() != null ? vo.getLtltdzrcd() : "", style); + ExcelUtils.formatCell(row, 21, vo.getLtltdzotm() != null ? vo.getLtltdzotm() : "", style); + ExcelUtils.formatCell(row, 22, vo.getAvftdr() != null ? CommonUtils.formatNum(vo.getAvftdr()) : "", style); + ExcelUtils.formatCell(row, 23, vo.getAvftdrrcd() != null ? vo.getAvftdrrcd() : "", style); + ExcelUtils.formatCell(row, 24, vo.getMxfltdr() != null ? CommonUtils.formatNum(vo.getMxfltdr()) : "", style); + ExcelUtils.formatCell(row, 25, vo.getMxfltdrrcd() != null ? vo.getMxfltdrrcd() : "", style); + ExcelUtils.formatCell(row, 26, vo.getMxfltdrhtm() != null ? vo.getMxfltdrhtm() : "", style); + ExcelUtils.formatCell(row, 27, vo.getMnfltdr() != null ? CommonUtils.formatNum(vo.getMnfltdr()) : "", style); + ExcelUtils.formatCell(row, 28, vo.getMnfltdrrcd() != null ? vo.getMnfltdrrcd() : "", style); + ExcelUtils.formatCell(row, 29, vo.getMnfltdrhtm() != null ? vo.getMnfltdrhtm() : "", style); + ExcelUtils.formatCell(row, 30, vo.getAver() != null ? CommonUtils.formatNum(vo.getAver()) : "", style); + ExcelUtils.formatCell(row, 31, vo.getAverbbrrcd() != null ? vo.getAverbbrrcd() : "", style); + ExcelUtils.formatCell(row, 32, vo.getMxebtdr() != null ? CommonUtils.formatNum(vo.getMxebtdr()) : "", style); + ExcelUtils.formatCell(row, 33, vo.getMxebtdrrcd() != null ? vo.getMxebtdrrcd() : "", style); + ExcelUtils.formatCell(row, 34, vo.getMxebtdrht() != null ? vo.getMxebtdrht() : "", style); + ExcelUtils.formatCell(row, 35, vo.getMnebtdr() != null ? CommonUtils.formatNum(vo.getMnebtdr()) : "", style); + ExcelUtils.formatCell(row, 36, vo.getMnebtdrrcd() != null ? vo.getMnebtdrrcd() : "", style); + ExcelUtils.formatCell(row, 37, vo.getMnebtdrhtm() != null ? vo.getMnebtdrhtm() : "", style); + ExcelUtils.formatCell(row, 38, vo.getAvftd() != null ? vo.getAvftd().toString() : "", style); + ExcelUtils.formatCell(row, 39, vo.getAvftdrcd() != null ? vo.getAvftdrcd() : "", style); + ExcelUtils.formatCell(row, 40, vo.getMxfltddr() != null ? vo.getMxfltddr().toString() : "", style); + ExcelUtils.formatCell(row, 41, vo.getMxfltddrrcd() != null ? vo.getMxfltddrrcd() : "", style); + ExcelUtils.formatCell(row, 42, vo.getMxfltddrhtm() != null ? vo.getMxfltddrhtm() : "", style); + ExcelUtils.formatCell(row, 43, vo.getMnfltddr() != null ? vo.getMnfltddr().toString() : "", style); + ExcelUtils.formatCell(row, 44, vo.getMnfltddrrcd() != null ? vo.getMnfltddrrcd() : "", style); + ExcelUtils.formatCell(row, 45, vo.getMnfltddrhtm() != null ? vo.getMnfltddrhtm() : "", style); + ExcelUtils.formatCell(row, 46, vo.getAvebbdr() != null ? vo.getAvebbdr().toString() : "", style); + ExcelUtils.formatCell(row, 47, vo.getAvedrc() != null ? vo.getAvedrc() : "", style); + ExcelUtils.formatCell(row, 48, vo.getMxebtddr() != null ? vo.getMxebtddr().toString() : "", style); + ExcelUtils.formatCell(row, 49, vo.getMxebtddrrcd() != null ? vo.getMxebtddrrcd() : "", style); + ExcelUtils.formatCell(row, 50, vo.getMxebtddrhtm() != null ? vo.getMxebtddrhtm() : "", style); + ExcelUtils.formatCell(row, 51, vo.getMnbtddr() != null ? vo.getMnbtddr().toString() : "", style); + ExcelUtils.formatCell(row, 52, vo.getMnebtddrrcd() != null ? vo.getMnebtddrrcd() : "", style); + ExcelUtils.formatCell(row, 53, vo.getMnebtddrhtm() != null ? vo.getMnebtddrhtm() : "", style); + ExcelUtils.formatCell(row, 54, vo.getHravtdz() != null ? CommonUtils.formatNum(vo.getHravtdz()) : "", style); + ExcelUtils.formatCell(row, 55, vo.getHravtdzrcd() != null ? vo.getHravtdzrcd() : "", style); + ExcelUtils.formatCell(row, 56, vo.getAvtdr() != null ? CommonUtils.formatNum(vo.getAvtdr()) : "", style); + ExcelUtils.formatCell(row, 57, vo.getAvtdrrcd() != null ? vo.getAvtdrrcd() : "", style); + ExcelUtils.formatCell(row, 58, vo.getAvtddr() != null ? vo.getAvtddr().toString() : "", style); + ExcelUtils.formatCell(row, 59, vo.getAvtddrrcd() != null ? vo.getAvtddrrcd() : "", style); + ExcelUtils.formatCell(row, 60, "", style); + + // 增加行号和全局序号 + rowIndex++; + globalIndex++; + } + } + return 0; + } + + + public void dataModel(Map map, Sheet sheet, CellStyle style) { + // 批量查询数据 + IPage HyYrtdzFListPageByInfo = this.baseMapper.selectHyYrtdzFListPageByInfo(new Query().getPage(map), map); + List records = HyYrtdzFListPageByInfo.getRecords(); + // 定义当前sheet的行号 + int rowIndex = 2; + // 定义当前sheet的编号 + int sheetIndex = 1; + Row row; + // 最大行数限制 + int maxRowsPerSheet = 65536; // 对于 .xls 文件，最大行数为 65536 + int batchSize = 1000; // 每次批量处理1000行，减少逐行写入的开销 + // 批量处理数据 + for (int i = 0; i < records.size(); i += batchSize) { + // 处理一批数据 + int toIndex = Math.min(i + batchSize, records.size()); + List batchList = records.subList(i, toIndex); + // 批量写入数据 + for (HyYrtdzFVo vo : batchList) { + // 如果当前行数达到最大行数，创建新sheet + if (rowIndex >= maxRowsPerSheet) { + sheetIndex++; + sheet = sheet.getWorkbook().createSheet("年潮位表" + sheetIndex); + rowIndex = 2; // 重置行号 + } + // 创建新行并写入数据 + row = ExcelUtils.createRow(sheet, rowIndex); + //序号 + ExcelUtils.formatCell(row, 0, String.valueOf(rowIndex - 1), style); + ExcelUtils.formatCell(row, 1, vo.getStcd() != null ? vo.getStcd() : "", style); + ExcelUtils.formatCell(row, 2, vo.getStnm() != null ? vo.getStnm() : "", style); + ExcelUtils.formatCell(row, 3, vo.getAddvcd() != null ? vo.getAddvcd() : "", style); + ExcelUtils.formatCell(row, 4, "", style); + ExcelUtils.formatCell(row, 5, vo.getYr() != null ? vo.getYr().toString() : "", style); + ExcelUtils.formatCell(row, 6, vo.getAvhtdz() != null ? CommonUtils.formatNum(vo.getAvhtdz()) : "", style); + ExcelUtils.formatCell(row, 7, vo.getAvhtdzrcd() != null ? vo.getAvhtdzrcd() : "", style); + ExcelUtils.formatCell(row, 8, vo.getHthtdz() != null ? CommonUtils.formatNum(vo.getHthtdz()) : "", style); + ExcelUtils.formatCell(row, 9, vo.getHthtdzrcd() != null ? vo.getHthtdzrcd() : "", style); + ExcelUtils.formatCell(row, 10, vo.getHthtdzotm() != null ? vo.getHthtdzotm() : "", style); + ExcelUtils.formatCell(row, 11, vo.getLthtdz() != null ? CommonUtils.formatNum(vo.getLthtdz()) : "", style); + ExcelUtils.formatCell(row, 12, vo.getLthtdzrcd() != null ? vo.getLthtdzrcd() : "", style); + ExcelUtils.formatCell(row, 13, vo.getLthtdzotm() != null ? vo.getLthtdzotm() : "", style); + ExcelUtils.formatCell(row, 14, vo.getAvltdz() != null ? CommonUtils.formatNum(vo.getAvltdz()) : "", style); + ExcelUtils.formatCell(row, 15, vo.getAvltdzrcd() != null ? vo.getAvltdzrcd() : "", style); + ExcelUtils.formatCell(row, 16, vo.getHtltdz() != null ? CommonUtils.formatNum(vo.getHtltdz()) : "", style); + ExcelUtils.formatCell(row, 17, vo.getHtltdzrcd() != null ? vo.getHtltdzrcd() : "", style); + ExcelUtils.formatCell(row, 18, vo.getHtltdzotm() != null ? vo.getHtltdzotm() : "", style); + ExcelUtils.formatCell(row, 19, vo.getLtltdz() != null ? CommonUtils.formatNum(vo.getLtltdz()) : "", style); + ExcelUtils.formatCell(row, 20, vo.getLtltdzrcd() != null ? vo.getLtltdzrcd() : "", style); + ExcelUtils.formatCell(row, 21, vo.getLtltdzotm() != null ? vo.getLtltdzotm() : "", style); + ExcelUtils.formatCell(row, 22, vo.getAvftdr() != null ? CommonUtils.formatNum(vo.getAvftdr()) : "", style); + ExcelUtils.formatCell(row, 23, vo.getAvftdrrcd() != null ? vo.getAvftdrrcd() : "", style); + ExcelUtils.formatCell(row, 24, vo.getMxfltdr() != null ? CommonUtils.formatNum(vo.getMxfltdr()) : "", style); + ExcelUtils.formatCell(row, 25, vo.getMxfltdrrcd() != null ? vo.getMxfltdrrcd() : "", style); + ExcelUtils.formatCell(row, 26, vo.getMxfltdrhtm() != null ? vo.getMxfltdrhtm() : "", style); + ExcelUtils.formatCell(row, 27, vo.getMnfltdr() != null ? CommonUtils.formatNum(vo.getMnfltdr()) : "", style); + ExcelUtils.formatCell(row, 28, vo.getMnfltdrrcd() != null ? vo.getMnfltdrrcd() : "", style); + ExcelUtils.formatCell(row, 29, vo.getMnfltdrhtm() != null ? vo.getMnfltdrhtm() : "", style); + ExcelUtils.formatCell(row, 30, vo.getAver() != null ? CommonUtils.formatNum(vo.getAver()) : "", style); + ExcelUtils.formatCell(row, 31, vo.getAverbbrrcd() != null ? vo.getAverbbrrcd() : "", style); + ExcelUtils.formatCell(row, 32, vo.getMxebtdr() != null ? CommonUtils.formatNum(vo.getMxebtdr()) : "", style); + ExcelUtils.formatCell(row, 33, vo.getMxebtdrrcd() != null ? vo.getMxebtdrrcd() : "", style); + ExcelUtils.formatCell(row, 34, vo.getMxebtdrht() != null ? vo.getMxebtdrht() : "", style); + ExcelUtils.formatCell(row, 35, vo.getMnebtdr() != null ? CommonUtils.formatNum(vo.getMnebtdr()) : "", style); + ExcelUtils.formatCell(row, 36, vo.getMnebtdrrcd() != null ? vo.getMnebtdrrcd() : "", style); + ExcelUtils.formatCell(row, 37, vo.getMnebtdrhtm() != null ? vo.getMnebtdrhtm() : "", style); + ExcelUtils.formatCell(row, 38, vo.getAvftd() != null ? vo.getAvftd().toString() : "", style); + ExcelUtils.formatCell(row, 39, vo.getAvftdrcd() != null ? vo.getAvftdrcd() : "", style); + ExcelUtils.formatCell(row, 40, vo.getMxfltddr() != null ? vo.getMxfltddr().toString() : "", style); + ExcelUtils.formatCell(row, 41, vo.getMxfltddrrcd() != null ? vo.getMxfltddrrcd() : "", style); + ExcelUtils.formatCell(row, 42, vo.getMxfltddrhtm() != null ? vo.getMxfltddrhtm() : "", style); + ExcelUtils.formatCell(row, 43, vo.getMnfltddr() != null ? vo.getMnfltddr().toString() : "", style); + ExcelUtils.formatCell(row, 44, vo.getMnfltddrrcd() != null ? vo.getMnfltddrrcd() : "", style); + ExcelUtils.formatCell(row, 45, vo.getMnfltddrhtm() != null ? vo.getMnfltddrhtm() : "", style); + ExcelUtils.formatCell(row, 46, vo.getAvebbdr() != null ? vo.getAvebbdr().toString() : "", style); + ExcelUtils.formatCell(row, 47, vo.getAvedrc() != null ? vo.getAvedrc() : "", style); + ExcelUtils.formatCell(row, 48, vo.getMxebtddr() != null ? vo.getMxebtddr().toString() : "", style); + ExcelUtils.formatCell(row, 49, vo.getMxebtddrrcd() != null ? vo.getMxebtddrrcd() : "", style); + ExcelUtils.formatCell(row, 50, vo.getMxebtddrhtm() != null ? vo.getMxebtddrhtm() : "", style); + ExcelUtils.formatCell(row, 51, vo.getMnbtddr() != null ? vo.getMnbtddr().toString() : "", style); + ExcelUtils.formatCell(row, 52, vo.getMnebtddrrcd() != null ? vo.getMnebtddrrcd() : "", style); + ExcelUtils.formatCell(row, 53, vo.getMnebtddrhtm() != null ? vo.getMnebtddrhtm() : "", style); + ExcelUtils.formatCell(row, 54, vo.getHravtdz() != null ? CommonUtils.formatNum(vo.getHravtdz()) : "", style); + ExcelUtils.formatCell(row, 55, vo.getHravtdzrcd() != null ? vo.getHravtdzrcd() : "", style); + ExcelUtils.formatCell(row, 56, vo.getAvtdr() != null ? CommonUtils.formatNum(vo.getAvtdr()) : "", style); + ExcelUtils.formatCell(row, 57, vo.getAvtdrrcd() != null ? vo.getAvtdrrcd() : "", style); + ExcelUtils.formatCell(row, 58, vo.getAvtddr() != null ? vo.getAvtddr().toString() : "", style); + ExcelUtils.formatCell(row, 59, vo.getAvtddrrcd() != null ? vo.getAvtddrrcd() : "", style); + ExcelUtils.formatCell(row, 60, "", style); + rowIndex++; + } + } + } + +} + + + + diff --git a/swlscx/src/main/java/com/ruoyi/swlscx/year/service/impl/HyYrweFServiceImpl.java b/swlscx/src/main/java/com/ruoyi/swlscx/year/service/impl/HyYrweFServiceImpl.java new file mode 100644 index 0000000..24e28c9 --- /dev/null +++ b/swlscx/src/main/java/com/ruoyi/swlscx/year/service/impl/HyYrweFServiceImpl.java @@ -0,0 +1,375 @@ +package com.ruoyi.swlscx.year.service.impl; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.ruoyi.common.annotation.DataSource; +import com.ruoyi.common.config.RuoYiConfig; +import com.ruoyi.common.core.page.R; +import com.ruoyi.common.core.text.Convert; +import com.ruoyi.common.enums.DataSourceType; +import com.ruoyi.common.utils.DateUtils; +import com.ruoyi.common.utils.SecurityUtils; +import com.ruoyi.swlscx.basic.domain.po.YcExportTask; +import com.ruoyi.swlscx.basic.service.YcExportTaskService; +import com.ruoyi.swlscx.common.PageParams; +import com.ruoyi.swlscx.year.domain.bo.HyYrweFBo; +import com.ruoyi.swlscx.year.domain.po.HyYrweF; +import com.ruoyi.swlscx.year.domain.vo.HyYrweFVo; +import com.ruoyi.swlscx.year.mapper.HyYrweFMapper; +import com.ruoyi.swlscx.year.service.HyYrweFService; +import com.ruoyi.swlscx.common.utils.CommonUtils; +import com.ruoyi.swlscx.common.utils.ExcelUtils; +import com.ruoyi.swlscx.common.utils.Query; +import org.apache.commons.lang3.ObjectUtils; +import org.apache.poi.ss.usermodel.CellStyle; +import org.apache.poi.ss.usermodel.Row; +import org.apache.poi.ss.usermodel.Sheet; +import org.springframework.beans.BeanUtils; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.context.ApplicationContext; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; +import org.springframework.web.multipart.MultipartFile; + +import javax.annotation.Resource; +import javax.servlet.http.HttpServletResponse; +import java.io.File; +import java.util.Date; +import java.util.List; +import java.util.Map; +import java.util.concurrent.CompletableFuture; +import java.util.concurrent.ThreadPoolExecutor; +import java.util.stream.Collectors; + +/** + * @author 12974 + * @description 针对表【hy_yrwe_f(年水面蒸发量表)】的数据库操作Service实现 + * @createDate 2024-09-05 16:53:36 + */ +@Service +public class HyYrweFServiceImpl extends ServiceImpl + implements HyYrweFService { + + + @Resource + private ThreadPoolExecutor labelThreadPool; + + @Resource + private YcExportTaskService ycExportTaskService; + + /** + * 导入年水面蒸发量表数据 + */ + @Override + @Transactional(rollbackFor = Exception.class) + public void importHyYrweFData(MultipartFile file) { + try { + List hyYrweFBos = ExcelUtils.readExcel(file.getInputStream(), HyYrweFBo.class, 2); + List hyYrweFList = hyYrweFBos.stream().map(i -> { + HyYrweF hyYrweF = new HyYrweF(); + BeanUtils.copyProperties(i, hyYrweF); + hyYrweF.setYr(Convert.toInt(i.getYr())); + hyYrweF.setWsfe(Convert.toBigDecimal(i.getWsfe())); + hyYrweF.setMxdye(Convert.toBigDecimal(i.getMxdye())); + hyYrweF.setMxdyeodt(DateUtils.parseDate(i.getMxdyeodt())); + hyYrweF.setMndye(Convert.toBigDecimal(i.getMndye())); + hyYrweF.setMndyeodt(DateUtils.parseDate(i.getMndyeodt())); + hyYrweF.setIdsdt(DateUtils.parseDate(i.getIdsdt())); + hyYrweF.setIcapd(DateUtils.parseDate(i.getIcapd())); + + return hyYrweF; + }).collect(Collectors.toList()); + this.saveBatch(hyYrweFList, 3000); + } catch (Exception e) { + e.printStackTrace(); + } + } + + /** + * 查询年水面蒸发量表数据 + */ + @Override + public IPage selectHyYrweFListPageByInfo(PageParams pageParams, String startTime, String endTime, String stcd, String stnm) { + + Map map = CommonUtils.getYearAndDayDataMap(pageParams, startTime, endTime, stcd, stnm); + return this.baseMapper.selechyYrweFListPageByInfo(new Query().getPage(map), map); + } + + /** + * 导出年水面蒸发量表 + */ + @Override + public R exportYearEvaporationWaterList(HttpServletResponse response, String startTime, String endTime, String stcd, String stnm) { + + Long userId = SecurityUtils.getUserId(); + String tableName = "年水面蒸发量表"; + return taskAndExport(tableName,startTime, endTime, stcd, stnm, userId); +// +// Map rainMap = CommonUtils.getYearAndDayDataMap(new PageParams(0L, 100000L), startTime, endTime, stcd, stnm); +// ExcelUtils.excelExport(response, "yearEvaporationWater.xls", "年水面蒸发量表", (Sheet sheet, CellStyle style) -> { +// dataModel(rainMap, sheet, style); +// }); + } + + @Resource + private ThreadPoolExecutor importThreadPool; + + @Autowired + private ApplicationContext context; + + /** + * 从mysql导入到sqlserver中 + */ + @Transactional(rollbackFor = Exception.class) + @DataSource(DataSourceType.SHARDING) + public void importMysqlToSqlserver(List hyYrweFVoList) { + List records = hyYrweFVoList.stream().map(i->{ + HyYrweF hyYrweF = new HyYrweF(); + BeanUtils.copyProperties(i, hyYrweF); + hyYrweF.setYr(Convert.toInt(i.getYr())); + hyYrweF.setWsfe(Convert.toBigDecimal(i.getWsfe())); + hyYrweF.setMxdye(Convert.toBigDecimal(i.getMxdye())); + hyYrweF.setMxdyeodt(DateUtils.parseDate(i.getMxdyeodt())); + hyYrweF.setMndye(Convert.toBigDecimal(i.getMndye())); + hyYrweF.setMndyeodt(DateUtils.parseDate(i.getMndyeodt())); + hyYrweF.setIdsdt(DateUtils.parseDate(i.getIdsdt())); + hyYrweF.setIcapd(DateUtils.parseDate(i.getIcapd())); + return hyYrweF; + }).collect(Collectors.toList()); + //先清空临时表的数据 + this.baseMapper.deleteTempData(); + //插入临时表数据 + int batchSize = 50; + for (int i = 0; i < records.size(); i += batchSize) { + int end = Math.min(i + batchSize, records.size()); + List batch = records.subList(i, end); + // 执行批量插入 + this.baseMapper.insertTempData(batch); + } + //从临时表增或修改主表 + this.baseMapper.mergeToData(); + } + + @Override + public R importDateTosoft(String startTime, String endTime) { + Long userId = SecurityUtils.getUserId(); + String filename = "年水面蒸发量表" + startTime + "-" + endTime+"导入到南方片"; + // 查询是否已存在相同条件且未完成的任务 + List ongoingTasks = ycExportTaskService.list( + new QueryWrapper() + .eq("user_id", userId) + .eq("status", 0) // 状态为0表示任务未完成 + .like("filename", "年水面蒸发量表")); + if (!ongoingTasks.isEmpty()) { + return R.error("当前任务正在下载中，请稍后重试"); + } + YcExportTask ycExportTask = new YcExportTask(); + ycExportTask.setFilename(filename); + ycExportTask.setUserId(userId); + ycExportTask.setStartTime(new Date()); + ycExportTask.setStatus(0); + ycExportTaskService.save(ycExportTask); + CompletableFuture.runAsync(() -> { + try { + IPage pageByInfo = this.selectHyYrweFListPageByInfo(new PageParams(0L, 1000000000L), startTime, endTime, null, null); + HyYrweFServiceImpl hyYrweFService = context.getBean(HyYrweFServiceImpl.class); + hyYrweFService.importMysqlToSqlserver(pageByInfo.getRecords()); + ycExportTask.setStatus(2); + } catch (Exception e) { + ycExportTask.setStatus(4); + log.error(e.getMessage()); + R.error("任务下载失败"); + }finally { + ycExportTask.setEndTime(new Date()); + ycExportTaskService.updateById(ycExportTask); + } + }, importThreadPool); + return R.ok("任务已提交"); + } + + private R taskAndExport(String tableName,String startTime, String endTime, String stcd, String stnm, Long userId) { + String startNewTime=""; + String endNewTime=""; + if (ObjectUtils.isNotEmpty(startTime) ){ + startNewTime=startTime.substring(0,4); + } + if (ObjectUtils.isNotEmpty(endTime)){ + endNewTime=endTime.substring(0,4); + } + String filename = tableName + startNewTime + "-" + endNewTime; + // 查询是否已存在相同条件且未完成的任务 + List ongoingTasks = ycExportTaskService.list( + new QueryWrapper() + .eq("user_id", userId) + .eq("filename", filename) + .eq("status", 0) // 状态为0表示任务未完成 + ); + + if (!ongoingTasks.isEmpty()) { + return R.error("当前任务正在下载中，请稍后重试"); + } + + YcExportTask ycExportTask = new YcExportTask(); + String pathPeffix = RuoYiConfig.getExportPath() + + File.separator + userId + File.separator+ + DateUtils.parseDateToStr("yyyy-MM-dd",DateUtils.getNowDate()) + File.separator + + DateUtils.parseDateToStr("HH_mm",DateUtils.getNowDate())+File.separator; + ycExportTask.setFilename(filename); + ycExportTask.setUserId(userId); + ycExportTask.setStartTime(new Date()); + ycExportTask.setStatus(0); + ycExportTask.setFilepath(pathPeffix); + ycExportTaskService.save(ycExportTask); + CompletableFuture.runAsync(() -> { + try { + File dest = new File(pathPeffix); + if (!dest.exists()) { + dest.mkdirs(); + } + String fullPath = pathPeffix + filename; + exportBlackData(fullPath, startTime, endTime, stcd, stnm); + + ycExportTask.setStatus(1); + ycExportTask.setEndTime(new Date()); + ycExportTaskService.updateById(ycExportTask); + } catch (Exception e) { + log.error(e.getMessage(), e); + R.error("任务下载失败"); + } + }, labelThreadPool); + return R.ok("任务已提交，请稍后下载"); + } + + private void exportBlackData(String tableName, String startTime, String endTime, String stcd, String stnm) { + Map rainMap = CommonUtils.getYearAndDayDataMap(new PageParams(0L, 1000000000L), startTime, endTime, stcd, stnm); + ExcelUtils.excelBackExport2("yearEvaporationWater.xls", tableName, (Sheet sheet, CellStyle style) -> + dataModel1(rainMap, sheet, style)); + } + + public int dataModel1(Map map, Sheet sheet, CellStyle style) { + // 批量查询数据 + IPage hyYrweFVoIPage = this.baseMapper.selechyYrweFListPageByInfo(new Query().getPage(map), map); + List records = hyYrweFVoIPage.getRecords(); + + // 定义当前sheet的行号 + int rowIndex = 2; // 从第二行开始写入数据 + // 定义全局序号 + int globalIndex = 1; // 从1开始 + + // 定义当前sheet的编号 + int sheetIndex = 1; + + // 最大行数限制 + int maxRowsPerSheet = 65536; // 对于 .xls 文件，最大行数为 65536 + int batchSize = 1000; // 每次批量处理1000行，减少逐行写入的开销 + + // 复制表头到新sheet的逻辑 + ExcelUtils.copyHeader(sheet, style); + + // 批量处理数据 + for (int i = 0; i < records.size(); i += batchSize) { + // 处理一批数据 + int toIndex = Math.min(i + batchSize, records.size()); + List batchList = records.subList(i, toIndex); + + // 批量写入数据 + for (HyYrweFVo vo : batchList) { + // 如果当前行数达到最大行数，创建新sheet + if (rowIndex >= maxRowsPerSheet) { + sheetIndex++; + sheet = sheet.getWorkbook().createSheet("年水面蒸发量表" + sheetIndex); + rowIndex = 2; // 重置行号 + // 复制表头到新sheet + ExcelUtils.copyHeader(sheet, style); + } + + // 创建新行并写入数据 + Row row = ExcelUtils.createRow(sheet, rowIndex); + + // 使用 globalIndex 作为序号 + ExcelUtils.formatCell(row, 0, String.valueOf(globalIndex), style); + ExcelUtils.formatCell(row, 1, vo.getStcd() != null ? vo.getStcd() : "", style); + ExcelUtils.formatCell(row, 2, vo.getStnm() != null ? vo.getStnm() : "", style); + ExcelUtils.formatCell(row, 3, vo.getAddvcd() != null ? vo.getAddvcd() : "", style); + ExcelUtils.formatCell(row, 4, "", style); + ExcelUtils.formatCell(row, 5, vo.getEetp() != null ? vo.getEetp() : "", style); + ExcelUtils.formatCell(row, 6, vo.getYr() != null ? vo.getYr().toString() : "", style); + ExcelUtils.formatCell(row, 7, vo.getWsfe() != null ? CommonUtils.formatNum(vo.getWsfe()) : "", style); + ExcelUtils.formatCell(row, 8, vo.getWsfercd() != null ? vo.getWsfercd() : "", style); + ExcelUtils.formatCell(row, 9, vo.getMxdye() != null ? CommonUtils.formatNum(vo.getMxdye()) : "", style); + ExcelUtils.formatCell(row, 10, vo.getMxdyercd() != null ? vo.getMxdyercd() : "", style); + ExcelUtils.formatCell(row, 11, vo.getMxdyeodt() != null ? vo.getMxdyeodt() : "", style); + ExcelUtils.formatCell(row, 12, vo.getMndye() != null ? CommonUtils.formatNum(vo.getMndye()) : "", style); + ExcelUtils.formatCell(row, 13, vo.getMndyercd() != null ? vo.getMndyercd() : "", style); + ExcelUtils.formatCell(row, 14, vo.getMndyeodt() != null ? vo.getMndyeodt() : "", style); + ExcelUtils.formatCell(row, 15, vo.getIdsdt() != null ? vo.getIdsdt() : "", style); + ExcelUtils.formatCell(row, 16, vo.getIcapd() != null ? vo.getIcapd() : "", style); + ExcelUtils.formatCell(row, 17, vo.getEslcch() != null ? vo.getEslcch() : "", style); + ExcelUtils.formatCell(row, 18, vo.getNt() != null ? vo.getNt() : "", style); + ExcelUtils.formatCell(row, 19, "", style); + // 增加行号和全局序号 + rowIndex++; + globalIndex++; + } + } + return 0; + } + + public void dataModel(Map map, Sheet sheet, CellStyle style) { + // 批量查询数据 + IPage hyYrweFVoIPage = this.baseMapper.selechyYrweFListPageByInfo(new Query().getPage(map), map); + List records = hyYrweFVoIPage.getRecords(); + // 定义当前sheet的行号 + int rowIndex = 2; + // 定义当前sheet的编号 + int sheetIndex = 1; + Row row; + // 最大行数限制 + int maxRowsPerSheet = 65536; // 对于 .xls 文件，最大行数为 65536 + int batchSize = 1000; // 每次批量处理1000行，减少逐行写入的开销 + // 批量处理数据 + for (int i = 0; i < records.size(); i += batchSize) { + // 处理一批数据 + int toIndex = Math.min(i + batchSize, records.size()); + List batchList = records.subList(i, toIndex); + // 批量写入数据 + for (HyYrweFVo vo : batchList) { + // 如果当前行数达到最大行数，创建新sheet + if (rowIndex >= maxRowsPerSheet) { + sheetIndex++; + sheet = sheet.getWorkbook().createSheet("年水面蒸发量表" + sheetIndex); + rowIndex = 2; // 重置行号 + } + // 创建新行并写入数据 + row = ExcelUtils.createRow(sheet, rowIndex); + //序号 + ExcelUtils.formatCell(row, 0, String.valueOf(rowIndex - 1), style); + ExcelUtils.formatCell(row, 1, vo.getStcd() != null ? vo.getStcd() : "", style); + ExcelUtils.formatCell(row, 2, vo.getStnm() != null ? vo.getStnm() : "", style); + ExcelUtils.formatCell(row, 3, vo.getAddvcd() != null ? vo.getAddvcd() : "", style); + ExcelUtils.formatCell(row, 4, "", style); + ExcelUtils.formatCell(row, 5, vo.getEetp() != null ? vo.getEetp() : "", style); + ExcelUtils.formatCell(row, 6, vo.getYr() != null ? vo.getYr().toString() : "", style); + ExcelUtils.formatCell(row, 7, vo.getWsfe() != null ? CommonUtils.formatNum(vo.getWsfe()) : "", style); + ExcelUtils.formatCell(row, 8, vo.getWsfercd() != null ? vo.getWsfercd() : "", style); + ExcelUtils.formatCell(row, 9, vo.getMxdye() != null ? CommonUtils.formatNum(vo.getMxdye()) : "", style); + ExcelUtils.formatCell(row, 10, vo.getMxdyercd() != null ? vo.getMxdyercd() : "", style); + ExcelUtils.formatCell(row, 11, vo.getMxdyeodt() != null ? vo.getMxdyeodt() : "", style); + ExcelUtils.formatCell(row, 12, vo.getMndye() != null ? CommonUtils.formatNum(vo.getMndye()) : "", style); + ExcelUtils.formatCell(row, 13, vo.getMndyercd() != null ? vo.getMndyercd() : "", style); + ExcelUtils.formatCell(row, 14, vo.getMndyeodt() != null ? vo.getMndyeodt() : "", style); + ExcelUtils.formatCell(row, 15, vo.getIdsdt() != null ? vo.getIdsdt() : "", style); + ExcelUtils.formatCell(row, 16, vo.getIcapd() != null ? vo.getIcapd() : "", style); + ExcelUtils.formatCell(row, 17, vo.getEslcch() != null ? vo.getEslcch() : "", style); + ExcelUtils.formatCell(row, 18, vo.getNt() != null ? vo.getNt() : "", style); + ExcelUtils.formatCell(row, 19, "", style); + rowIndex++; + } + } + } +} + + + + diff --git a/swlscx/src/main/java/com/ruoyi/swlscx/year/service/impl/HyYrwtFServiceImpl.java b/swlscx/src/main/java/com/ruoyi/swlscx/year/service/impl/HyYrwtFServiceImpl.java new file mode 100644 index 0000000..15dd1ac --- /dev/null +++ b/swlscx/src/main/java/com/ruoyi/swlscx/year/service/impl/HyYrwtFServiceImpl.java @@ -0,0 +1,356 @@ +package com.ruoyi.swlscx.year.service.impl; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.ruoyi.common.annotation.DataSource; +import com.ruoyi.common.config.RuoYiConfig; +import com.ruoyi.common.core.page.R; +import com.ruoyi.common.core.text.Convert; +import com.ruoyi.common.enums.DataSourceType; +import com.ruoyi.common.utils.DateUtils; +import com.ruoyi.common.utils.SecurityUtils; +import com.ruoyi.swlscx.basic.domain.po.YcExportTask; +import com.ruoyi.swlscx.basic.service.YcExportTaskService; +import com.ruoyi.swlscx.common.PageParams; +import com.ruoyi.swlscx.year.domain.bo.HyYrwtFBo; +import com.ruoyi.swlscx.year.domain.po.HyHmxpF; +import com.ruoyi.swlscx.year.domain.po.HyYrwtF; +import com.ruoyi.swlscx.year.domain.vo.HyHmxpFVo; +import com.ruoyi.swlscx.year.domain.vo.HyYrwtFVo; +import com.ruoyi.swlscx.year.mapper.HyYrwtFMapper; +import com.ruoyi.swlscx.year.service.HyYrwtFService; +import com.ruoyi.swlscx.common.utils.CommonUtils; +import com.ruoyi.swlscx.common.utils.ExcelUtils; +import com.ruoyi.swlscx.common.utils.Query; +import org.apache.commons.lang3.ObjectUtils; +import org.apache.poi.ss.usermodel.CellStyle; +import org.apache.poi.ss.usermodel.Row; +import org.apache.poi.ss.usermodel.Sheet; +import org.springframework.beans.BeanUtils; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.context.ApplicationContext; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; +import org.springframework.web.multipart.MultipartFile; + +import javax.annotation.Resource; +import javax.servlet.http.HttpServletResponse; +import java.io.File; +import java.util.Date; +import java.util.List; +import java.util.Map; +import java.util.concurrent.CompletableFuture; +import java.util.concurrent.ThreadPoolExecutor; +import java.util.stream.Collectors; + +/** +* @author 12974 +* @description 针对表【hy_yrwt_f(年水温表)】的数据库操作Service实现 +* @createDate 2024-09-05 16:53:36 +*/ +@Service +public class HyYrwtFServiceImpl extends ServiceImpl + implements HyYrwtFService { + + @Resource + private ThreadPoolExecutor labelThreadPool; + + @Resource + private YcExportTaskService ycExportTaskService; + + /** + * 导入年水温表数据 + */ + @Override + @Transactional(rollbackFor = Exception.class) + public void importHyYrpFData(MultipartFile file) { + try { + List hyYrwtFBos = ExcelUtils.readExcel(file.getInputStream(), HyYrwtFBo.class, 2); + List hyYrpFList = hyYrwtFBos.stream().map(i -> { + HyYrwtF hyYrwtF = new HyYrwtF(); + BeanUtils.copyProperties(i, hyYrwtF); + hyYrwtF.setYr(Convert.toInt(i.getYr())); + hyYrwtF.setAvwtmp(Convert.toBigDecimal(i.getAvwtmp())); + hyYrwtF.setMxwtmp(Convert.toBigDecimal(i.getMxwtmp())); + hyYrwtF.setMnwtmp(Convert.toBigDecimal(i.getMnwtmp())); + hyYrwtF.setMnwtmpdt(DateUtils.parseDate(i.getMnwtmpdt().split("\\.")[0])); + return hyYrwtF; + }).collect(Collectors.toList()); + this.saveBatch(hyYrpFList,3000); + } catch (Exception e) { + e.printStackTrace(); + } + } + + /** + * 查询年水温表数据 + */ + @Override + public IPage getYearWaterTemperatureList(PageParams pageParams, String startTime, String endTime, String stcd, String stnm) { + Map map = CommonUtils.getYearAndDayDataMap(pageParams, startTime, endTime, stcd, stnm); + return this.baseMapper.selectHyYrwtFPageByInfo(new Query().getPage(map), map); + } + + /** + * 导出年水温表 + */ + @Override + public R exportYearWaterTemperatureList(HttpServletResponse response, String startTime, String endTime, String stcd, String stnm) { + + Long userId = SecurityUtils.getUserId(); + String tableName = "年水温表"; + return taskAndExport(tableName,startTime, endTime, stcd, stnm, userId); + } + + @Resource + private ThreadPoolExecutor importThreadPool; + + @Autowired + private ApplicationContext context; + + /** + * 从mysql导入到sqlserver中 + */ + @Transactional(rollbackFor = Exception.class) + @DataSource(DataSourceType.SHARDING) + public void importMysqlToSqlserver(List hyYrwtFVoList) { + List records = hyYrwtFVoList.stream().map(i->{ + HyYrwtF hyYrwtF = new HyYrwtF(); + BeanUtils.copyProperties(i, hyYrwtF); + hyYrwtF.setYr(Convert.toInt(i.getYr())); + hyYrwtF.setAvwtmp(Convert.toBigDecimal(i.getAvwtmp())); + hyYrwtF.setMxwtmp(Convert.toBigDecimal(i.getMxwtmp())); + hyYrwtF.setMnwtmp(Convert.toBigDecimal(i.getMnwtmp())); + hyYrwtF.setMnwtmpdt(DateUtils.parseDate(i.getMnwtmpdt())); + return hyYrwtF; + }).collect(Collectors.toList()); + //先清空临时表的数据 + this.baseMapper.deleteTempData(); + //插入临时表数据 + int batchSize = 50; + for (int i = 0; i < records.size(); i += batchSize) { + int end = Math.min(i + batchSize, records.size()); + List batch = records.subList(i, end); + // 执行批量插入 + this.baseMapper.insertTempData(batch); + } + //从临时表增或修改主表 + this.baseMapper.mergeToData(); + } + + + + @Override + public R importDateTosoft(String startTime, String endTime) { + Long userId = SecurityUtils.getUserId(); + String filename = "年水温表" + startTime + "-" + endTime+"导入到南方片"; + // 查询是否已存在相同条件且未完成的任务 + List ongoingTasks = ycExportTaskService.list( + new QueryWrapper() + .eq("user_id", userId) + .eq("status", 0) // 状态为0表示任务未完成 + .like("filename", "年水温表")); + if (!ongoingTasks.isEmpty()) { + return R.error("当前任务正在下载中，请稍后重试"); + } + YcExportTask ycExportTask = new YcExportTask(); + ycExportTask.setFilename(filename); + ycExportTask.setUserId(userId); + ycExportTask.setStartTime(new Date()); + ycExportTask.setStatus(0); + ycExportTaskService.save(ycExportTask); + CompletableFuture.runAsync(() -> { + try { + IPage pageByInfo = this.getYearWaterTemperatureList(new PageParams(0L, 1000000000L), startTime, endTime, null, null); +// IPage pageByInfo = this.selectMaxHRainListPageByInfo(new PageParams(0L, 1000000000L), null, null, startTime, endTime); + HyYrwtFServiceImpl hyYrwtFService = context.getBean(HyYrwtFServiceImpl.class); + hyYrwtFService.importMysqlToSqlserver(pageByInfo.getRecords()); + ycExportTask.setStatus(2); + } catch (Exception e) { + ycExportTask.setStatus(4); + log.error(e.getMessage()); + R.error("任务下载失败"); + }finally { + ycExportTask.setEndTime(new Date()); + ycExportTaskService.updateById(ycExportTask); + } + }, importThreadPool); + return R.ok("任务已提交"); + } + + private R taskAndExport(String tableName,String startTime, String endTime, String stcd, String stnm, Long userId) { + String startNewTime=""; + String endNewTime=""; + if (ObjectUtils.isNotEmpty(startTime) ){ + startNewTime=startTime.substring(0,4); + } + if (ObjectUtils.isNotEmpty(endTime)){ + endNewTime=endTime.substring(0,4); + } + String filename = tableName + startNewTime + "-" + endNewTime; + // 查询是否已存在相同条件且未完成的任务 + List ongoingTasks = ycExportTaskService.list( + new QueryWrapper() + .eq("user_id", userId) + .eq("filename", filename) + .eq("status", 0) // 状态为0表示任务未完成 + ); + + if (!ongoingTasks.isEmpty()) { + return R.error("当前任务正在下载中，请稍后重试"); + } + + YcExportTask ycExportTask = new YcExportTask(); + String pathPeffix = RuoYiConfig.getExportPath() + + File.separator + userId + File.separator+ + DateUtils.parseDateToStr("yyyy-MM-dd",DateUtils.getNowDate()) + File.separator + + DateUtils.parseDateToStr("HH_mm",DateUtils.getNowDate())+File.separator; + ycExportTask.setFilename(filename); + ycExportTask.setUserId(userId); + ycExportTask.setStartTime(new Date()); + ycExportTask.setStatus(0); + ycExportTask.setFilepath(pathPeffix); + ycExportTaskService.save(ycExportTask); + CompletableFuture.runAsync(() -> { + try { + File dest = new File(pathPeffix); + if (!dest.exists()) { + dest.mkdirs(); + } + String fullPath = pathPeffix + filename; + exportBlackData(fullPath, startTime, endTime, stcd, stnm); + + ycExportTask.setStatus(1); + ycExportTask.setEndTime(new Date()); + ycExportTaskService.updateById(ycExportTask); + } catch (Exception e) { + log.error(e.getMessage(), e); + R.error("任务下载失败"); + } + }, labelThreadPool); + return R.ok("任务已提交，请稍后下载"); + } + + private void exportBlackData(String tableName, String startTime, String endTime, String stcd, String stnm) { + Map rainMap = CommonUtils.getYearAndDayDataMap(new PageParams(0L, 1000000000L), startTime, endTime, stcd, stnm); + ExcelUtils.excelBackExport2("yearWaterTemperature.xls", tableName, (Sheet sheet, CellStyle style) -> + dataModel1(rainMap, sheet, style)); + } + + public int dataModel1(Map map, Sheet sheet, CellStyle style) { + // 批量查询数据 + IPage hyYrwtFVoIPage = this.baseMapper.selectHyYrwtFPageByInfo(new Query().getPage(map), map); + List records = hyYrwtFVoIPage.getRecords(); + + // 定义当前sheet的行号 + int rowIndex = 2; // 从第二行开始写入数据 + // 定义全局序号 + int globalIndex = 1; // 从1开始 + + // 定义当前sheet的编号 + int sheetIndex = 1; + + // 最大行数限制 + int maxRowsPerSheet = 65536; // 对于 .xls 文件，最大行数为 65536 + int batchSize = 1000; // 每次批量处理1000行，减少逐行写入的开销 + + // 复制表头到新sheet的逻辑 + ExcelUtils.copyHeader(sheet, style); + + // 批量处理数据 + for (int i = 0; i < records.size(); i += batchSize) { + // 处理一批数据 + int toIndex = Math.min(i + batchSize, records.size()); + List batchList = records.subList(i, toIndex); + + // 批量写入数据 + for (HyYrwtFVo vo : batchList) { + // 如果当前行数达到最大行数，创建新sheet + if (rowIndex >= maxRowsPerSheet) { + sheetIndex++; + sheet = sheet.getWorkbook().createSheet("年水温表" + sheetIndex); + rowIndex = 2; // 重置行号 + // 复制表头到新sheet + ExcelUtils.copyHeader(sheet, style); + } + + // 创建新行并写入数据 + Row row = ExcelUtils.createRow(sheet, rowIndex); + + // 使用 globalIndex 作为序号 + ExcelUtils.formatCell(row, 0, String.valueOf(globalIndex), style); + ExcelUtils.formatCell(row, 1, vo.getStcd() != null ? vo.getStcd() : "", style); + ExcelUtils.formatCell(row, 2, vo.getStnm() != null ? vo.getStnm() : "", style); + ExcelUtils.formatCell(row, 3, vo.getAddvcd() != null ? vo.getAddvcd() : "", style); + ExcelUtils.formatCell(row, 4, "",style); + ExcelUtils.formatCell(row, 5, vo.getYr() != null ? vo.getYr().toString() : "", style); + ExcelUtils.formatCell(row, 6, vo.getAvwtmp() != null ? CommonUtils.formatNum(vo.getAvwtmp()) : "", style); + ExcelUtils.formatCell(row, 7, vo.getAvwtmprcd() != null ? vo.getAvwtmprcd() : "", style); + ExcelUtils.formatCell(row, 8, vo.getMxwtmp() != null ? CommonUtils.formatNum(vo.getMxwtmp()) : "", style); + ExcelUtils.formatCell(row, 9, vo.getMxwtmprcd() != null ? vo.getMxwtmprcd() : "", style); + ExcelUtils.formatCell(row, 10, vo.getMxwtmpdt() != null ? vo.getMxwtmpdt() : "", style); + ExcelUtils.formatCell(row, 11, vo.getMnwtmp() != null ? CommonUtils.formatNum(vo.getMnwtmp()) : "", style); + ExcelUtils.formatCell(row, 12, vo.getMnwtmprcd() != null ? vo.getMnwtmprcd() : "", style); + ExcelUtils.formatCell(row, 13, "", style); + + // 增加行号和全局序号 + rowIndex++; + globalIndex++; + } + } + return 0; + } + + public void dataModel(Map map, Sheet sheet, CellStyle style) { + // 批量查询数据 + IPage hyYrwtFVoIPage = this.baseMapper.selectHyYrwtFPageByInfo(new Query().getPage(map), map); + List records = hyYrwtFVoIPage.getRecords(); + // 定义当前sheet的行号 + int rowIndex = 2; + // 定义当前sheet的编号 + int sheetIndex = 1; + Row row; + // 最大行数限制 + int maxRowsPerSheet = 65536; // 对于 .xls 文件，最大行数为 65536 + int batchSize = 1000; // 每次批量处理1000行，减少逐行写入的开销 + // 批量处理数据 + for (int i = 0; i < records.size(); i += batchSize) { + // 处理一批数据 + int toIndex = Math.min(i + batchSize, records.size()); + List batchList = records.subList(i, toIndex); + // 批量写入数据 + for (HyYrwtFVo vo : batchList) { + // 如果当前行数达到最大行数，创建新sheet + if (rowIndex >= maxRowsPerSheet) { + sheetIndex++; + sheet = sheet.getWorkbook().createSheet("年水温表" + sheetIndex); + rowIndex = 2; // 重置行号 + } + // 创建新行并写入数据 + row = ExcelUtils.createRow(sheet, rowIndex); + //序号 + ExcelUtils.formatCell(row, 0, String.valueOf(rowIndex - 1), style); + ExcelUtils.formatCell(row, 1, vo.getStcd() != null ? vo.getStcd() : "", style); + ExcelUtils.formatCell(row, 2, vo.getStnm() != null ? vo.getStnm() : "", style); + ExcelUtils.formatCell(row, 3, vo.getAddvcd() != null ? vo.getAddvcd() : "", style); + ExcelUtils.formatCell(row, 4, "",style); + ExcelUtils.formatCell(row, 5, vo.getYr() != null ? vo.getYr().toString() : "", style); + ExcelUtils.formatCell(row, 6, vo.getAvwtmp() != null ? CommonUtils.formatNum(vo.getAvwtmp()) : "", style); + ExcelUtils.formatCell(row, 7, vo.getAvwtmprcd() != null ? vo.getAvwtmprcd() : "", style); + ExcelUtils.formatCell(row, 8, vo.getMxwtmp() != null ? CommonUtils.formatNum(vo.getMxwtmp()) : "", style); + ExcelUtils.formatCell(row, 9, vo.getMxwtmprcd() != null ? vo.getMxwtmprcd() : "", style); + ExcelUtils.formatCell(row, 10, vo.getMxwtmpdt() != null ? vo.getMxwtmpdt() : "", style); + ExcelUtils.formatCell(row, 11, vo.getMnwtmp() != null ? CommonUtils.formatNum(vo.getMnwtmp()) : "", style); + ExcelUtils.formatCell(row, 12, vo.getMnwtmprcd() != null ? vo.getMnwtmprcd() : "", style); + ExcelUtils.formatCell(row, 13, "", style); + rowIndex++; + } + } + } + +} + + + + diff --git a/swlscx/src/main/java/com/ruoyi/swlscx/year/service/impl/HyYrzFServiceImpl.java b/swlscx/src/main/java/com/ruoyi/swlscx/year/service/impl/HyYrzFServiceImpl.java new file mode 100644 index 0000000..ffdad89 --- /dev/null +++ b/swlscx/src/main/java/com/ruoyi/swlscx/year/service/impl/HyYrzFServiceImpl.java @@ -0,0 +1,357 @@ +package com.ruoyi.swlscx.year.service.impl; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.ruoyi.common.annotation.DataSource; +import com.ruoyi.common.config.RuoYiConfig; +import com.ruoyi.common.core.page.R; +import com.ruoyi.common.core.text.Convert; +import com.ruoyi.common.enums.DataSourceType; +import com.ruoyi.common.utils.DateUtils; +import com.ruoyi.common.utils.SecurityUtils; +import com.ruoyi.swlscx.basic.domain.po.YcExportTask; +import com.ruoyi.swlscx.basic.service.YcExportTaskService; +import com.ruoyi.swlscx.common.PageParams; +import com.ruoyi.swlscx.year.domain.bo.HyYrzFBo; +import com.ruoyi.swlscx.year.domain.po.HyYrzF; +import com.ruoyi.swlscx.year.domain.vo.HyYrzFVo; +import com.ruoyi.swlscx.year.mapper.HyYrzFMapper; +import com.ruoyi.swlscx.year.service.HyYrzFService; +import com.ruoyi.swlscx.common.utils.CommonUtils; +import com.ruoyi.swlscx.common.utils.ExcelUtils; +import com.ruoyi.swlscx.common.utils.Query; +import org.apache.commons.lang3.ObjectUtils; +import org.apache.poi.ss.usermodel.CellStyle; +import org.apache.poi.ss.usermodel.Row; +import org.apache.poi.ss.usermodel.Sheet; +import org.springframework.beans.BeanUtils; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.context.ApplicationContext; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; +import org.springframework.web.multipart.MultipartFile; + +import javax.annotation.Resource; +import javax.servlet.http.HttpServletResponse; +import java.io.File; +import java.util.Date; +import java.util.List; +import java.util.Map; +import java.util.concurrent.CompletableFuture; +import java.util.concurrent.ThreadPoolExecutor; +import java.util.stream.Collectors; + +/** + * @author 12974 + * @description 针对表【hy_yrz_f(年水位表)】的数据库操作Service实现 + * @createDate 2024-09-05 16:53:36 + */ +@Service +public class HyYrzFServiceImpl extends ServiceImpl + implements HyYrzFService { + + @Resource + private ThreadPoolExecutor labelThreadPool; + + @Resource + private YcExportTaskService ycExportTaskService; + + /** + * 导入年水位表数据 + */ + @Override + @Transactional(rollbackFor = Exception.class) + public void importHyYrpFData(MultipartFile file) { + try { + List hyYrzFBos = ExcelUtils.readExcel(file.getInputStream(), HyYrzFBo.class, 2); + List hyYrpFList = hyYrzFBos.stream().map(i -> { + HyYrzF hyYrzF = new HyYrzF(); + BeanUtils.copyProperties(i, hyYrzF); + hyYrzF.setYr(Convert.toInt(i.getYr())); + hyYrzF.setAvz(Convert.toBigDecimal(i.getAvz())); + hyYrzF.setHtz(Convert.toBigDecimal(i.getHtz())); + hyYrzF.setHtzdt(DateUtils.parseDate(i.getHtzdt())); + hyYrzF.setMnz(Convert.toBigDecimal(i.getMnz())); + hyYrzF.setMnzdt(DateUtils.parseDate(i.getMnzdt())); + return hyYrzF; + }).collect(Collectors.toList()); + + this.saveBatch(hyYrpFList, 2000); + } catch (Exception e) { + e.printStackTrace(); + } + } + + /** + * 查询年水位表数据 + */ + @Override + public IPage selectHyYrzFPageByInfo(PageParams pageParams, String startTime, String endTime, String stnm, String stcd) { + Map map = CommonUtils.getYearAndDayDataMap(pageParams, startTime, endTime, stcd, stnm); + return this.baseMapper.selectHyYrzFPageByInfo(new Query().getPage(map), map); + } + + /** + * 导出年水位表数据 + */ + @Override + public R exportYearWaterLeverList(HttpServletResponse response, String startTime, String endTime, String stcd, String stnm) { + + Long userId = SecurityUtils.getUserId(); + String tableName = "年水位表"; + return taskAndExport(tableName,startTime, endTime, stcd, stnm, userId); + } + + @Resource + private ThreadPoolExecutor importThreadPool; + + @Autowired + private ApplicationContext context; + + + /** + * 从mysql导入到sqlserver中 + */ + @Transactional(rollbackFor = Exception.class) + @DataSource(DataSourceType.SHARDING) + public void importMysqlToSqlserver(List hyYrzFVoList) { + List records = hyYrzFVoList.stream().map(i->{ + HyYrzF hyYrzF = new HyYrzF(); + BeanUtils.copyProperties(i, hyYrzF); + hyYrzF.setYr(Convert.toInt(i.getYr())); + hyYrzF.setAvz(Convert.toBigDecimal(i.getAvz())); + hyYrzF.setHtz(Convert.toBigDecimal(i.getHtz())); + hyYrzF.setHtzdt(DateUtils.parseDate(i.getHtzdt())); + hyYrzF.setMnz(Convert.toBigDecimal(i.getMnz())); + hyYrzF.setMnzdt(DateUtils.parseDate(i.getMnzdt())); + return hyYrzF; + }).collect(Collectors.toList()); + //先清空临时表的数据 + this.baseMapper.deleteTempData(); + //插入临时表数据 + int batchSize = 50; + for (int i = 0; i < records.size(); i += batchSize) { + int end = Math.min(i + batchSize, records.size()); + List batch = records.subList(i, end); + // 执行批量插入 + this.baseMapper.insertTempData(batch); + } + //从临时表增或修改主表 + this.baseMapper.mergeToData(); + } + + @Override + public R importDateTosoft(String startTime, String endTime) { + Long userId = SecurityUtils.getUserId(); + String filename = "年水位表" + startTime + "-" + endTime+"导入到南方片"; + // 查询是否已存在相同条件且未完成的任务 + List ongoingTasks = ycExportTaskService.list( + new QueryWrapper() + .eq("user_id", userId) + .eq("status", 0) // 状态为0表示任务未完成 + .like("filename", "年水位表")); + if (!ongoingTasks.isEmpty()) { + return R.error("当前任务正在下载中，请稍后重试"); + } + YcExportTask ycExportTask = new YcExportTask(); + ycExportTask.setFilename(filename); + ycExportTask.setUserId(userId); + ycExportTask.setStartTime(new Date()); + ycExportTask.setStatus(0); + ycExportTaskService.save(ycExportTask); + CompletableFuture.runAsync(() -> { + try { + IPage pageByInfo = this.selectHyYrzFPageByInfo(new PageParams(0L, 1000000000L), startTime, endTime, null, null); +// IPage pageByInfo = this.selectMaxHRainListPageByInfo(new PageParams(0L, 1000000000L), null, null, startTime, endTime); + HyYrzFServiceImpl yrzFService = context.getBean(HyYrzFServiceImpl.class); + yrzFService.importMysqlToSqlserver(pageByInfo.getRecords()); + ycExportTask.setStatus(2); + } catch (Exception e) { + ycExportTask.setStatus(4); + log.error(e.getMessage()); + R.error("任务下载失败"); + }finally { + ycExportTask.setEndTime(new Date()); + ycExportTaskService.updateById(ycExportTask); + } + }, importThreadPool); + return R.ok("任务已提交"); + } + + private R taskAndExport(String tableName,String startTime, String endTime, String stcd, String stnm, Long userId) { + String startNewTime=""; + String endNewTime=""; + if (ObjectUtils.isNotEmpty(startTime) ){ + startNewTime=startTime.substring(0,4); + } + if (ObjectUtils.isNotEmpty(endTime)){ + endNewTime=endTime.substring(0,4); + } + String filename = tableName + startNewTime + "-" + endNewTime; + // 查询是否已存在相同条件且未完成的任务 + List ongoingTasks = ycExportTaskService.list( + new QueryWrapper() + .eq("user_id", userId) + .eq("filename", filename) + .eq("status", 0) // 状态为0表示任务未完成 + ); + + if (!ongoingTasks.isEmpty()) { + return R.error("当前任务正在下载中，请稍后重试"); + } + + YcExportTask ycExportTask = new YcExportTask(); + String pathPeffix = RuoYiConfig.getExportPath() + + File.separator + userId + File.separator+ + DateUtils.parseDateToStr("yyyy-MM-dd",DateUtils.getNowDate()) + File.separator + + DateUtils.parseDateToStr("HH_mm",DateUtils.getNowDate())+File.separator; + ycExportTask.setFilename(filename); + ycExportTask.setUserId(userId); + ycExportTask.setStartTime(new Date()); + ycExportTask.setStatus(0); + ycExportTask.setFilepath(pathPeffix); + ycExportTaskService.save(ycExportTask); + CompletableFuture.runAsync(() -> { + try { + File dest = new File(pathPeffix); + if (!dest.exists()) { + dest.mkdirs(); + } + String fullPath = pathPeffix + filename; + exportBlackData(fullPath, startTime, endTime, stcd, stnm); + + ycExportTask.setStatus(1); + ycExportTask.setEndTime(new Date()); + ycExportTaskService.updateById(ycExportTask); + } catch (Exception e) { + log.error(e.getMessage(), e); + R.error("任务下载失败"); + } + }, labelThreadPool); + return R.ok("任务已提交，请稍后下载"); + } + + private void exportBlackData(String tableName, String startTime, String endTime, String stcd, String stnm) { + Map rainMap = CommonUtils.getYearAndDayDataMap(new PageParams(0L, 1000000000L), startTime, endTime, stcd, stnm); + ExcelUtils.excelBackExport2("yearWaterLever.xls", tableName, (Sheet sheet, CellStyle style) -> + dataModel1(rainMap, sheet, style)); + } + + public int dataModel1(Map map, Sheet sheet, CellStyle style) { + // 批量查询数据 + IPage hyYrzFVoIPage = this.baseMapper.selectHyYrzFPageByInfo(new Query().getPage(map), map); + List records = hyYrzFVoIPage.getRecords(); + + // 定义当前sheet的行号 + int rowIndex = 2; // 从第二行开始写入数据 + // 定义全局序号 + int globalIndex = 1; // 从1开始 + + // 定义当前sheet的编号 + int sheetIndex = 1; + + // 最大行数限制 + int maxRowsPerSheet = 65536; // 对于 .xls 文件，最大行数为 65536 + int batchSize = 1000; // 每次批量处理1000行，减少逐行写入的开销 + + // 复制表头到新sheet的逻辑 + ExcelUtils.copyHeader(sheet, style); + + // 批量处理数据 + for (int i = 0; i < records.size(); i += batchSize) { + // 处理一批数据 + int toIndex = Math.min(i + batchSize, records.size()); + List batchList = records.subList(i, toIndex); + + // 批量写入数据 + for (HyYrzFVo vo : batchList) { + // 如果当前行数达到最大行数，创建新sheet + if (rowIndex >= maxRowsPerSheet) { + sheetIndex++; + sheet = sheet.getWorkbook().createSheet("年水位表" + sheetIndex); + rowIndex = 2; // 重置行号 + // 复制表头到新sheet + ExcelUtils.copyHeader(sheet, style); + } + + // 创建新行并写入数据 + Row row = ExcelUtils.createRow(sheet, rowIndex); + + // 使用 globalIndex 作为序号 + ExcelUtils.formatCell(row, 0, String.valueOf(globalIndex), style); + ExcelUtils.formatCell(row, 1, vo.getStcd() != null ? vo.getStcd() : "", style); + ExcelUtils.formatCell(row, 2, vo.getStnm() != null ? vo.getStnm() : "", style); + ExcelUtils.formatCell(row, 3, vo.getAddvcd() != null ? vo.getAddvcd() : "", style); + ExcelUtils.formatCell(row, 4, "", style); + ExcelUtils.formatCell(row, 5, vo.getYr() != null ? vo.getYr().toString() : "", style); + ExcelUtils.formatCell(row, 6, vo.getAvz() != null ? CommonUtils.formatNum(vo.getAvz()) : "", style); + ExcelUtils.formatCell(row, 7, vo.getAvzrcd() != null ? vo.getAvzrcd().toString() : "", style); + ExcelUtils.formatCell(row, 8, vo.getHtz() != null ? CommonUtils.formatNum(vo.getHtz()) : "", style); + ExcelUtils.formatCell(row, 9, vo.getHtzrcd() != null ? vo.getHtzrcd() : "", style); + ExcelUtils.formatCell(row, 10, vo.getHtzdt() != null ? vo.getHtzdt() : "", style); + ExcelUtils.formatCell(row, 11, vo.getMnz() != null ? CommonUtils.formatNum(vo.getMnz()) : "", style); + ExcelUtils.formatCell(row, 12, vo.getMnzrcd() != null ? vo.getMnzrcd() : "", style); + ExcelUtils.formatCell(row, 13, vo.getMnzdt() != null ? vo.getMnzdt() : "", style); + ExcelUtils.formatCell(row, 14, "", style); + + // 增加行号和全局序号 + rowIndex++; + globalIndex++; + } + } + return 0; + } + + public void dataModel(Map map, Sheet sheet, CellStyle style) { + // 批量查询数据 + IPage hyYrzFVoIPage = this.baseMapper.selectHyYrzFPageByInfo(new Query().getPage(map), map); + List records = hyYrzFVoIPage.getRecords(); + // 定义当前sheet的行号 + int rowIndex = 2; + // 定义当前sheet的编号 + int sheetIndex = 1; + Row row; + // 最大行数限制 + int maxRowsPerSheet = 65536; // 对于 .xls 文件，最大行数为 65536 + int batchSize = 1000; // 每次批量处理1000行，减少逐行写入的开销 + // 批量处理数据 + for (int i = 0; i < records.size(); i += batchSize) { + // 处理一批数据 + int toIndex = Math.min(i + batchSize, records.size()); + List batchList = records.subList(i, toIndex); + // 批量写入数据 + for (HyYrzFVo vo : batchList) { + // 如果当前行数达到最大行数，创建新sheet + if (rowIndex >= maxRowsPerSheet) { + sheetIndex++; + sheet = sheet.getWorkbook().createSheet("年水位表" + sheetIndex); + rowIndex = 2; // 重置行号 + } + // 创建新行并写入数据 + row = ExcelUtils.createRow(sheet, rowIndex); + //序号 + ExcelUtils.formatCell(row, 0, String.valueOf(rowIndex - 1), style); + ExcelUtils.formatCell(row, 1, vo.getStcd() != null ? vo.getStcd() : "", style); + ExcelUtils.formatCell(row, 2, vo.getStnm() != null ? vo.getStnm() : "", style); + ExcelUtils.formatCell(row, 3, vo.getAddvcd() != null ? vo.getAddvcd() : "", style); + ExcelUtils.formatCell(row, 4, "", style); + ExcelUtils.formatCell(row, 5, vo.getYr() != null ? vo.getYr().toString() : "", style); + ExcelUtils.formatCell(row, 6, vo.getAvz() != null ? CommonUtils.formatNum(vo.getAvz()) : "", style); + ExcelUtils.formatCell(row, 7, vo.getAvzrcd() != null ? vo.getAvzrcd().toString() : "", style); + ExcelUtils.formatCell(row, 8, vo.getHtz() != null ? CommonUtils.formatNum(vo.getHtz()) : "", style); + ExcelUtils.formatCell(row, 9, vo.getHtzrcd() != null ? vo.getHtzrcd() : "", style); + ExcelUtils.formatCell(row, 10, vo.getHtzdt() != null ? vo.getHtzdt() : "", style); + ExcelUtils.formatCell(row, 11, vo.getMnz() != null ? CommonUtils.formatNum(vo.getMnz()) : "", style); + ExcelUtils.formatCell(row, 12, vo.getMnzrcd() != null ? vo.getMnzrcd() : "", style); + ExcelUtils.formatCell(row, 13, vo.getMnzdt() != null ? vo.getMnzdt() : "", style); + ExcelUtils.formatCell(row, 14, "", style); + rowIndex++; + } + } + } +} + + + + diff --git a/swlscx/src/main/resources/mapper/basic/HyStscAMapper.xml b/swlscx/src/main/resources/mapper/basic/HyStscAMapper.xml new file mode 100644 index 0000000..4acde65 --- /dev/null +++ b/swlscx/src/main/resources/mapper/basic/HyStscAMapper.xml @@ -0,0 +1,112 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + stcd,stnm,stct, + bshncd,hnnm,rvnm, + obitmcd,addvcd,wrrgcd, + esstyr,esstmth,wdstyr, + wdstmth,drar,flto, + dstrvm,fdtmnm,admag, + admnst,stlc,lgtd, + lttd,stgrd,frgrd, + nt + + + + + + TRUNCATE TABLE hy_stsc_a_temp; + + + + + + + + MERGE INTO hy_stsc_a AS a + USING hy_stsc_a_temp AS temp + ON (a.stcd = temp.stcd) + WHEN MATCHED THEN + UPDATE SET + a.stnm = temp.stnm, + a.stct = temp.stct, + a.bshncd = temp.bshncd, + a.hnnm = temp.hnnm, + a.rvnm = temp.rvnm, + a.obitmcd = temp.obitmcd, + a.addvcd = temp.addvcd, + a.wrrgcd = temp.wrrgcd, + a.esstyr = temp.esstyr, + a.esstmth = temp.esstmth, + a.wdstyr = temp.wdstyr, + a.wdstmth = temp.wdstmth, + a.drar = temp.drar, + a.flto = temp.flto, + a.dstrvm = temp.dstrvm, + a.fdtmnm = temp.fdtmnm, + a.admag = temp.admag, + a.admnst = temp.admnst, + a.stlc = temp.stlc, + a.lgtd = temp.lgtd, + a.lttd = temp.lttd, + a.stgrd = temp.stgrd, + a.frgrd = temp.frgrd, + a.nt = temp.nt + WHEN NOT MATCHED THEN + INSERT (stcd, stnm, stct, bshncd, hnnm, rvnm, obitmcd, addvcd, wrrgcd, esstyr, esstmth, wdstyr, wdstmth, drar, flto, dstrvm, fdtmnm, admag, admnst, stlc, lgtd, lttd, stgrd, frgrd, nt) + VALUES + (temp.stcd, temp.stnm, temp.stct, temp.bshncd, temp.hnnm, temp.rvnm, temp.obitmcd, temp.addvcd, temp.wrrgcd, temp.esstyr, temp.esstmth, temp.wdstyr, temp.wdstmth, temp.drar, temp.flto, temp.dstrvm, temp.fdtmnm, temp.admag, temp.admnst, temp.stlc, temp.lgtd, temp.lttd, temp.stgrd, temp.frgrd, temp.nt); + + diff --git a/swlscx/src/main/resources/mapper/basic/YcExportTaskMapper.xml b/swlscx/src/main/resources/mapper/basic/YcExportTaskMapper.xml new file mode 100644 index 0000000..b8073b9 --- /dev/null +++ b/swlscx/src/main/resources/mapper/basic/YcExportTaskMapper.xml @@ -0,0 +1,19 @@ + + + + + + + + diff --git a/swlscx/src/main/resources/mapper/day/HyDcsFMapper.xml b/swlscx/src/main/resources/mapper/day/HyDcsFMapper.xml new file mode 100644 index 0000000..cdd5add --- /dev/null +++ b/swlscx/src/main/resources/mapper/day/HyDcsFMapper.xml @@ -0,0 +1,85 @@ + + + + + + + + + + + + + TRUNCATE TABLE hy_dcs_f_temp; + + + + INSERT INTO hy_dcs_f_temp (stcd, dt, avcs, avcsrcd) + VALUES + + (#{item.stcd}, #{item.dt,jdbcType=TIMESTAMP}, #{item.avcs}, #{item.avcsrcd}) + + + + + insert into hy_dcs_f (stcd, dt, avcs, avcsrcd) + select a.stcd, + a.dt, + a.avcs, + a.avcsrcd + from hy_dcs_f_temp a + on duplicate key + update avcs = a.avcs, + avcsrcd = a.avcsrcd + + + + + + + + TRUNCATE TABLE hy_dcs_c_temp; + + + + INSERT INTO hy_dcs_c_temp (stcd, dt, avcs, avcsrcd) + VALUES + + (#{item.stcd}, #{item.dt,jdbcType=TIMESTAMP}, #{item.avcs}, #{item.avcsrcd}) + + + + + MERGE INTO hy_dcs_c AS a + USING hy_dcs_c_temp AS temp + ON (a.stcd = temp.stcd AND a.dt = temp.dt) + WHEN MATCHED THEN + UPDATE SET a.avcs = temp.avcs, a.avcsrcd = temp.avcsrcd + WHEN NOT MATCHED THEN + INSERT (stcd, dt, avcs, avcsrcd) + VALUES (temp.stcd, temp.dt, temp.avcs, temp.avcsrcd); + + diff --git a/swlscx/src/main/resources/mapper/day/HyDpCMapper.xml b/swlscx/src/main/resources/mapper/day/HyDpCMapper.xml new file mode 100644 index 0000000..917c504 --- /dev/null +++ b/swlscx/src/main/resources/mapper/day/HyDpCMapper.xml @@ -0,0 +1,79 @@ + + + + + + + + + + + + + TRUNCATE TABLE hy_dp_c_temp; + + + + INSERT INTO hy_dp_c_temp (stcd, dt, p, prcd) + VALUES + + (#{item.stcd}, #{item.dt,jdbcType=TIMESTAMP}, #{item.p}, #{item.prcd}) + + + + + + + insert into hy_dp_c (stcd, dt, p, prcd) + select a.stcd, + a.dt, + a.p, + a.prcd + from hy_dp_c_temp a + on duplicate key + update p = a.p, + prcd = a.prcd + + + + + + + MERGE INTO hy_dp_c AS hme + USING hy_dp_c_temp AS temp + ON (hme.stcd = temp.stcd AND hme.dt = temp.dt) + WHEN MATCHED THEN + UPDATE SET hme.p = temp.p, + hme.prcd = temp.prcd + WHEN NOT MATCHED THEN + INSERT (stcd, dt, p, prcd) + VALUES (temp.stcd, temp.dt, temp.p, temp.prcd); + + + diff --git a/swlscx/src/main/resources/mapper/day/HyDqCMapper.xml b/swlscx/src/main/resources/mapper/day/HyDqCMapper.xml new file mode 100644 index 0000000..0ce0e75 --- /dev/null +++ b/swlscx/src/main/resources/mapper/day/HyDqCMapper.xml @@ -0,0 +1,75 @@ + + + + + + + + + + + + + TRUNCATE TABLE hy_dq_c_temp; + + + + INSERT INTO hy_dq_c_temp (stcd, dt, avq, avqrcd) + VALUES + + (#{item.stcd}, #{item.dt,jdbcType=TIMESTAMP}, #{item.avq}, #{item.avqrcd}) + + + + + insert into hy_dq_c (stcd, dt, avq, avqrcd) + select a.stcd, + a.dt, + a.avq, + a.avqrcd + from hy_dq_c_temp a + on duplicate key + update avq = a.avq, + avqrcd = a.avqrcd + + + + + + MERGE INTO hy_dq_c AS a + USING hy_dq_c_temp AS temp + ON (a.stcd = temp.stcd AND a.dt = temp.dt) + WHEN MATCHED THEN + UPDATE SET a.avq = temp.avq, a.avqrcd = temp.avqrcd + WHEN NOT MATCHED THEN + INSERT (stcd, dt, avq, avqrcd) + VALUES + (temp.stcd, temp.dt, temp.avq, temp.avqrcd); + + diff --git a/swlscx/src/main/resources/mapper/day/HyDqsCMapper.xml b/swlscx/src/main/resources/mapper/day/HyDqsCMapper.xml new file mode 100644 index 0000000..8070a0a --- /dev/null +++ b/swlscx/src/main/resources/mapper/day/HyDqsCMapper.xml @@ -0,0 +1,19 @@ + + + + + + + + + + + + + + stcd,sdtp,dt, + avqs,avqsrcd + + diff --git a/swlscx/src/main/resources/mapper/day/HyDweCMapper.xml b/swlscx/src/main/resources/mapper/day/HyDweCMapper.xml new file mode 100644 index 0000000..8116bde --- /dev/null +++ b/swlscx/src/main/resources/mapper/day/HyDweCMapper.xml @@ -0,0 +1,70 @@ + + + + + + + + + + + + + + + TRUNCATE TABLE hy_dwe_c_temp; + + + + INSERT INTO hy_dwe_c_temp (stcd, dt, eetp, wsfe,wsfercd) + VALUES + + (#{item.stcd}, #{item.dt}, #{item.eetp}, #{item.wsfe},#{item.wsfercd}) + + + + + + insert into hy_dwe_c (stcd, dt, eetp, wsfe,wsfercd) + select a.stcd, + a.dt, + a.eetp, + a.wsfe, + a.wsfercd + from hy_dwe_c_temp a + on duplicate key + update wsfe = a.wsfe, + wsfercd = a.wsfercd + + + + + + diff --git a/swlscx/src/main/resources/mapper/day/HyDwtCMapper.xml b/swlscx/src/main/resources/mapper/day/HyDwtCMapper.xml new file mode 100644 index 0000000..5574c3b --- /dev/null +++ b/swlscx/src/main/resources/mapper/day/HyDwtCMapper.xml @@ -0,0 +1,33 @@ + + + + + + + diff --git a/swlscx/src/main/resources/mapper/day/HyDzCMapper.xml b/swlscx/src/main/resources/mapper/day/HyDzCMapper.xml new file mode 100644 index 0000000..8e3e177 --- /dev/null +++ b/swlscx/src/main/resources/mapper/day/HyDzCMapper.xml @@ -0,0 +1,75 @@ + + + + + + + + + + + + + TRUNCATE TABLE hy_dz_c_temp; + + + + INSERT INTO hy_dz_c_temp (stcd, dt, avz, avzrcd) + VALUES + + (#{item.stcd}, #{item.dt,jdbcType=TIMESTAMP}, #{item.avz}, #{item.avzrcd}) + + + + + insert into hy_dz_c (stcd, dt, avz, avzrcd) + select a.stcd, + a.dt, + a.avz, + a.avzrcd + from hy_dz_c_temp a + on duplicate key + update avz = a.avz, + avzrcd = a.avzrcd + + + + + + + MERGE INTO hy_dz_c AS a + USING hy_dz_c_temp AS temp + ON (a.stcd = temp.stcd AND a.dt = temp.dt) + WHEN MATCHED THEN + UPDATE SET a.avz = temp.avz, a.avzrcd = temp.avzrcd + WHEN NOT MATCHED THEN + INSERT (stcd, dt, avz, avzrcd) + VALUES (temp.stcd, temp.dt, temp.avz, temp.avzrcd); + + diff --git a/swlscx/src/main/resources/mapper/excerpt/HyFdheexBMapper.xml b/swlscx/src/main/resources/mapper/excerpt/HyFdheexBMapper.xml new file mode 100644 index 0000000..7aea700 --- /dev/null +++ b/swlscx/src/main/resources/mapper/excerpt/HyFdheexBMapper.xml @@ -0,0 +1,82 @@ + + + + + + + + + + + + + + + + TRUNCATE TABLE hy_fdheex_b_temp; + + + + INSERT INTO hy_fdheex_b_temp (stcd, tm, z, zrcd,q,s) + VALUES + + (#{item.stcd}, #{item.tm}, #{item.z}, #{item.zrcd},#{item.q},#{item.s}) + + + + + + + insert into hy_fdheex_b (stcd, tm, z, zrcd, q, s) + select a.stcd, + a.tm, + a.z, + a.zrcd, + a.q, + a.s + from hy_fdheex_b_temp a + on duplicate key + update z = a.z, + zrcd = a.zrcd, + q = a.q, + s = a.s + + + + + + + + MERGE INTO hy_fdheex_b AS a + USING hy_fdheex_b_temp AS temp + ON (a.stcd = temp.stcd AND a.tm = temp.tm) + WHEN MATCHED THEN + UPDATE SET a.z = temp.z, a.zrcd = temp.zrcd, a.q = temp.q, a.s = temp.s + WHEN NOT MATCHED THEN + INSERT (stcd, tm, z, zrcd, q, s) + VALUES (temp.stcd, temp.tm, temp.z, temp.zrcd, temp.q, temp.s); + + diff --git a/swlscx/src/main/resources/mapper/excerpt/HyHltdzBMapper.xml b/swlscx/src/main/resources/mapper/excerpt/HyHltdzBMapper.xml new file mode 100644 index 0000000..a736c41 --- /dev/null +++ b/swlscx/src/main/resources/mapper/excerpt/HyHltdzBMapper.xml @@ -0,0 +1,95 @@ + + + + + + + + + + + + + + + + + TRUNCATE TABLE hy_hltdz_b_temp; + + + + INSERT INTO hy_hltdz_b_temp (stcd, tm, tdtp, tdz,tdzrcd,tdrng,dr,nt) + VALUES + +(#{item.stcd}, #{item.tm,jdbcType=TIMESTAMP}, #{item.tdtp}, #{item.tdz},#{item.tdzrcd},#{item.tdrng},#{item.dr},#{item.nt}) + + + + + + + insert into hy_hltdz_b (stcd, tm, tdtp, tdz, tdzrcd, tdrng, dr, nt) + select a.stcd, + a.tm, + a.tdtp, + a.tdz, + a.tdzrcd, + a.tdrng, + a.dr, + a.nt + from hy_hltdz_b_temp a + on duplicate key + update tdtp = a.tdtp, + tdz = a.tdz, + tdzrcd = a.tdzrcd, + tdrng = a.tdrng, + dr = a.dr, + nt = a.nt + + + + + + + MERGE INTO hy_hltdz_b AS a + USING hy_hltdz_b_temp AS temp + ON (a.stcd = temp.stcd AND a.tm = temp.tm) + WHEN MATCHED THEN + UPDATE SET a.tdtp = temp.tdtp,a.tdz = temp.tdz, a.tdzrcd = temp.tdzrcd, a.tdrng = temp.tdrng, a.dr = temp.dr, a.nt = temp.nt + WHEN NOT MATCHED THEN + INSERT (stcd, tm, tdtp, tdz, tdzrcd, tdrng, dr, nt) + VALUES + (temp.stcd, temp.tm, temp.tdtp, temp.tdz, temp.tdzrcd, temp.tdrng, temp.dr, temp.nt); + + + diff --git a/swlscx/src/main/resources/mapper/excerpt/HyPrexBMapper.xml b/swlscx/src/main/resources/mapper/excerpt/HyPrexBMapper.xml new file mode 100644 index 0000000..f03997b --- /dev/null +++ b/swlscx/src/main/resources/mapper/excerpt/HyPrexBMapper.xml @@ -0,0 +1,77 @@ + + + + + + + + + + + + + + TRUNCATE TABLE hy_prex_b_temp; + + + + INSERT INTO hy_prex_b_temp (stcd, bgtm, endtm, p,prcd) + VALUES + + (#{item.stcd}, #{item.bgtm,jdbcType=TIMESTAMP}, #{item.endtm,jdbcType=TIMESTAMP}, #{item.p},#{item.prcd}) + + + + + + + insert into hy_prex_b (stcd, bgtm, endtm, p, prcd) + select a.stcd, + a.bgtm, + a.endtm, + a.p, + a.prcd + from hy_prex_b_temp a + on duplicate key + update endtm = a.endtm, + p = a.p, + prcd = a.prcd + + + + + + + MERGE INTO hy_prex_b AS a + USING hy_prex_b_temp AS temp + ON (a.stcd = temp.stcd AND a.bgtm = temp.bgtm) + WHEN MATCHED THEN + UPDATE SET a.endtm = temp.endtm, a.p = temp.p, a.prcd = temp.prcd + WHEN NOT MATCHED THEN + INSERT (stcd, bgtm, endtm, p, prcd) + VALUES (temp.stcd, temp.bgtm, temp.endtm, temp.p, temp.prcd); + + + diff --git a/swlscx/src/main/resources/mapper/excerpt/HyRvfhexBMapper.xml b/swlscx/src/main/resources/mapper/excerpt/HyRvfhexBMapper.xml new file mode 100644 index 0000000..289a68b --- /dev/null +++ b/swlscx/src/main/resources/mapper/excerpt/HyRvfhexBMapper.xml @@ -0,0 +1,88 @@ + + + + + + + + + + + + + + + + + + TRUNCATE TABLE hy_rvfhex_b_temp; + + + + INSERT INTO hy_rvfhex_b_temp (stcd, tm, dambhdz, dambhdzrcd,q,s,w,nt) + VALUES + +(#{item.stcd}, #{item.tm,jdbcType=TIMESTAMP}, #{item.dambhdz}, #{item.dambhdzrcd},#{item.q},#{item.s},#{item.w},#{item.nt}) + + + + + + + insert into hy_rvfhex_b (stcd, tm, dambhdz, dambhdzrcd, q, s, w, nt) + select a.stcd, + a.tm, + a.dambhdz, + a.dambhdzrcd, + a.q, + a.s, + a.w, + a.nt + from hy_rvfhex_b_temp a + on duplicate key + update dambhdz = a.dambhdz, + dambhdzrcd = a.dambhdzrcd, + q = a.q, + s = a.s, + w = a.w, + nt = a.nt + + + + + + + MERGE INTO hy_rvfhex_b AS a + USING hy_rvfhex_b_temp AS temp + ON (a.stcd = temp.stcd AND a.tm = temp.tm) + WHEN MATCHED THEN + UPDATE SET a.dambhdz = temp.dambhdz, a.dambhdzrcd = temp.dambhdzrcd, a.q = temp.q, a.s = temp.s, a.w = temp.w, a.nt = temp.nt + WHEN NOT MATCHED THEN + INSERT (stcd, tm, dambhdz, dambhdzrcd, q, s, w, nt) + VALUES (temp.stcd, temp.tm, temp.dambhdz, temp.dambhdzrcd, temp.q, temp.s, temp.w, temp.nt); + + diff --git a/swlscx/src/main/resources/mapper/excerpt/HyWsfhexBMapper.xml b/swlscx/src/main/resources/mapper/excerpt/HyWsfhexBMapper.xml new file mode 100644 index 0000000..5b9640c --- /dev/null +++ b/swlscx/src/main/resources/mapper/excerpt/HyWsfhexBMapper.xml @@ -0,0 +1,61 @@ + + + + + + + + TRUNCATE TABLE hy_wsfhex_b_temp; + + + + INSERT INTO hy_wsfhex_b_temp(stcd, tm, upz, upzrcd, dwz, dwzrcd, q, s) + VALUES + + (#{item.stcd}, #{item.tm,jdbcType=TIMESTAMP}, #{item.upz}, #{item.upzrcd}, #{item.dwz}, #{item.dwzrcd}, #{item.q}, #{item.s}) + + + + + MERGE INTO hy_wsfhex_b AS a + USING hy_wsfhex_b_temp AS temp + ON (a.stcd = temp.stcd AND a.tm = temp.tm AND a.upz = temp.upz AND a.upzrcd = temp.upzrcd AND a.dwz = temp.dwz AND a.dwzrcd = temp.dwzrcd) + WHEN MATCHED THEN + UPDATE SET a.q = temp.q, a.s = temp.s + WHEN NOT MATCHED THEN + INSERT (stcd, tm, upz, upzrcd, dwz, dwzrcd, q, s) + VALUES (temp.stcd, temp.tm, temp.upz, temp.upzrcd, temp.dwz, temp.dwzrcd, temp.q, temp.s); + + + diff --git a/swlscx/src/main/resources/mapper/month/HyMtchpdEMapper.xml b/swlscx/src/main/resources/mapper/month/HyMtchpdEMapper.xml new file mode 100644 index 0000000..bd15036 --- /dev/null +++ b/swlscx/src/main/resources/mapper/month/HyMtchpdEMapper.xml @@ -0,0 +1,23 @@ + + + + + + + + + + + + + + + + + stcd,sdtp,yr, + mth,mdpd,avpd, + mxpd,nt + + diff --git a/swlscx/src/main/resources/mapper/month/HyMtcsEMapper.xml b/swlscx/src/main/resources/mapper/month/HyMtcsEMapper.xml new file mode 100644 index 0000000..f3e61d3 --- /dev/null +++ b/swlscx/src/main/resources/mapper/month/HyMtcsEMapper.xml @@ -0,0 +1,79 @@ + + + + + hsa.stnm,hsa.addvcd, + hme.stcd,hme.yr,hme.mth, + hme.avcs,hme.avcsrcd,hme.mxs, + hme.mxsrcd,hme.mxsdt,hme.mns, + hme.mnsrcd,hme.mnsdt + + + + + + + TRUNCATE TABLE hy_mtcs_e_temp; + + + + insert into hy_mtcs_e_temp (stcd, yr, mth, avcs, avcsrcd, mxs, mxsrcd, mxsdt, mns, mnsrcd, mnsdt) + values + + (#{item.stcd}, #{item.yr}, #{item.mth}, #{item.avcs}, #{item.avcsrcd}, #{item.mxs} + , #{item.mxsrcd}, #{item.mxsdt,jdbcType=TIMESTAMP}, + #{item.mns}, #{item.mnsrcd}, #{item.mnsdt,jdbcType=TIMESTAMP}) + + + + + MERGE INTO hy_mtcs_e AS a + USING hy_mtcs_e_temp AS temp + ON (a.stcd = temp.stcd AND a.yr = temp.yr AND a.mth = temp.mth) + WHEN MATCHED THEN + UPDATE SET a.avcs = temp.avcs, a.avcsrcd = temp.avcsrcd, a.mxs = temp.mxs, + a.mxsrcd = temp.mxsrcd, a.mxsdt = temp.mxsdt, + a.mns = temp.mns, a.mnsrcd=temp.mnsrcd, a.mnsdt = temp.mnsdt + WHEN NOT MATCHED THEN + INSERT (stcd, yr, mth, avcs, avcsrcd, mxs, mxsrcd, mxsdt, mns, mnsrcd, mnsdt) + VALUES (temp.stcd, temp.yr, temp.mth, temp.avcs, temp.avcsrcd, temp.mxs, temp.mxsrcd, temp.mxsdt, temp.mns, temp.mnsrcd, temp.mnsdt); + + + + diff --git a/swlscx/src/main/resources/mapper/month/HyMtiqEMapper.xml b/swlscx/src/main/resources/mapper/month/HyMtiqEMapper.xml new file mode 100644 index 0000000..5b29f54 --- /dev/null +++ b/swlscx/src/main/resources/mapper/month/HyMtiqEMapper.xml @@ -0,0 +1,23 @@ + + + + + + + + + + + + + + + + + stcd,yr,mth, + tiq,tiqrcd,mxiq, + mxiqrcd,mxiqdt + + diff --git a/swlscx/src/main/resources/mapper/month/HyMtpEMapper.xml b/swlscx/src/main/resources/mapper/month/HyMtpEMapper.xml new file mode 100644 index 0000000..c41f2e4 --- /dev/null +++ b/swlscx/src/main/resources/mapper/month/HyMtpEMapper.xml @@ -0,0 +1,98 @@ + + + + + + + + + + + TRUNCATE TABLE hy_mtp_e_temp; + + + INSERT INTO hy_mtp_e_temp (stcd, yr, mth, p, prcd, pdynum, pdynumrcd, mxdyp, mxdyprcd, mxdypodt) + VALUES + + (#{item.stcd}, #{item.yr}, #{item.mth}, #{item.p}, #{item.prcd}, #{item.pdynum}, #{item.pdynumrcd}, #{item.mxdyp}, #{item.mxdyprcd}, #{item.mxdypodt,jdbcType=TIMESTAMP}) + + + + MERGE INTO hy_mtp_e AS a + USING hy_mtp_e_temp AS temp + ON (a.stcd = temp.stcd AND a.yr = temp.yr AND a.mth = temp.mth) + WHEN MATCHED THEN + UPDATE SET a.p = temp.p, a.prcd = temp.prcd, a.pdynum = temp.pdynum, a.pdynumrcd = temp.pdynumrcd, a.mxdyp =temp.mxdyp, a.mxdyprcd = temp.mxdyprcd, a.mxdypodt = temp.mxdypodt + WHEN NOT MATCHED THEN + INSERT (stcd, yr, mth, p, prcd, pdynum, pdynumrcd, mxdyp, mxdyprcd, mxdypodt) + VALUES (temp.stcd, temp.yr, temp.mth, temp.p, temp.prcd, temp.pdynum, temp.pdynumrcd, temp.mxdyp, temp.mxdyprcd, temp.mxdypodt); + + + + diff --git a/swlscx/src/main/resources/mapper/month/HyMtpddbEMapper.xml b/swlscx/src/main/resources/mapper/month/HyMtpddbEMapper.xml new file mode 100644 index 0000000..eb033a9 --- /dev/null +++ b/swlscx/src/main/resources/mapper/month/HyMtpddbEMapper.xml @@ -0,0 +1,20 @@ + + + + + + + + + + + + + + + stcd,sdtp,yr, + mth,ltpd,avswpct + + diff --git a/swlscx/src/main/resources/mapper/month/HyMtqEMapper.xml b/swlscx/src/main/resources/mapper/month/HyMtqEMapper.xml new file mode 100644 index 0000000..dcd3529 --- /dev/null +++ b/swlscx/src/main/resources/mapper/month/HyMtqEMapper.xml @@ -0,0 +1,81 @@ + + + + + + + + + + + + + + + + + + + + + + TRUNCATE TABLE hy_mtq_e_temp + + + + insert into hy_mtq_e_temp (stcd, yr, mth, avq, avqrcd, mxq, mxqrcd, mxqdt, mnq, mnqrcd, mnqdt) + values + + (#{item.stcd}, #{item.yr}, #{item.mth}, #{item.avq}, #{item.avqrcd}, #{item.mxq}, #{item.mxqrcd}, + #{item.mxqdt,jdbcType=TIMESTAMP}, #{item.mnq},#{item.mnqrcd},#{item.mnqdt,jdbcType=TIMESTAMP}) + + + + + MERGE INTO hy_mtq_e t + USING ( + SELECT + stcd, yr, mth, avq, avqrcd, mxq, mxqrcd, mxqdt, mnq, mnqrcd, mnqdt + FROM hy_mtq_e_temp + ) s + ON (t.stcd = s.stcd AND t.yr = s.yr AND t.mth = s.mth) + WHEN MATCHED THEN + UPDATE SET t.avq = s.avq, t.avqrcd=s.avqrcd, t.mxq = s.mxq, t.mxqrcd = s.mxqrcd, t.mxqdt = s.mxqdt, + t.mnq = s.mnq, t.mnqrcd = s.mnqrcd, t.mnqdt = s.mnqdt + WHEN NOT MATCHED THEN + INSERT (stcd, yr, mth, avq, avqrcd, mxq, mxqrcd,mxqdt, mnq, mnqrcd, mnqdt) + VALUES (s.stcd, s.yr, s.mth, s.avq, s.avqrcd, s.mxq, s.mxqrcd, s.mxqdt, s.mnq, s.mnqrcd, s.mnqdt); + + + diff --git a/swlscx/src/main/resources/mapper/month/HyMtqsEMapper.xml b/swlscx/src/main/resources/mapper/month/HyMtqsEMapper.xml new file mode 100644 index 0000000..2b92b9d --- /dev/null +++ b/swlscx/src/main/resources/mapper/month/HyMtqsEMapper.xml @@ -0,0 +1,83 @@ + + + + + + + + + + + + + + + + + + hme.stcd,hme.sdtp,hme.yr, + hme.mth,hme.avqs,hme.avqsrcd, + hme.mxdyqs,hme.mxdyqsrcd,hme.mxdyqsodt,hsa.stnm,hsa.addvcd + + + + + + TRUNCATE TABLE hy_mtqs_e_temp; + + + + insert into hy_mtqs_e_temp(stcd, sdtp, yr, mth, avqs, avqsrcd, mxdyqs, mxdyqsrcd, mxdyqsodt) + values + + (#{item.stcd}, #{item.sdtp}, #{item.yr}, #{item.mth}, #{item.avqs}, #{item.avqsrcd}, #{item.mxdyqs}, #{item.mxdyqsrcd}, #{item.mxdyqsodt,jdbcType=TIMESTAMP}) + + + + MERGE INTO hy_mtqs_e AS a + USING hy_mtqs_e_temp AS temp + ON (a.stcd = temp.stcd AND a.sdtp = temp.sdtp AND a.yr = temp.yr AND a.mth = temp.mth) + WHEN MATCHED THEN + UPDATE SET a.avqs = temp.avqs, a.avqsrcd = temp.avqsrcd, a.mxdyqs = temp.mxdyqs, a.mxdyqsrcd = temp.mxdyqsrcd + , a.mxdyqsodt = temp.mxdyqsodt + WHEN NOT MATCHED THEN + INSERT (stcd, sdtp, yr, mth, avqs, avqsrcd, mxdyqs, mxdyqsrcd, mxdyqsodt) + VALUES (temp.stcd, temp.sdtp, temp.yr, temp.mth, temp.avqs, temp.avqsrcd, temp.mxdyqs, temp.mxdyqsrcd, temp.mxdyqsodt); + + diff --git a/swlscx/src/main/resources/mapper/month/HyMttdzEMapper.xml b/swlscx/src/main/resources/mapper/month/HyMttdzEMapper.xml new file mode 100644 index 0000000..94cd8ce --- /dev/null +++ b/swlscx/src/main/resources/mapper/month/HyMttdzEMapper.xml @@ -0,0 +1,123 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + stcd,yr,mth, + avhtdz,avhtdzrcd,hthtdz, + hthtdzrcd,hthtdzotm,lthtdz, + lthtdzrcd,lthtdzotm,avltdz, + avltdzrcd,htltdz,htltdzrcd, + htltdzotm,ltltdz,ltltdzrcd, + ltltdzotm,avftdr,avftdrrcd, + mxfltdr,mxfltdrrcd,mxfltdrhtm, + mnfltdr,mnfltdrrcd,mnfltdrhtm, + aver,averbbrrcd,mxebtdr, + mxebtdrrcd,mxebtdrht,mnebtdr, + mnebtdrrcd,mnebtdrhtm,avftd, + avftdrcd,mxfltddr,mxfltddrrcd, + mxfltddrhtm,mnfltddr,mnfltddrrcd, + mnfltddrhtm,avebbdr,avedrc, + mxebtddr,mxebtddrrcd,mxebtddrhtm, + mnbtddr,mnebtddrrcd,mnebtddrhtm, + hravtdz,hravtdzrcd,avtdr, + avtdrrcd,avtddr,avtddrrcd + + + + diff --git a/swlscx/src/main/resources/mapper/month/HyMtweEMapper.xml b/swlscx/src/main/resources/mapper/month/HyMtweEMapper.xml new file mode 100644 index 0000000..0deda7a --- /dev/null +++ b/swlscx/src/main/resources/mapper/month/HyMtweEMapper.xml @@ -0,0 +1,92 @@ + + + + + + + + + + + + + + + + + + + stcd,eetp,yr, + mth,wsfe,wsfercd, + mxdye,mxdyercd,mndye, + mndyercd + + + + + + + TRUNCATE TABLE hy_mtwe_e_temp; + + + + insert into hy_mtwe_e_temp (stcd,eetp,yr,mth,wsfe,wsfercd,mxdye,mxdyercd,mndye,mndyercd) + values + + (#{item.stcd},#{item.eetp},#{item.yr} + ,#{item.mth},#{item.wsfe},#{item.wsfercd},#{item.mxdye},#{item.mxdyercd} + ,#{item.mndye},#{item.mndyercd}) + + + + + MERGE INTO hy_mtwe_e as hme + USING hy_mtwe_e_temp as temp + ON (hme.stcd = temp.stcd AND hme.eetp = temp.eetp AND hme.yr = temp.yr AND hme.mth = temp.mth) + WHEN MATCHED THEN + UPDATE SET hme.wsfe = temp.wsfe, + hme.wsfercd = temp.wsfercd, + hme.mxdye = temp.mxdye, + hme.mxdyercd = temp.mxdyercd, + hme.mndye = temp.mndye, + hme.mndyercd = temp.mndyercd + WHEN NOT MATCHED THEN + INSERT (stcd,eetp,yr,mth,wsfe,wsfercd,mxdye,mxdyercd,mndye,mndyercd) + VALUES (temp.stcd,temp.eetp,temp.yr,temp.mth,temp.wsfe,temp.wsfercd,temp.mxdye,temp.mxdyercd,temp.mndye,temp.mndyercd); + + + diff --git a/swlscx/src/main/resources/mapper/month/HyMtwtEMapper.xml b/swlscx/src/main/resources/mapper/month/HyMtwtEMapper.xml new file mode 100644 index 0000000..a437f32 --- /dev/null +++ b/swlscx/src/main/resources/mapper/month/HyMtwtEMapper.xml @@ -0,0 +1,80 @@ + + + + + + + + + + + + + + + + + + + + stcd,yr,mth, + avwtmp,avwtmprcd,mxwtmp, + mxwtmprcd,mxwtmpdt,mnwtmp, + mnwtmprcd,mnwtmpdt + + + + + + TRUNCATE TABLE hy_mtwt_e_temp; + + + + insert into hy_mtwt_e_temp (stcd,yr,mth,avwtmp,avwtmprcd,mxwtmp,mxwtmprcd,mxwtmpdt,mnwtmp,mnwtmprcd,mnwtmpdt) + values + + (#{item.stcd},#{item.yr},#{item.mth},#{item.avwtmp} + ,#{item.avwtmprcd},#{item.mxwtmp},#{item.mxwtmprcd},#{item.mxwtmpdt,jdbcType=TIMESTAMP}, + #{item.mnwtmp},#{item.mnwtmprcd},#{item.mnwtmpdt,jdbcType=TIMESTAMP}) + + + + + MERGE INTO hy_mtwt_e AS t + USING (SELECT stcd,yr,mth,avwtmp,avwtmprcd,mxwtmp,mxwtmprcd,mxwtmpdt,mnwtmp,mnwtmprcd,mnwtmpdt FROM hy_mtwt_e_temp) AS s + ON (t.stcd = s.stcd AND t.yr = s.yr AND t.mth = s.mth) + WHEN MATCHED THEN + UPDATE SET t.avwtmp = s.avwtmp,t.avwtmprcd =s.avwtmprcd,t.mxwtmp = s.mxwtmp,t.mxwtmprcd = s.mxwtmprcd,t.mxwtmpdt = s.mxwtmpdt,t.mnwtmp = s.mnwtmp,t.mnwtmprcd = s.mnwtmprcd,t.mnwtmpdt = s.mnwtmpdt + WHEN NOT MATCHED THEN + INSERT (stcd,yr,mth,avwtmp,avwtmprcd,mxwtmp,mxwtmprcd,mxwtmpdt,mnwtmp,mnwtmprcd,mnwtmpdt) + VALUES (s.stcd,s.yr,s.mth,s.avwtmp,s.avwtmprcd,s.mxwtmp,s.mxwtmprcd,s.mxwtmpdt,s.mnwtmp,s.mnwtmprcd,s.mnwtmpdt); + + diff --git a/swlscx/src/main/resources/mapper/month/HyMtzEMapper.xml b/swlscx/src/main/resources/mapper/month/HyMtzEMapper.xml new file mode 100644 index 0000000..bcae9d5 --- /dev/null +++ b/swlscx/src/main/resources/mapper/month/HyMtzEMapper.xml @@ -0,0 +1,97 @@ + + + + + + INSERT INTO hy_mtz_e (stcd, yr, mth, avz,avzrcd,htz,htzrcd,htzdt,mnz,mnzrcd,mnzdt) + VALUES + + (#{item.stcd}, #{item.yr}, #{item.mth}, #{item.avz}, #{item.avzrcd}, #{item.htz}, + #{item.htzrcd},#{item.htzdt},#{item.mnz},#{item.mnzrcd},#{item.mnzdt}) + + + + + + + TRUNCATE TABLE hy_mtz_e_temp; + + + INSERT INTO hy_mtz_e (stcd, yr, mth, avz,avzrcd,htz,htzrcd,htzdt,mnz,mnzrcd,mnzdt) + VALUES + + (#{item.stcd}, #{item.yr}, #{item.mth}, #{item.avz}, #{item.avzrcd}, #{item.htz}, + #{item.htzrcd},#{item.htzdt,jdbcType=TIMESTAMP},#{item.mnz},#{item.mnzrcd},#{item.mnzdt,jdbcType=TIMESTAMP}) + + + + + MERGE INTO hy_mtz_e t + USING ( + SELECT + stcd, + yr, + mth, + avz, + avzrcd, + htz, + htzrcd, + htzdt, + mnz, + mnzrcd, + mnzdt + FROM hy_mtz_e_temp + ) s + ON (t.stcd = s.stcd AND t.yr = s.yr AND t.mth = s.mth) + WHEN MATCHED THEN + UPDATE SET + t.avz = s.avz, + t.avzrcd = s.avzrcd, + t.htz = s.htz, + t.htzrcd = s.htzrcd, + t.htzdt = s.htzdt, + t.mnz = s.mnz, + t.mnzrcd = s.mnzrcd, + t.mnzdt = s.mnzdt + WHEN NOT MATCHED THEN + INSERT (stcd, yr, mth, avz,avzrcd,htz,htzrcd,htzdt,mnz,mnzrcd,mnzdt) + VALUES (s.stcd, s.yr, s.mth, s.avz, s.avzrcd, s.htz, s.htzrcd, s.htzdt, s.mnz, s.mnzrcd, s.mnzdt); + + diff --git a/swlscx/src/main/resources/mapper/year/HyDmxpFMapper.xml b/swlscx/src/main/resources/mapper/year/HyDmxpFMapper.xml new file mode 100644 index 0000000..01bedc9 --- /dev/null +++ b/swlscx/src/main/resources/mapper/year/HyDmxpFMapper.xml @@ -0,0 +1,56 @@ + + + + + + + + TRUNCATE TABLE hy_dmxp_f_temp; + + + + insert into hy_dmxp_f_temp (stcd, mxpdr, yr, bgdt, mxp, mxprc) + values + + (#{item.stcd}, #{item.mxpdr}, #{item.yr}, #{item.bgdt,jdbcType=TIMESTAMP}, #{item.mxp}, #{item.mxprc}) + + + + + MERGE INTO hy_dmxp_f AS a + USING hy_dmxp_f_temp AS temp + ON (a.stcd = temp.stcd AND a.yr = temp.yr AND a.mxpdr = temp.mxpdr) + WHEN MATCHED THEN + UPDATE SET + a.bgdt = temp.bgdt, a.mxp = temp.mxp, a.mxprc = temp.mxprc + WHEN NOT MATCHED THEN + INSERT (stcd, mxpdr, yr, bgdt, mxp,mxprc) + VALUES (temp.stcd, temp.mxpdr, temp.yr, temp.bgdt, temp.mxp, temp.mxprc); + + + + diff --git a/swlscx/src/main/resources/mapper/year/HyHmxpFMapper.xml b/swlscx/src/main/resources/mapper/year/HyHmxpFMapper.xml new file mode 100644 index 0000000..6bea113 --- /dev/null +++ b/swlscx/src/main/resources/mapper/year/HyHmxpFMapper.xml @@ -0,0 +1,62 @@ + + + + + + INSERT INTO hy_hmxp_f (stcd, yr, bgtm, mxpdr,mxp,mxprc) + VALUES + + (#{item.stcd}, #{item.yr}, #{item.bgtm}, #{item.mxpdr}, #{item.mxp}, #{item.mxprc}) + + + + + + + + TRUNCATE TABLE hy_hmxp_f_temp; + + + + INSERT INTO hy_hmxp_f_temp(stcd, yr, bgtm, mxpdr, mxp, mxprc) + VALUES + + (#{item.stcd}, #{item.yr}, #{item.bgtm,jdbcType=TIMESTAMP}, #{item.mxpdr}, #{item.mxp}, #{item.mxprc}) + + + + + MERGE INTO hy_hmxp_f AS a + USING hy_hmxp_f_temp AS temp + ON (a.stcd = temp.stcd AND a.yr = temp.yr AND a.mxpdr = temp.mxpdr) + WHEN MATCHED THEN + UPDATE SET a.bgtm = temp.bgtm, a.mxp = temp.mxp, a.mxprc = temp.mxprc + WHEN NOT MATCHED THEN + INSERT (stcd, yr, bgtm, mxpdr, mxp, mxprc) + VALUES (temp.stcd, temp.yr, temp.bgtm, temp.mxpdr, temp.mxp, temp.mxprc); + + \ No newline at end of file diff --git a/swlscx/src/main/resources/mapper/year/HyImxfwFMapper.xml b/swlscx/src/main/resources/mapper/year/HyImxfwFMapper.xml new file mode 100644 index 0000000..40a8bfb --- /dev/null +++ b/swlscx/src/main/resources/mapper/year/HyImxfwFMapper.xml @@ -0,0 +1,52 @@ + + + + + + + + TRUNCATE TABLE hy_imxfw_f_temp; + + + + INSERT INTO hy_imxfw_f_temp (stcd, mxwdr, yr, bgdt, mxw, mxwrc) + VALUES + + (#{item.stcd}, #{item.mxwdr}, #{item.yr}, #{item.bgdt,jdbcType=TIMESTAMP}, #{item.mxw}, #{item.mxwrc}) + + + + MERGE INTO hy_imxfw_f AS hme + USING hy_imxfw_f_temp AS ht + ON (hme.stcd = ht.stcd AND hme.yr = ht.yr AND hme.mxwdr = ht.mxwdr) + WHEN MATCHED THEN + UPDATE SET hme.bgdt = ht.bgdt, hme.mxw = ht.mxw, hme.mxwrc = ht.mxwrc + WHEN NOT MATCHED THEN + INSERT (stcd, yr, bgdt, mxwdr, mxw, mxwrc) + VALUES (ht.stcd, ht.yr, ht.bgdt, ht.mxwdr, ht.mxw, ht.mxwrc); + + diff --git a/swlscx/src/main/resources/mapper/year/HyMmxpFMapper.xml b/swlscx/src/main/resources/mapper/year/HyMmxpFMapper.xml new file mode 100644 index 0000000..32edb86 --- /dev/null +++ b/swlscx/src/main/resources/mapper/year/HyMmxpFMapper.xml @@ -0,0 +1,65 @@ + + + + + INSERT INTO hy_mmxp_f (stcd, yr, bgdt, mxpdr,mxp,mxprc) + VALUES + + (#{item.stcd}, #{item.yr}, #{item.bgdt}, #{item.mxpdr}, #{item.mxp}, #{item.mxprc}) + + + + + + + + INSERT INTO hy_mmxp_f_temp (stcd, yr, bgdt, mxpdr,mxp,mxprc) + VALUES + + (#{item.stcd}, #{item.yr}, #{item.bgdt,jdbcType=TIMESTAMP}, #{item.mxpdr}, #{item.mxp}, #{item.mxprc}) + + + + + TRUNCATE TABLE hy_mmxp_f_temp; + + + + MERGE INTO hy_mmxp_f AS a + USING hy_mmxp_f_temp AS temp + ON (a.stcd = temp.stcd AND a.yr = temp.yr AND a.mxpdr = temp.mxpdr) + WHEN MATCHED THEN + UPDATE SET + a.bgdt = temp.bgdt, + a.mxp = temp.mxp, + a.mxprc = temp.mxprc + WHEN NOT MATCHED THEN + INSERT (stcd, yr, bgdt, mxpdr, mxp, mxprc) + VALUES + (temp.stcd, temp.yr, temp.bgdt, temp.mxpdr, temp.mxp, temp.mxprc); + + diff --git a/swlscx/src/main/resources/mapper/year/HyYrcsFMapper.xml b/swlscx/src/main/resources/mapper/year/HyYrcsFMapper.xml new file mode 100644 index 0000000..4035e14 --- /dev/null +++ b/swlscx/src/main/resources/mapper/year/HyYrcsFMapper.xml @@ -0,0 +1,78 @@ + + + + + + + + + + TRUNCATE TABLE hy_yrcs_f_temp; + + + + INSERT INTO hy_yrcs_f_temp (stcd, yr, avcs, avcsrcd, mxs, mxsrcd, mxsdt, mns, mnsrcd, mnsdt) + VALUES + + (#{item.stcd},#{item.yr},#{item.avcs},#{item.avcsrcd},#{item.mxs},#{item.mxsrcd},#{item.mxsdt,jdbcType=TIMESTAMP},#{item.mns} + ,#{item.mnsrcd},#{item.mnsdt,jdbcType=TIMESTAMP}) + + + + + MERGE INTO hy_yrcs_f t + USING ( + SELECT + stcd, + yr, + avcs, + avcsrcd, + mxs, + mxsrcd, + mxsdt, + mns, + mnsrcd, + mnsdt + FROM hy_yrcs_f_temp + ) s + ON (t.stcd = s.stcd AND t.yr = s.yr) + WHEN MATCHED THEN + UPDATE SET + t.avcs = s.avcs, + t.avcsrcd = s.avcsrcd, + t.mxs = s.mxs, + t.mxsrcd = s.mxsrcd, + t.mxsdt = s.mxsdt, + t.mns = s.mns, + t.mnsrcd = s.mnsrcd, + t.mnsdt = s.mnsdt + WHEN NOT MATCHED THEN + INSERT (stcd, yr, avcs, avcsrcd, mxs, mxsrcd, mxsdt, mns, mnsrcd, mnsdt) + VALUES (s.stcd, s.yr, s.avcs, s.avcsrcd, s.mxs, s.mxsrcd, s.mxsdt, s.mns, s.mnsrcd, s.mnsdt); + + diff --git a/swlscx/src/main/resources/mapper/year/HyYrpFMapper.xml b/swlscx/src/main/resources/mapper/year/HyYrpFMapper.xml new file mode 100644 index 0000000..2644456 --- /dev/null +++ b/swlscx/src/main/resources/mapper/year/HyYrpFMapper.xml @@ -0,0 +1,124 @@ + + + + + + + + + + + + + + + + + + + stcd,yr,p, + prcd,pdynum,pdynumrcd, + frdsdt,frapdt,sndsdt, + snapdt + + + + INSERT INTO hy_yrp_f_temp (stcd, yr, p, prcd,pdynum,pdynumrcd,frdsdt,frapdt,sndsdt,snapdt) + VALUES + + (#{item.stcd}, #{item.yr}, #{item.p}, #{item.prcd}, #{item.pdynum}, #{item.pdynumrcd}, #{item.frdsdt}, #{item.frapdt}, #{item.sndsdt}, #{item.snapdt}) + + + + + + + insert into hy_yrp_f (stcd, yr, p, prcd, pdynum, pdynumrcd, frdsdt, frapdt, sndsdt, snapdt) + select a.stcd, + a.yr, + a.p, + a.prcd, + a.pdynum, + a.pdynumrcd, + a.frdsdt, + a.frapdt, + a.sndsdt, + a.snapdt + from hy_yrp_f_temp a + on duplicate key + update p = a.p, + prcd = a.prcd, + pdynum = a.pdynum, + pdynumrcd = a.pdynumrcd, + frdsdt = a.frdsdt, + frapdt = a.frapdt, + sndsdt = a.sndsdt, + snapdt = a.snapdt; + + + + TRUNCATE TABLE hy_yrp_f_temp; + + + + + + + TRUNCATE TABLE hy_yrp_f_temp; + + + + MERGE INTO hy_yrp_f AS a + USING hy_yrp_f_temp AS temp + ON (a.stcd = temp.stcd AND a.yr = temp.yr) + WHEN MATCHED THEN + UPDATE SET + a.p = temp.p, + a.prcd = temp.prcd, + a.pdynum = temp.pdynum, + a.pdynumrcd = temp.pdynumrcd, + a.frdsdt = temp.frdsdt, + a.frapdt = temp.frapdt, + a.sndsdt = temp.sndsdt, + a.snapdt = temp.snapdt + WHEN NOT MATCHED THEN + INSERT (stcd, yr, p, prcd, pdynum, pdynumrcd, frdsdt, frapdt, sndsdt, snapdt) + VALUES (temp.stcd, temp.yr, temp.p, temp.prcd, temp.pdynum, temp.pdynumrcd, temp.frdsdt, temp.frapdt, temp.sndsdt, temp.snapdt); + + + + + diff --git a/swlscx/src/main/resources/mapper/year/HyYrqFMapper.xml b/swlscx/src/main/resources/mapper/year/HyYrqFMapper.xml new file mode 100644 index 0000000..01386bf --- /dev/null +++ b/swlscx/src/main/resources/mapper/year/HyYrqFMapper.xml @@ -0,0 +1,69 @@ + + + + + + + + TRUNCATE TABLE hy_yrq_f_temp; + + + insert into hy_yrq_f_temp (stcd, yr, avq, avqrcd, mxq, mxqrcd, mxqdt, mnq, mnqrcd, mnqdt, + rw, rwrcd, rm, rd) + values + + (#{item.stcd}, #{item.yr}, #{item.avq}, #{item.avqrcd}, #{item.mxq}, #{item.mxqrcd}, #{item.mxqdt,jdbcType=TIMESTAMP}, + #{item.mnq}, #{item.mnqrcd}, #{item.mnqdt,jdbcType=TIMESTAMP}, #{item.rw}, #{item.rwrcd}, #{item.rm}, #{item.rd}) + + + + + MERGE INTO hy_yrq_f AS a + USING hy_yrq_f_temp AS b + ON (a.stcd = b.stcd and a.yr = b.yr) + WHEN MATCHED THEN + UPDATE SET a.avq = b.avq, a.avqrcd = b.avqrcd, a.mxq = b.mxq, a.mxqrcd = b.mxqrcd, a.mxqdt = b.mxqdt, + a.mnq = b.mnq, a.mnqrcd = b.mnqrcd, a.mnqdt = b.mnqdt, a.rw = b.rw, a.rwrcd = b.rwrcd, a.rm = b.rm, a.rd =b.rd + WHEN NOT MATCHED THEN + INSERT (stcd, yr, avq, avqrcd, mxq, mxqrcd, mxqdt, mnq, mnqrcd, mnqdt, rw, rwrcd, rm, rd) + VALUES (b.stcd, b.yr, b.avq, b.avqrcd, b.mxq, b.mxqrcd, b.mxqdt, b.mnq, b.mnqrcd, b.mnqdt, b.rw, b.rwrcd, b.rm , b.rd); + + + diff --git a/swlscx/src/main/resources/mapper/year/HyYrqsFMapper.xml b/swlscx/src/main/resources/mapper/year/HyYrqsFMapper.xml new file mode 100644 index 0000000..d5fe4a9 --- /dev/null +++ b/swlscx/src/main/resources/mapper/year/HyYrqsFMapper.xml @@ -0,0 +1,73 @@ + + + + + + + + + + TRUNCATE TABLE hy_yrqs_f_temp; + + + + insert into hy_yrqs_f_temp(stcd, yr, sdtp, avqs, avqsrcd, mxdyqs, mxdyqsrcd, mxdyqsodt, sw, swpc, sm, simn, smec, nt) + values + + (#{item.stcd}, #{item.yr}, #{item.sdtp}, #{item.avqs},#{item.avqsrcd}, + #{item.mxdyqs}, #{item.mxdyqsrcd}, + #{item.mxdyqsodt,jdbcType=TIMESTAMP}, + #{item.sw}, #{item.swpc}, #{item.sm}, + #{item.simn}, #{item.smec}, #{item.nt}) + + + + + MERGE INTO hy_yrqs_f AS t + USING hy_yrqs_f_temp AS s + ON (t.stcd = s.stcd AND t.yr = s.yr AND t.sdtp = s.sdtp) + WHEN MATCHED THEN + UPDATE SET t.avqs = s.avqs, t.avqsrcd = s.avqsrcd, t.mxdyqs = s.mxdyqs, t.mxdyqsrcd = s.mxdyqsrcd, + t.mxdyqsodt = s.mxdyqsodt, t.sw = s.sw, t.swpc = s.swpc, t.sm = s.sm, t.simn = s.simn, t.smec = s.smec, t.nt = s.nt + WHEN NOT MATCHED THEN + INSERT (stcd, yr, sdtp, avqs, avqsrcd, mxdyqs, mxdyqsrcd, mxdyqsodt, sw, swpc, sm, simn, smec, nt) + VALUES (s.stcd, s.yr, s.sdtp, s.avqs, s.avqsrcd, s.mxdyqs, s.mxdyqsrcd, s.mxdyqsodt, s.sw, s.swpc, s.sm, s.simn) + + diff --git a/swlscx/src/main/resources/mapper/year/HyYrtdzFMapper.xml b/swlscx/src/main/resources/mapper/year/HyYrtdzFMapper.xml new file mode 100644 index 0000000..cb84299 --- /dev/null +++ b/swlscx/src/main/resources/mapper/year/HyYrtdzFMapper.xml @@ -0,0 +1,65 @@ + + + + + + TRUNCATE TABLE hy_yrtdz_f_temp; + + + + INSERT INTO hy_yrtdz_f_temp ( + stcd, yr, avhtdz, avhtdzrcd, hthtdz, hthtdzrcd, hthtdzotm, + lthtdz, lthtdzrcd, lthtdzotm, avltdz, avltdzrcd, htltdz, htltdzrcd, + htltdzotm, ltltdz, ltltdzrcd, ltltdzotm, avftdr, avftdrrcd, mxfltdr, + mxfltdrrcd, mxfltdrhtm, mnfltdr, mnfltdrrcd, mnfltdrhtm, aver, + averbbrrcd, mxebtdr, mxebtdrrcd, mxebtdrht, mnebtdr, mnebtdrrcd, + mnebtdrhtm, avftd, avftdrcd, mxfltddr, mxfltddrrcd, mxfltddrhtm, + mnfltddr, mnfltddrrcd, mnfltddrhtm, avebbdr, avedrc, mxebtddr, + mxebtddrrcd, mxebtddrhtm, mnbtddr, mnebtddrrcd, mnebtddrhtm, + hravtdz, hravtdzrcd, avtdr, avtdrrcd, avtddr, avtddrrcd, addvcd, + lysxm, stnm + )VALUES + + ( + #{item.stcd}, #{item.yr}, #{item.avhtdz}, #{item.avhtdzrcd}, #{item.hthtdz}, #{item.hthtdzrcd}, #{item.hthtdzotm,jdbcType=TIMESTAMP}, + #{item.lthtdz}, #{item.lthtdzrcd}, #{item.lthtdzotm,jdbcType=TIMESTAMP}, #{item.avltdz}, #{item.avltdzrcd}, #{item.htltdz}, #{item.htltdzrcd}, + #{item.htltdzotm,jdbcType=TIMESTAMP}, #{item.ltltdz}, #{item.ltltdzrcd}, #{item.ltltdzotm}, #{item.avftdr}, #{item.avftdrrcd}, #{item.mxfltdr}, + #{item.mxfltdrrcd}, #{item.mxfltdrhtm,jdbcType=TIMESTAMP}, #{item.mnfltdr}, #{item.mnfltdrrcd}, #{item.mnfltdrhtm,jdbcType=TIMESTAMP}, #{item.aver}, + #{item.averbbrrcd}, #{item.mxebtdr}, #{item.mxebtdrrcd}, #{item.mxebtdrht}, #{item.mnebtdr}, #{item.mnebtdrrcd}, + #{item.mnebtdrhtm,jdbcType=TIMESTAMP}, #{item.avftd}, #{item.avftdrcd}, #{item.mxfltddr}, #{item.mxfltddrrcd}, #{item.mxfltddrhtm,jdbcType=TIMESTAMP}, + #{item.mnfltddr}, #{item.mnfltddrrcd}, #{item.mnfltddrhtm,jdbcType=TIMESTAMP}, #{item.avebbdr}, #{item.avedrc}, #{item.mxebtddr}, + #{item.mxebtddrrcd}, #{item.mxebtddrhtm,jdbcType=TIMESTAMP}, #{item.mnbtddr}, #{item.mnebtddrrcd}, #{item.mnebtddrhtm,jdbcType=TIMESTAMP}, + #{item.hravtdz}, #{item.hravtdzrcd}, #{item.avtdr}, #{item.avtdrrcd}, #{item.avtddr}, #{item.avtddrrcd}, #{item.addvcd}, + #{item.lysxm}, #{item.stnm} + ) + + + + MERGE INTO hy_yrtdz_f AS a + USING hy_yrtdz_f_temp AS temp + ON (a.stcd = temp.stcd AND a.yr = temp.yr) + + diff --git a/swlscx/src/main/resources/mapper/year/HyYrweFMapper.xml b/swlscx/src/main/resources/mapper/year/HyYrweFMapper.xml new file mode 100644 index 0000000..54c44a2 --- /dev/null +++ b/swlscx/src/main/resources/mapper/year/HyYrweFMapper.xml @@ -0,0 +1,140 @@ + + + + + + + + TRUNCATE TABLE hy_yrwe_f_temp; + + + + insert into hy_yrwe_f_temp + (stcd, + eetp, + yr, + wsfe, + wsfercd, + mxdye, + mxdyercd, + mxdyeodt, + mndye, + mndyercd, + mndyeodt, + idsdt, + icapd, + eslcch, + nt) + values + (#{item.stcd}, + #{item.eetp}, + #{item.yr}, + #{item.wsfe}, + #{item.wsfercd}, + #{item.mxdye}, + #{item.mxdyercd}, + #{item.mxdyeodt,jdbcType=TIMESTAMP}, + #{item.mndye}, + #{item.mndyercd}, + #{item.mndyeodt,jdbcType=TIMESTAMP}, + #{item.idsdt,jdbcType=TIMESTAMP}, + #{item.icapd,jdbcType=TIMESTAMP}, + #{item.eslcch}, + #{item.nt}) + + + + + MERGE INTO hy_yrwe_f AS a + USING hy_yrwe_f_temp AS b + + ON (a.stcd = b.stcd AND a.yr = b.yr AND a.eetp=b.eetp) + WHEN MATCHED THEN + UPDATE SET + a.wsfe = b.wsfe, + a.wsfercd = b.wsfercd, + a.mxdye = b.mxdye, + a.mxdyercd = b.mxdyercd, + a.mxdyeodt = b.mxdyeodt, + a.mndye = b.mndye, + a.mndyercd = b.mndyercd, + a.mndyeodt =b.mndyeodt, + a.idsdt = b.idsdt, + a.icapd = b.icapd, + a.eslcch = b.eslcch, + a.nt = b.nt + WHEN NOT MATCHED THEN + INSERT (stcd, + eetp, + yr, + wsfe, + wsfercd, + mxdye, + mxdyercd, + mxdyeodt, + mndye, + mndyercd, + mndyeodt, + idsdt, + icapd, + eslcch, + nt + ) + VALUES (b.stcd, + b.eetp, + b.yr, + b.wsfe, + b.wsfercd, + b.mxdye, + b.mxdyercd, + b.mxdyeodt, + b.mndye, + b.mndyercd, + b.mndyeodt, + b.idsdt, + b.icapd, + b.eslcch, + b.nt + ); + + + + diff --git a/swlscx/src/main/resources/mapper/year/HyYrwtFMapper.xml b/swlscx/src/main/resources/mapper/year/HyYrwtFMapper.xml new file mode 100644 index 0000000..29074e3 --- /dev/null +++ b/swlscx/src/main/resources/mapper/year/HyYrwtFMapper.xml @@ -0,0 +1,72 @@ + + + + + + + + TRUNCATE TABLE hy_yrwt_f_temp; + + + + + insert into hy_yrwt_f_temp (stcd, yr, avwtmp, avwtmprcd, mxwtmp, mxwtmprcd, mxwtmpdt, mnwtmp, mnwtmprcd, mnwtmpdt) + values + + (#{item.stcd}, #{item.yr}, #{item.avwtmp}, + #{item.avwtmprcd}, #{item.mxwtmp}, #{item.mxwtmprcd},#{item.mxwtmpdt,jdbcType=TIMESTAMP}, #{item.mnwtmp}, + #{item.mnwtmprcd},#{item.mnwtmpdt,jdbcType=TIMESTAMP}) + + + + + MERGE INTO hy_yrwt_f AS a + USING hy_yrwt_f_temp AS temp + ON (a.stcd = temp.stcd AND a.yr = temp.yr) + WHEN MATCHED THEN + UPDATE SET + a.avwtmp = temp.avwtmp, + a.avwtmprcd = temp.avwtmprcd, + a.mxwtmp = temp.mxwtmp, + a.mxwtmprcd = temp.mxwtmprcd, + a.mxwtmpdt = temp.mxwtmpdt, + a.mnwtmp = temp.mnwtmp, a.mnwtmprcd = temp.mnwtmprcd, + a.mnwtmpdt = temp.mnwtmpdt + WHEN NOT MATCHED THEN + INSERT (stcd, yr, avwtmp, avwtmprcd, mxwtmp, mxwtmprcd, mxwtmpdt, mnwtmp, mnwtmprcd, mnwtmpdt) + VALUES (temp.stcd, temp.yr, temp.avwtmp, temp.avwtmprcd, temp.mxwtmp, temp.mxwtmprcd, temp.mxwtmpdt, temp.mnwtmp, temp.mnwtmprcd, temp.mnwtmpdt); + + diff --git a/swlscx/src/main/resources/mapper/year/HyYrzFMapper.xml b/swlscx/src/main/resources/mapper/year/HyYrzFMapper.xml new file mode 100644 index 0000000..7d6c658 --- /dev/null +++ b/swlscx/src/main/resources/mapper/year/HyYrzFMapper.xml @@ -0,0 +1,72 @@ + + + + + + + + TRUNCATE TABLE hy_yrz_f_temp; + + + + insert into hy_yrz_f_temp (stcd, yr, avz, avzrcd, htz, htzrcd, htzdt, mnz, mnzrcd, mnzdt) + values + + (#{item.stcd}, #{item.yr}, #{item.avz}, #{item.avzrcd}, #{item.htz}, #{item.htzrcd}, #{item.htzdt,jdbcType=TIMESTAMP}, #{item.mnz}, #{item.mnzrcd}, #{item.mnzdt,jdbcType=TIMESTAMP}) + + + + + + MERGE INTO hy_yrz_f AS a + USING hy_yrz_f_temp As b + ON (a.stcd = b.stcd and a.yr = b.yr) + WHEN MATCHED THEN + UPDATE SET a.avz = b.avz, + a.avzrcd = b.avzrcd, + a.htz = b.htz, + a.htzrcd = b.htzrcd, + a.htzdt = b.htzdt, + a.mnz = b.mnz, + a.mnzrcd = b.mnzrcd, + a.mnzdt = b.mnzdt + WHEN NOT MATCHED THEN + INSERT (stcd, yr, avz, avzrcd, htz, htzrcd, htzdt, mnz, mnzrcd, mnzdt) + VALUES (b.stcd, b.yr, b.avz, b.avzrcd, b.htz, b.htzrcd, b.htzdt, b.mnz, b.mnzrcd, b.mnzdt); + + + +