From 5b9e36dc3f275624e9a6b922e3a7ef5d9c268be1 Mon Sep 17 00:00:00 2001 From: luyya Date: Thu, 5 Jun 2025 18:11:09 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AE=A3=E5=9F=8E=E4=BF=AE=E6=94=B9module?= =?UTF-8?q?=E5=90=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../common/redis/utils/RedisUtils.java | 8 ++ stwzhj-modules/pom.xml | 4 +- .../src/main/java/org/dromara/data2es/replace | 0 .../data2es/service/impl/GpsServiceImpl.java | 7 +- .../pom.xml | 4 +- .../dromara/location/LocationApplication.java | 0 .../location/config/ElasticsearchConfig.java | 0 .../controller/ElasticSearchController.java | 0 .../controller/LocationController.java | 85 +++++++++---------- .../dubbo/RemoteElasticSearchServiceImpl.java | 0 .../org/dromara/location/package-info.java | 0 .../location/service/ISearchService.java | 0 .../service/impl/SearchServiceImpl.java | 0 .../src/main/resources/application.yml | 0 .../src/main/resources/banner.txt | 0 .../src/main/resources/logback-plus.xml | 0 .../{stwzhj-system => wzhj-system}/Dockerfile | 0 .../{stwzhj-system => wzhj-system}/pom.xml | 4 +- .../system/RuoYiSystemApplication.java | 0 .../controller/monitor/CacheController.java | 0 .../monitor/SysLogininforController.java | 0 .../monitor/SysOperlogController.java | 0 .../monitor/SysUserOnlineController.java | 0 .../system/IndexStaticsController.java | 0 .../system/SysClientController.java | 0 .../system/SysConfigController.java | 0 .../controller/system/SysDeptController.java | 0 .../system/SysDictDataController.java | 0 .../system/SysDictTypeController.java | 0 .../controller/system/SysMenuController.java | 0 .../system/SysNoticeController.java | 0 .../controller/system/SysPostController.java | 0 .../system/SysProfileController.java | 0 .../controller/system/SysRoleController.java | 0 .../system/SysSocialController.java | 0 .../system/SysTenantController.java | 0 .../system/SysTenantPackageController.java | 0 .../controller/system/SysUserController.java | 0 .../controller/system/TDeviceController.java | 15 +++- .../dromara/system/domain/DeviceRedis.java | 0 .../org/dromara/system/domain/SysClient.java | 0 .../org/dromara/system/domain/SysConfig.java | 0 .../org/dromara/system/domain/SysDept.java | 0 .../dromara/system/domain/SysDictData.java | 0 .../dromara/system/domain/SysDictType.java | 0 .../dromara/system/domain/SysLogininfor.java | 0 .../org/dromara/system/domain/SysMenu.java | 0 .../org/dromara/system/domain/SysNotice.java | 0 .../org/dromara/system/domain/SysOperLog.java | 0 .../org/dromara/system/domain/SysPost.java | 0 .../org/dromara/system/domain/SysRole.java | 0 .../dromara/system/domain/SysRoleDept.java | 0 .../dromara/system/domain/SysRoleMenu.java | 0 .../org/dromara/system/domain/SysSocial.java | 0 .../org/dromara/system/domain/SysTenant.java | 0 .../system/domain/SysTenantPackage.java | 0 .../org/dromara/system/domain/SysUser.java | 0 .../dromara/system/domain/SysUserPost.java | 0 .../dromara/system/domain/SysUserRole.java | 0 .../org/dromara/system/domain/TDevice.java | 0 .../dromara/system/domain/bo/SysClientBo.java | 0 .../dromara/system/domain/bo/SysConfigBo.java | 0 .../dromara/system/domain/bo/SysDeptBo.java | 0 .../system/domain/bo/SysDictDataBo.java | 0 .../system/domain/bo/SysDictTypeBo.java | 0 .../system/domain/bo/SysLogininforBo.java | 0 .../dromara/system/domain/bo/SysMenuBo.java | 0 .../dromara/system/domain/bo/SysNoticeBo.java | 0 .../system/domain/bo/SysOperLogBo.java | 0 .../dromara/system/domain/bo/SysPostBo.java | 0 .../dromara/system/domain/bo/SysRoleBo.java | 0 .../dromara/system/domain/bo/SysSocialBo.java | 0 .../dromara/system/domain/bo/SysTenantBo.java | 0 .../system/domain/bo/SysTenantPackageBo.java | 0 .../dromara/system/domain/bo/SysUserBo.java | 0 .../system/domain/bo/SysUserPasswordBo.java | 0 .../system/domain/bo/SysUserProfileBo.java | 0 .../dromara/system/domain/bo/TDeviceBo.java | 3 + .../domain/convert/SysClientVoConvert.java | 0 .../domain/convert/SysDictDataVoConvert.java | 0 .../convert/SysLogininforBoConvert.java | 0 .../domain/convert/SysOperLogBoConvert.java | 0 .../domain/convert/SysSocialBoConvert.java | 0 .../domain/convert/SysSocialVoConvert.java | 0 .../domain/convert/SysTenantVoConvert.java | 0 .../domain/convert/SysUserBoConvert.java | 0 .../domain/convert/SysUserVoConvert.java | 0 .../dromara/system/domain/vo/AvatarVo.java | 0 .../system/domain/vo/CacheListInfoVo.java | 0 .../system/domain/vo/DeptTreeSelectVo.java | 0 .../system/domain/vo/DeviceRedisVo.java | 0 .../system/domain/vo/DeviceStaticsVo.java | 0 .../system/domain/vo/MenuTreeSelectVo.java | 0 .../org/dromara/system/domain/vo/MetaVo.java | 0 .../dromara/system/domain/vo/ProfileVo.java | 0 .../dromara/system/domain/vo/RouterVo.java | 0 .../dromara/system/domain/vo/SysClientVo.java | 0 .../dromara/system/domain/vo/SysConfigVo.java | 0 .../dromara/system/domain/vo/SysDeptVo.java | 0 .../system/domain/vo/SysDictDataVo.java | 0 .../system/domain/vo/SysDictTypeVo.java | 0 .../system/domain/vo/SysLogininforVo.java | 0 .../dromara/system/domain/vo/SysMenuVo.java | 0 .../dromara/system/domain/vo/SysNoticeVo.java | 0 .../system/domain/vo/SysOperLogVo.java | 0 .../dromara/system/domain/vo/SysPostVo.java | 0 .../dromara/system/domain/vo/SysRoleVo.java | 0 .../dromara/system/domain/vo/SysSocialVo.java | 0 .../system/domain/vo/SysTenantPackageVo.java | 0 .../dromara/system/domain/vo/SysTenantVo.java | 0 .../system/domain/vo/SysUserExportVo.java | 0 .../system/domain/vo/SysUserImportVo.java | 0 .../system/domain/vo/SysUserInfoVo.java | 0 .../dromara/system/domain/vo/SysUserVo.java | 0 .../system/domain/vo/TDeviceExportVo.java | 0 .../system/domain/vo/TDeviceImportVo.java | 0 .../dromara/system/domain/vo/TDeviceVo.java | 0 .../dromara/system/domain/vo/UserInfoVo.java | 0 .../system/dubbo/RemoteClientServiceImpl.java | 0 .../system/dubbo/RemoteConfigServiceImpl.java | 0 .../dubbo/RemoteDataScopeServiceImpl.java | 0 .../system/dubbo/RemoteDeptServiceImpl.java | 0 .../system/dubbo/RemoteDeviceImpl.java | 0 .../system/dubbo/RemoteDictServiceImpl.java | 0 .../system/dubbo/RemoteLogServiceImpl.java | 0 .../system/dubbo/RemoteSocialServiceImpl.java | 0 .../system/dubbo/RemoteTenantServiceImpl.java | 0 .../system/dubbo/RemoteUserServiceImpl.java | 0 .../exception/MyBusinessException.java | 2 +- .../listener/SysUserImportListener.java | 0 .../listener/TDeviceImportListener.java | 0 .../system/mapper/DeviceRedisMapper.java | 0 .../system/mapper/SysClientMapper.java | 0 .../system/mapper/SysConfigMapper.java | 0 .../dromara/system/mapper/SysDeptMapper.java | 0 .../system/mapper/SysDictDataMapper.java | 0 .../system/mapper/SysDictTypeMapper.java | 0 .../system/mapper/SysLogininforMapper.java | 0 .../dromara/system/mapper/SysMenuMapper.java | 0 .../system/mapper/SysNoticeMapper.java | 0 .../system/mapper/SysOperLogMapper.java | 0 .../dromara/system/mapper/SysPostMapper.java | 0 .../system/mapper/SysRoleDeptMapper.java | 0 .../dromara/system/mapper/SysRoleMapper.java | 0 .../system/mapper/SysRoleMenuMapper.java | 0 .../system/mapper/SysSocialMapper.java | 0 .../system/mapper/SysTenantMapper.java | 0 .../system/mapper/SysTenantPackageMapper.java | 0 .../dromara/system/mapper/SysUserMapper.java | 0 .../system/mapper/SysUserPostMapper.java | 0 .../system/mapper/SysUserRoleMapper.java | 0 .../dromara/system/mapper/TDeviceMapper.java | 0 .../system/schedule/DeviceRedisSchedule.java | 0 .../system/service/IDeviceRedisService.java | 0 .../system/service/ISysClientService.java | 0 .../system/service/ISysConfigService.java | 0 .../system/service/ISysDeptService.java | 0 .../system/service/ISysDictDataService.java | 0 .../system/service/ISysDictTypeService.java | 0 .../system/service/ISysLogininforService.java | 0 .../system/service/ISysMenuService.java | 0 .../system/service/ISysNoticeService.java | 0 .../system/service/ISysOperLogService.java | 0 .../system/service/ISysPermissionService.java | 0 .../system/service/ISysPostService.java | 0 .../system/service/ISysRoleService.java | 0 .../system/service/ISysSocialService.java | 0 .../service/ISysTenantPackageService.java | 0 .../system/service/ISysTenantService.java | 0 .../system/service/ISysUserService.java | 0 .../system/service/ITDeviceService.java | 0 .../service/impl/DeviceRedisServiceImpl.java | 0 .../service/impl/SysClientServiceImpl.java | 0 .../service/impl/SysConfigServiceImpl.java | 0 .../service/impl/SysDeptServiceImpl.java | 0 .../service/impl/SysDictDataServiceImpl.java | 0 .../service/impl/SysDictTypeServiceImpl.java | 0 .../impl/SysLogininforServiceImpl.java | 0 .../service/impl/SysMenuServiceImpl.java | 0 .../service/impl/SysNoticeServiceImpl.java | 0 .../service/impl/SysOperLogServiceImpl.java | 0 .../impl/SysPermissionServiceImpl.java | 0 .../service/impl/SysPostServiceImpl.java | 0 .../service/impl/SysRoleServiceImpl.java | 0 .../service/impl/SysSensitiveServiceImpl.java | 0 .../service/impl/SysSocialServiceImpl.java | 0 .../impl/SysTenantPackageServiceImpl.java | 0 .../service/impl/SysTenantServiceImpl.java | 0 .../service/impl/SysUserServiceImpl.java | 0 .../service/impl/TDeviceServiceImpl.java | 0 .../src/main/resources/application.yml | 0 .../src/main/resources/banner.txt | 0 .../src/main/resources/logback-plus.xml | 0 .../src/main/resources/mapper/package-info.md | 0 .../mapper/system/DeviceRedisMapper.xml | 0 .../mapper/system/SysClientMapper.xml | 0 .../mapper/system/SysConfigMapper.xml | 0 .../resources/mapper/system/SysDeptMapper.xml | 0 .../mapper/system/SysDictDataMapper.xml | 0 .../mapper/system/SysDictTypeMapper.xml | 0 .../mapper/system/SysLogininforMapper.xml | 0 .../resources/mapper/system/SysMenuMapper.xml | 0 .../mapper/system/SysNoticeMapper.xml | 0 .../mapper/system/SysOperLogMapper.xml | 0 .../resources/mapper/system/SysPostMapper.xml | 0 .../mapper/system/SysRoleDeptMapper.xml | 0 .../resources/mapper/system/SysRoleMapper.xml | 0 .../mapper/system/SysRoleMenuMapper.xml | 0 .../mapper/system/SysSocialMapper.xml | 0 .../mapper/system/SysTenantMapper.xml | 0 .../mapper/system/SysTenantPackageMapper.xml | 0 .../resources/mapper/system/SysUserMapper.xml | 0 .../mapper/system/SysUserPostMapper.xml | 0 .../mapper/system/SysUserRoleMapper.xml | 0 .../resources/mapper/system/TDeviceMapper.xml | 0 215 files changed, 78 insertions(+), 54 deletions(-) delete mode 100644 stwzhj-modules/stwzhj-data2es/src/main/java/org/dromara/data2es/replace rename stwzhj-modules/{stwzhj-location => wzhj-location}/pom.xml (98%) rename stwzhj-modules/{stwzhj-location => wzhj-location}/src/main/java/org/dromara/location/LocationApplication.java (100%) rename stwzhj-modules/{stwzhj-location => wzhj-location}/src/main/java/org/dromara/location/config/ElasticsearchConfig.java (100%) rename stwzhj-modules/{stwzhj-location => wzhj-location}/src/main/java/org/dromara/location/controller/ElasticSearchController.java (100%) rename stwzhj-modules/{stwzhj-location => wzhj-location}/src/main/java/org/dromara/location/controller/LocationController.java (77%) rename stwzhj-modules/{stwzhj-location => wzhj-location}/src/main/java/org/dromara/location/dubbo/RemoteElasticSearchServiceImpl.java (100%) rename stwzhj-modules/{stwzhj-location => wzhj-location}/src/main/java/org/dromara/location/package-info.java (100%) rename stwzhj-modules/{stwzhj-location => wzhj-location}/src/main/java/org/dromara/location/service/ISearchService.java (100%) rename stwzhj-modules/{stwzhj-location => wzhj-location}/src/main/java/org/dromara/location/service/impl/SearchServiceImpl.java (100%) rename stwzhj-modules/{stwzhj-location => wzhj-location}/src/main/resources/application.yml (100%) rename stwzhj-modules/{stwzhj-location => wzhj-location}/src/main/resources/banner.txt (100%) rename stwzhj-modules/{stwzhj-location => wzhj-location}/src/main/resources/logback-plus.xml (100%) rename stwzhj-modules/{stwzhj-system => wzhj-system}/Dockerfile (100%) rename stwzhj-modules/{stwzhj-system => wzhj-system}/pom.xml (98%) rename stwzhj-modules/{stwzhj-system => wzhj-system}/src/main/java/org/dromara/system/RuoYiSystemApplication.java (100%) rename stwzhj-modules/{stwzhj-system => wzhj-system}/src/main/java/org/dromara/system/controller/monitor/CacheController.java (100%) rename stwzhj-modules/{stwzhj-system => wzhj-system}/src/main/java/org/dromara/system/controller/monitor/SysLogininforController.java (100%) rename stwzhj-modules/{stwzhj-system => wzhj-system}/src/main/java/org/dromara/system/controller/monitor/SysOperlogController.java (100%) rename stwzhj-modules/{stwzhj-system => wzhj-system}/src/main/java/org/dromara/system/controller/monitor/SysUserOnlineController.java (100%) rename stwzhj-modules/{stwzhj-system => wzhj-system}/src/main/java/org/dromara/system/controller/system/IndexStaticsController.java (100%) rename stwzhj-modules/{stwzhj-system => wzhj-system}/src/main/java/org/dromara/system/controller/system/SysClientController.java (100%) rename stwzhj-modules/{stwzhj-system => wzhj-system}/src/main/java/org/dromara/system/controller/system/SysConfigController.java (100%) rename stwzhj-modules/{stwzhj-system => wzhj-system}/src/main/java/org/dromara/system/controller/system/SysDeptController.java (100%) rename stwzhj-modules/{stwzhj-system => wzhj-system}/src/main/java/org/dromara/system/controller/system/SysDictDataController.java (100%) rename stwzhj-modules/{stwzhj-system => wzhj-system}/src/main/java/org/dromara/system/controller/system/SysDictTypeController.java (100%) rename stwzhj-modules/{stwzhj-system => wzhj-system}/src/main/java/org/dromara/system/controller/system/SysMenuController.java (100%) rename stwzhj-modules/{stwzhj-system => wzhj-system}/src/main/java/org/dromara/system/controller/system/SysNoticeController.java (100%) rename stwzhj-modules/{stwzhj-system => wzhj-system}/src/main/java/org/dromara/system/controller/system/SysPostController.java (100%) rename stwzhj-modules/{stwzhj-system => wzhj-system}/src/main/java/org/dromara/system/controller/system/SysProfileController.java (100%) rename stwzhj-modules/{stwzhj-system => wzhj-system}/src/main/java/org/dromara/system/controller/system/SysRoleController.java (100%) rename stwzhj-modules/{stwzhj-system => wzhj-system}/src/main/java/org/dromara/system/controller/system/SysSocialController.java (100%) rename stwzhj-modules/{stwzhj-system => wzhj-system}/src/main/java/org/dromara/system/controller/system/SysTenantController.java (100%) rename stwzhj-modules/{stwzhj-system => wzhj-system}/src/main/java/org/dromara/system/controller/system/SysTenantPackageController.java (100%) rename stwzhj-modules/{stwzhj-system => wzhj-system}/src/main/java/org/dromara/system/controller/system/SysUserController.java (100%) rename stwzhj-modules/{stwzhj-system => wzhj-system}/src/main/java/org/dromara/system/controller/system/TDeviceController.java (89%) rename stwzhj-modules/{stwzhj-system => wzhj-system}/src/main/java/org/dromara/system/domain/DeviceRedis.java (100%) rename stwzhj-modules/{stwzhj-system => wzhj-system}/src/main/java/org/dromara/system/domain/SysClient.java (100%) rename stwzhj-modules/{stwzhj-system => wzhj-system}/src/main/java/org/dromara/system/domain/SysConfig.java (100%) rename stwzhj-modules/{stwzhj-system => wzhj-system}/src/main/java/org/dromara/system/domain/SysDept.java (100%) rename stwzhj-modules/{stwzhj-system => wzhj-system}/src/main/java/org/dromara/system/domain/SysDictData.java (100%) rename stwzhj-modules/{stwzhj-system => wzhj-system}/src/main/java/org/dromara/system/domain/SysDictType.java (100%) rename stwzhj-modules/{stwzhj-system => wzhj-system}/src/main/java/org/dromara/system/domain/SysLogininfor.java (100%) rename stwzhj-modules/{stwzhj-system => wzhj-system}/src/main/java/org/dromara/system/domain/SysMenu.java (100%) rename stwzhj-modules/{stwzhj-system => wzhj-system}/src/main/java/org/dromara/system/domain/SysNotice.java (100%) rename stwzhj-modules/{stwzhj-system => wzhj-system}/src/main/java/org/dromara/system/domain/SysOperLog.java (100%) rename stwzhj-modules/{stwzhj-system => wzhj-system}/src/main/java/org/dromara/system/domain/SysPost.java (100%) rename stwzhj-modules/{stwzhj-system => wzhj-system}/src/main/java/org/dromara/system/domain/SysRole.java (100%) rename stwzhj-modules/{stwzhj-system => wzhj-system}/src/main/java/org/dromara/system/domain/SysRoleDept.java (100%) rename stwzhj-modules/{stwzhj-system => wzhj-system}/src/main/java/org/dromara/system/domain/SysRoleMenu.java (100%) rename stwzhj-modules/{stwzhj-system => wzhj-system}/src/main/java/org/dromara/system/domain/SysSocial.java (100%) rename stwzhj-modules/{stwzhj-system => wzhj-system}/src/main/java/org/dromara/system/domain/SysTenant.java (100%) rename stwzhj-modules/{stwzhj-system => wzhj-system}/src/main/java/org/dromara/system/domain/SysTenantPackage.java (100%) rename stwzhj-modules/{stwzhj-system => wzhj-system}/src/main/java/org/dromara/system/domain/SysUser.java (100%) rename stwzhj-modules/{stwzhj-system => wzhj-system}/src/main/java/org/dromara/system/domain/SysUserPost.java (100%) rename stwzhj-modules/{stwzhj-system => wzhj-system}/src/main/java/org/dromara/system/domain/SysUserRole.java (100%) rename stwzhj-modules/{stwzhj-system => wzhj-system}/src/main/java/org/dromara/system/domain/TDevice.java (100%) rename stwzhj-modules/{stwzhj-system => wzhj-system}/src/main/java/org/dromara/system/domain/bo/SysClientBo.java (100%) rename stwzhj-modules/{stwzhj-system => wzhj-system}/src/main/java/org/dromara/system/domain/bo/SysConfigBo.java (100%) rename stwzhj-modules/{stwzhj-system => wzhj-system}/src/main/java/org/dromara/system/domain/bo/SysDeptBo.java (100%) rename stwzhj-modules/{stwzhj-system => wzhj-system}/src/main/java/org/dromara/system/domain/bo/SysDictDataBo.java (100%) rename stwzhj-modules/{stwzhj-system => wzhj-system}/src/main/java/org/dromara/system/domain/bo/SysDictTypeBo.java (100%) rename stwzhj-modules/{stwzhj-system => wzhj-system}/src/main/java/org/dromara/system/domain/bo/SysLogininforBo.java (100%) rename stwzhj-modules/{stwzhj-system => wzhj-system}/src/main/java/org/dromara/system/domain/bo/SysMenuBo.java (100%) rename stwzhj-modules/{stwzhj-system => wzhj-system}/src/main/java/org/dromara/system/domain/bo/SysNoticeBo.java (100%) rename stwzhj-modules/{stwzhj-system => wzhj-system}/src/main/java/org/dromara/system/domain/bo/SysOperLogBo.java (100%) rename stwzhj-modules/{stwzhj-system => wzhj-system}/src/main/java/org/dromara/system/domain/bo/SysPostBo.java (100%) rename stwzhj-modules/{stwzhj-system => wzhj-system}/src/main/java/org/dromara/system/domain/bo/SysRoleBo.java (100%) rename stwzhj-modules/{stwzhj-system => wzhj-system}/src/main/java/org/dromara/system/domain/bo/SysSocialBo.java (100%) rename stwzhj-modules/{stwzhj-system => wzhj-system}/src/main/java/org/dromara/system/domain/bo/SysTenantBo.java (100%) rename stwzhj-modules/{stwzhj-system => wzhj-system}/src/main/java/org/dromara/system/domain/bo/SysTenantPackageBo.java (100%) rename stwzhj-modules/{stwzhj-system => wzhj-system}/src/main/java/org/dromara/system/domain/bo/SysUserBo.java (100%) rename stwzhj-modules/{stwzhj-system => wzhj-system}/src/main/java/org/dromara/system/domain/bo/SysUserPasswordBo.java (100%) rename stwzhj-modules/{stwzhj-system => wzhj-system}/src/main/java/org/dromara/system/domain/bo/SysUserProfileBo.java (100%) rename stwzhj-modules/{stwzhj-system => wzhj-system}/src/main/java/org/dromara/system/domain/bo/TDeviceBo.java (97%) rename stwzhj-modules/{stwzhj-system => wzhj-system}/src/main/java/org/dromara/system/domain/convert/SysClientVoConvert.java (100%) rename stwzhj-modules/{stwzhj-system => wzhj-system}/src/main/java/org/dromara/system/domain/convert/SysDictDataVoConvert.java (100%) rename stwzhj-modules/{stwzhj-system => wzhj-system}/src/main/java/org/dromara/system/domain/convert/SysLogininforBoConvert.java (100%) rename stwzhj-modules/{stwzhj-system => wzhj-system}/src/main/java/org/dromara/system/domain/convert/SysOperLogBoConvert.java (100%) rename stwzhj-modules/{stwzhj-system => wzhj-system}/src/main/java/org/dromara/system/domain/convert/SysSocialBoConvert.java (100%) rename stwzhj-modules/{stwzhj-system => wzhj-system}/src/main/java/org/dromara/system/domain/convert/SysSocialVoConvert.java (100%) rename stwzhj-modules/{stwzhj-system => wzhj-system}/src/main/java/org/dromara/system/domain/convert/SysTenantVoConvert.java (100%) rename stwzhj-modules/{stwzhj-system => wzhj-system}/src/main/java/org/dromara/system/domain/convert/SysUserBoConvert.java (100%) rename stwzhj-modules/{stwzhj-system => wzhj-system}/src/main/java/org/dromara/system/domain/convert/SysUserVoConvert.java (100%) rename stwzhj-modules/{stwzhj-system => wzhj-system}/src/main/java/org/dromara/system/domain/vo/AvatarVo.java (100%) rename stwzhj-modules/{stwzhj-system => wzhj-system}/src/main/java/org/dromara/system/domain/vo/CacheListInfoVo.java (100%) rename stwzhj-modules/{stwzhj-system => wzhj-system}/src/main/java/org/dromara/system/domain/vo/DeptTreeSelectVo.java (100%) rename stwzhj-modules/{stwzhj-system => wzhj-system}/src/main/java/org/dromara/system/domain/vo/DeviceRedisVo.java (100%) rename stwzhj-modules/{stwzhj-system => wzhj-system}/src/main/java/org/dromara/system/domain/vo/DeviceStaticsVo.java (100%) rename stwzhj-modules/{stwzhj-system => wzhj-system}/src/main/java/org/dromara/system/domain/vo/MenuTreeSelectVo.java (100%) rename stwzhj-modules/{stwzhj-system => wzhj-system}/src/main/java/org/dromara/system/domain/vo/MetaVo.java (100%) rename stwzhj-modules/{stwzhj-system => wzhj-system}/src/main/java/org/dromara/system/domain/vo/ProfileVo.java (100%) rename stwzhj-modules/{stwzhj-system => wzhj-system}/src/main/java/org/dromara/system/domain/vo/RouterVo.java (100%) rename stwzhj-modules/{stwzhj-system => wzhj-system}/src/main/java/org/dromara/system/domain/vo/SysClientVo.java (100%) rename stwzhj-modules/{stwzhj-system => wzhj-system}/src/main/java/org/dromara/system/domain/vo/SysConfigVo.java (100%) rename stwzhj-modules/{stwzhj-system => wzhj-system}/src/main/java/org/dromara/system/domain/vo/SysDeptVo.java (100%) rename stwzhj-modules/{stwzhj-system => wzhj-system}/src/main/java/org/dromara/system/domain/vo/SysDictDataVo.java (100%) rename stwzhj-modules/{stwzhj-system => wzhj-system}/src/main/java/org/dromara/system/domain/vo/SysDictTypeVo.java (100%) rename stwzhj-modules/{stwzhj-system => wzhj-system}/src/main/java/org/dromara/system/domain/vo/SysLogininforVo.java (100%) rename stwzhj-modules/{stwzhj-system => wzhj-system}/src/main/java/org/dromara/system/domain/vo/SysMenuVo.java (100%) rename stwzhj-modules/{stwzhj-system => wzhj-system}/src/main/java/org/dromara/system/domain/vo/SysNoticeVo.java (100%) rename stwzhj-modules/{stwzhj-system => wzhj-system}/src/main/java/org/dromara/system/domain/vo/SysOperLogVo.java (100%) rename stwzhj-modules/{stwzhj-system => wzhj-system}/src/main/java/org/dromara/system/domain/vo/SysPostVo.java (100%) rename stwzhj-modules/{stwzhj-system => wzhj-system}/src/main/java/org/dromara/system/domain/vo/SysRoleVo.java (100%) rename stwzhj-modules/{stwzhj-system => wzhj-system}/src/main/java/org/dromara/system/domain/vo/SysSocialVo.java (100%) rename stwzhj-modules/{stwzhj-system => wzhj-system}/src/main/java/org/dromara/system/domain/vo/SysTenantPackageVo.java (100%) rename stwzhj-modules/{stwzhj-system => wzhj-system}/src/main/java/org/dromara/system/domain/vo/SysTenantVo.java (100%) rename stwzhj-modules/{stwzhj-system => wzhj-system}/src/main/java/org/dromara/system/domain/vo/SysUserExportVo.java (100%) rename stwzhj-modules/{stwzhj-system => wzhj-system}/src/main/java/org/dromara/system/domain/vo/SysUserImportVo.java (100%) rename stwzhj-modules/{stwzhj-system => wzhj-system}/src/main/java/org/dromara/system/domain/vo/SysUserInfoVo.java (100%) rename stwzhj-modules/{stwzhj-system => wzhj-system}/src/main/java/org/dromara/system/domain/vo/SysUserVo.java (100%) rename stwzhj-modules/{stwzhj-system => wzhj-system}/src/main/java/org/dromara/system/domain/vo/TDeviceExportVo.java (100%) rename stwzhj-modules/{stwzhj-system => wzhj-system}/src/main/java/org/dromara/system/domain/vo/TDeviceImportVo.java (100%) rename stwzhj-modules/{stwzhj-system => wzhj-system}/src/main/java/org/dromara/system/domain/vo/TDeviceVo.java (100%) rename stwzhj-modules/{stwzhj-system => wzhj-system}/src/main/java/org/dromara/system/domain/vo/UserInfoVo.java (100%) rename stwzhj-modules/{stwzhj-system => wzhj-system}/src/main/java/org/dromara/system/dubbo/RemoteClientServiceImpl.java (100%) rename stwzhj-modules/{stwzhj-system => wzhj-system}/src/main/java/org/dromara/system/dubbo/RemoteConfigServiceImpl.java (100%) rename stwzhj-modules/{stwzhj-system => wzhj-system}/src/main/java/org/dromara/system/dubbo/RemoteDataScopeServiceImpl.java (100%) rename stwzhj-modules/{stwzhj-system => wzhj-system}/src/main/java/org/dromara/system/dubbo/RemoteDeptServiceImpl.java (100%) rename stwzhj-modules/{stwzhj-system => wzhj-system}/src/main/java/org/dromara/system/dubbo/RemoteDeviceImpl.java (100%) rename stwzhj-modules/{stwzhj-system => wzhj-system}/src/main/java/org/dromara/system/dubbo/RemoteDictServiceImpl.java (100%) rename stwzhj-modules/{stwzhj-system => wzhj-system}/src/main/java/org/dromara/system/dubbo/RemoteLogServiceImpl.java (100%) rename stwzhj-modules/{stwzhj-system => wzhj-system}/src/main/java/org/dromara/system/dubbo/RemoteSocialServiceImpl.java (100%) rename stwzhj-modules/{stwzhj-system => wzhj-system}/src/main/java/org/dromara/system/dubbo/RemoteTenantServiceImpl.java (100%) rename stwzhj-modules/{stwzhj-system => wzhj-system}/src/main/java/org/dromara/system/dubbo/RemoteUserServiceImpl.java (100%) rename stwzhj-modules/{wzhj-webscoket/src/main/java/org/dromara/webscoket => wzhj-system/src/main/java/org/dromara/system}/exception/MyBusinessException.java (96%) rename stwzhj-modules/{stwzhj-system => wzhj-system}/src/main/java/org/dromara/system/listener/SysUserImportListener.java (100%) rename stwzhj-modules/{stwzhj-system => wzhj-system}/src/main/java/org/dromara/system/listener/TDeviceImportListener.java (100%) rename stwzhj-modules/{stwzhj-system => wzhj-system}/src/main/java/org/dromara/system/mapper/DeviceRedisMapper.java (100%) rename stwzhj-modules/{stwzhj-system => wzhj-system}/src/main/java/org/dromara/system/mapper/SysClientMapper.java (100%) rename stwzhj-modules/{stwzhj-system => wzhj-system}/src/main/java/org/dromara/system/mapper/SysConfigMapper.java (100%) rename stwzhj-modules/{stwzhj-system => wzhj-system}/src/main/java/org/dromara/system/mapper/SysDeptMapper.java (100%) rename stwzhj-modules/{stwzhj-system => wzhj-system}/src/main/java/org/dromara/system/mapper/SysDictDataMapper.java (100%) rename stwzhj-modules/{stwzhj-system => wzhj-system}/src/main/java/org/dromara/system/mapper/SysDictTypeMapper.java (100%) rename stwzhj-modules/{stwzhj-system => wzhj-system}/src/main/java/org/dromara/system/mapper/SysLogininforMapper.java (100%) rename stwzhj-modules/{stwzhj-system => wzhj-system}/src/main/java/org/dromara/system/mapper/SysMenuMapper.java (100%) rename stwzhj-modules/{stwzhj-system => wzhj-system}/src/main/java/org/dromara/system/mapper/SysNoticeMapper.java (100%) rename stwzhj-modules/{stwzhj-system => wzhj-system}/src/main/java/org/dromara/system/mapper/SysOperLogMapper.java (100%) rename stwzhj-modules/{stwzhj-system => wzhj-system}/src/main/java/org/dromara/system/mapper/SysPostMapper.java (100%) rename stwzhj-modules/{stwzhj-system => wzhj-system}/src/main/java/org/dromara/system/mapper/SysRoleDeptMapper.java (100%) rename stwzhj-modules/{stwzhj-system => wzhj-system}/src/main/java/org/dromara/system/mapper/SysRoleMapper.java (100%) rename stwzhj-modules/{stwzhj-system => wzhj-system}/src/main/java/org/dromara/system/mapper/SysRoleMenuMapper.java (100%) rename stwzhj-modules/{stwzhj-system => wzhj-system}/src/main/java/org/dromara/system/mapper/SysSocialMapper.java (100%) rename stwzhj-modules/{stwzhj-system => wzhj-system}/src/main/java/org/dromara/system/mapper/SysTenantMapper.java (100%) rename stwzhj-modules/{stwzhj-system => wzhj-system}/src/main/java/org/dromara/system/mapper/SysTenantPackageMapper.java (100%) rename stwzhj-modules/{stwzhj-system => wzhj-system}/src/main/java/org/dromara/system/mapper/SysUserMapper.java (100%) rename stwzhj-modules/{stwzhj-system => wzhj-system}/src/main/java/org/dromara/system/mapper/SysUserPostMapper.java (100%) rename stwzhj-modules/{stwzhj-system => wzhj-system}/src/main/java/org/dromara/system/mapper/SysUserRoleMapper.java (100%) rename stwzhj-modules/{stwzhj-system => wzhj-system}/src/main/java/org/dromara/system/mapper/TDeviceMapper.java (100%) rename stwzhj-modules/{stwzhj-system => wzhj-system}/src/main/java/org/dromara/system/schedule/DeviceRedisSchedule.java (100%) rename stwzhj-modules/{stwzhj-system => wzhj-system}/src/main/java/org/dromara/system/service/IDeviceRedisService.java (100%) rename stwzhj-modules/{stwzhj-system => wzhj-system}/src/main/java/org/dromara/system/service/ISysClientService.java (100%) rename stwzhj-modules/{stwzhj-system => wzhj-system}/src/main/java/org/dromara/system/service/ISysConfigService.java (100%) rename stwzhj-modules/{stwzhj-system => wzhj-system}/src/main/java/org/dromara/system/service/ISysDeptService.java (100%) rename stwzhj-modules/{stwzhj-system => wzhj-system}/src/main/java/org/dromara/system/service/ISysDictDataService.java (100%) rename stwzhj-modules/{stwzhj-system => wzhj-system}/src/main/java/org/dromara/system/service/ISysDictTypeService.java (100%) rename stwzhj-modules/{stwzhj-system => wzhj-system}/src/main/java/org/dromara/system/service/ISysLogininforService.java (100%) rename stwzhj-modules/{stwzhj-system => wzhj-system}/src/main/java/org/dromara/system/service/ISysMenuService.java (100%) rename stwzhj-modules/{stwzhj-system => wzhj-system}/src/main/java/org/dromara/system/service/ISysNoticeService.java (100%) rename stwzhj-modules/{stwzhj-system => wzhj-system}/src/main/java/org/dromara/system/service/ISysOperLogService.java (100%) rename stwzhj-modules/{stwzhj-system => wzhj-system}/src/main/java/org/dromara/system/service/ISysPermissionService.java (100%) rename stwzhj-modules/{stwzhj-system => wzhj-system}/src/main/java/org/dromara/system/service/ISysPostService.java (100%) rename stwzhj-modules/{stwzhj-system => wzhj-system}/src/main/java/org/dromara/system/service/ISysRoleService.java (100%) rename stwzhj-modules/{stwzhj-system => wzhj-system}/src/main/java/org/dromara/system/service/ISysSocialService.java (100%) rename stwzhj-modules/{stwzhj-system => wzhj-system}/src/main/java/org/dromara/system/service/ISysTenantPackageService.java (100%) rename stwzhj-modules/{stwzhj-system => wzhj-system}/src/main/java/org/dromara/system/service/ISysTenantService.java (100%) rename stwzhj-modules/{stwzhj-system => wzhj-system}/src/main/java/org/dromara/system/service/ISysUserService.java (100%) rename stwzhj-modules/{stwzhj-system => wzhj-system}/src/main/java/org/dromara/system/service/ITDeviceService.java (100%) rename stwzhj-modules/{stwzhj-system => wzhj-system}/src/main/java/org/dromara/system/service/impl/DeviceRedisServiceImpl.java (100%) rename stwzhj-modules/{stwzhj-system => wzhj-system}/src/main/java/org/dromara/system/service/impl/SysClientServiceImpl.java (100%) rename stwzhj-modules/{stwzhj-system => wzhj-system}/src/main/java/org/dromara/system/service/impl/SysConfigServiceImpl.java (100%) rename stwzhj-modules/{stwzhj-system => wzhj-system}/src/main/java/org/dromara/system/service/impl/SysDeptServiceImpl.java (100%) rename stwzhj-modules/{stwzhj-system => wzhj-system}/src/main/java/org/dromara/system/service/impl/SysDictDataServiceImpl.java (100%) rename stwzhj-modules/{stwzhj-system => wzhj-system}/src/main/java/org/dromara/system/service/impl/SysDictTypeServiceImpl.java (100%) rename stwzhj-modules/{stwzhj-system => wzhj-system}/src/main/java/org/dromara/system/service/impl/SysLogininforServiceImpl.java (100%) rename stwzhj-modules/{stwzhj-system => wzhj-system}/src/main/java/org/dromara/system/service/impl/SysMenuServiceImpl.java (100%) rename stwzhj-modules/{stwzhj-system => wzhj-system}/src/main/java/org/dromara/system/service/impl/SysNoticeServiceImpl.java (100%) rename stwzhj-modules/{stwzhj-system => wzhj-system}/src/main/java/org/dromara/system/service/impl/SysOperLogServiceImpl.java (100%) rename stwzhj-modules/{stwzhj-system => wzhj-system}/src/main/java/org/dromara/system/service/impl/SysPermissionServiceImpl.java (100%) rename stwzhj-modules/{stwzhj-system => wzhj-system}/src/main/java/org/dromara/system/service/impl/SysPostServiceImpl.java (100%) rename stwzhj-modules/{stwzhj-system => wzhj-system}/src/main/java/org/dromara/system/service/impl/SysRoleServiceImpl.java (100%) rename stwzhj-modules/{stwzhj-system => wzhj-system}/src/main/java/org/dromara/system/service/impl/SysSensitiveServiceImpl.java (100%) rename stwzhj-modules/{stwzhj-system => wzhj-system}/src/main/java/org/dromara/system/service/impl/SysSocialServiceImpl.java (100%) rename stwzhj-modules/{stwzhj-system => wzhj-system}/src/main/java/org/dromara/system/service/impl/SysTenantPackageServiceImpl.java (100%) rename stwzhj-modules/{stwzhj-system => wzhj-system}/src/main/java/org/dromara/system/service/impl/SysTenantServiceImpl.java (100%) rename stwzhj-modules/{stwzhj-system => wzhj-system}/src/main/java/org/dromara/system/service/impl/SysUserServiceImpl.java (100%) rename stwzhj-modules/{stwzhj-system => wzhj-system}/src/main/java/org/dromara/system/service/impl/TDeviceServiceImpl.java (100%) rename stwzhj-modules/{stwzhj-system => wzhj-system}/src/main/resources/application.yml (100%) rename stwzhj-modules/{stwzhj-system => wzhj-system}/src/main/resources/banner.txt (100%) rename stwzhj-modules/{stwzhj-system => wzhj-system}/src/main/resources/logback-plus.xml (100%) rename stwzhj-modules/{stwzhj-system => wzhj-system}/src/main/resources/mapper/package-info.md (100%) rename stwzhj-modules/{stwzhj-system => wzhj-system}/src/main/resources/mapper/system/DeviceRedisMapper.xml (100%) rename stwzhj-modules/{stwzhj-system => wzhj-system}/src/main/resources/mapper/system/SysClientMapper.xml (100%) rename stwzhj-modules/{stwzhj-system => wzhj-system}/src/main/resources/mapper/system/SysConfigMapper.xml (100%) rename stwzhj-modules/{stwzhj-system => wzhj-system}/src/main/resources/mapper/system/SysDeptMapper.xml (100%) rename stwzhj-modules/{stwzhj-system => wzhj-system}/src/main/resources/mapper/system/SysDictDataMapper.xml (100%) rename stwzhj-modules/{stwzhj-system => wzhj-system}/src/main/resources/mapper/system/SysDictTypeMapper.xml (100%) rename stwzhj-modules/{stwzhj-system => wzhj-system}/src/main/resources/mapper/system/SysLogininforMapper.xml (100%) rename stwzhj-modules/{stwzhj-system => wzhj-system}/src/main/resources/mapper/system/SysMenuMapper.xml (100%) rename stwzhj-modules/{stwzhj-system => wzhj-system}/src/main/resources/mapper/system/SysNoticeMapper.xml (100%) rename stwzhj-modules/{stwzhj-system => wzhj-system}/src/main/resources/mapper/system/SysOperLogMapper.xml (100%) rename stwzhj-modules/{stwzhj-system => wzhj-system}/src/main/resources/mapper/system/SysPostMapper.xml (100%) rename stwzhj-modules/{stwzhj-system => wzhj-system}/src/main/resources/mapper/system/SysRoleDeptMapper.xml (100%) rename stwzhj-modules/{stwzhj-system => wzhj-system}/src/main/resources/mapper/system/SysRoleMapper.xml (100%) rename stwzhj-modules/{stwzhj-system => wzhj-system}/src/main/resources/mapper/system/SysRoleMenuMapper.xml (100%) rename stwzhj-modules/{stwzhj-system => wzhj-system}/src/main/resources/mapper/system/SysSocialMapper.xml (100%) rename stwzhj-modules/{stwzhj-system => wzhj-system}/src/main/resources/mapper/system/SysTenantMapper.xml (100%) rename stwzhj-modules/{stwzhj-system => wzhj-system}/src/main/resources/mapper/system/SysTenantPackageMapper.xml (100%) rename stwzhj-modules/{stwzhj-system => wzhj-system}/src/main/resources/mapper/system/SysUserMapper.xml (100%) rename stwzhj-modules/{stwzhj-system => wzhj-system}/src/main/resources/mapper/system/SysUserPostMapper.xml (100%) rename stwzhj-modules/{stwzhj-system => wzhj-system}/src/main/resources/mapper/system/SysUserRoleMapper.xml (100%) rename stwzhj-modules/{stwzhj-system => wzhj-system}/src/main/resources/mapper/system/TDeviceMapper.xml (100%) diff --git a/stwzhj-common/stwzhj-common-redis/src/main/java/org/dromara/common/redis/utils/RedisUtils.java b/stwzhj-common/stwzhj-common-redis/src/main/java/org/dromara/common/redis/utils/RedisUtils.java index a7f0e8af..99df478b 100644 --- a/stwzhj-common/stwzhj-common-redis/src/main/java/org/dromara/common/redis/utils/RedisUtils.java +++ b/stwzhj-common/stwzhj-common-redis/src/main/java/org/dromara/common/redis/utils/RedisUtils.java @@ -751,4 +751,12 @@ public class RedisUtils { return count1; } + // 查询半径周边 米内的成员 + public static List nearByXYReadonly(double centerLon,double centerLat,double distance){ + RGeo geo = CLIENT.getGeo(RedisConstants.ONLINE_USERS_GEO); + List members = geo.radius(centerLon, centerLat, distance, GeoUnit.METERS); + return members; + } + + } diff --git a/stwzhj-modules/pom.xml b/stwzhj-modules/pom.xml index aaef5cea..74c11234 100644 --- a/stwzhj-modules/pom.xml +++ b/stwzhj-modules/pom.xml @@ -9,7 +9,7 @@ 4.0.0 - stwzhj-system + wzhj-system stwzhj-gen stwzhj-job stwzhj-resource @@ -17,7 +17,7 @@ wzhj-data2es stwzhj-baseToSt wzhj-consumer - stwzhj-location + wzhj-location stwzhj-dataToGas wzhj-webscoket wzhj-extract diff --git a/stwzhj-modules/stwzhj-data2es/src/main/java/org/dromara/data2es/replace b/stwzhj-modules/stwzhj-data2es/src/main/java/org/dromara/data2es/replace deleted file mode 100644 index e69de29b..00000000 diff --git a/stwzhj-modules/wzhj-data2es/src/main/java/org/dromara/data2es/service/impl/GpsServiceImpl.java b/stwzhj-modules/wzhj-data2es/src/main/java/org/dromara/data2es/service/impl/GpsServiceImpl.java index 85400564..5abaaf96 100644 --- a/stwzhj-modules/wzhj-data2es/src/main/java/org/dromara/data2es/service/impl/GpsServiceImpl.java +++ b/stwzhj-modules/wzhj-data2es/src/main/java/org/dromara/data2es/service/impl/GpsServiceImpl.java @@ -110,11 +110,12 @@ public class GpsServiceImpl implements IGpsService { List deleteKeys = new ArrayList<>(); BulkRequest bulkRequest = new BulkRequest(); for (EsGpsInfoVO2 info : list) { - + String deviceType = info.getDeviceType(); + String deviceCode = info.getDeviceCode(); //设置地市zzjgdm - info = getInfo(info); + info = getInfo(info); if (Objects.isNull(info)) { - logger.error("redis中的Object=null，deviceType={},deviceCode={}",info.getDeviceType(),info.getDeviceCode()); + logger.error("redis或者mysql中的Object=null，deviceType={},deviceCode={}",deviceType,deviceCode); continue; } //redis diff --git a/stwzhj-modules/stwzhj-location/pom.xml b/stwzhj-modules/wzhj-location/pom.xml similarity index 98% rename from stwzhj-modules/stwzhj-location/pom.xml rename to stwzhj-modules/wzhj-location/pom.xml index f7f7750d..2c485b03 100644 --- a/stwzhj-modules/stwzhj-location/pom.xml +++ b/stwzhj-modules/wzhj-location/pom.xml @@ -9,10 +9,10 @@ 4.0.0 - stwzhj-location + wzhj-location - stwzhj-location位置汇聚坐标点位历史轨迹 + wzhj-location位置汇聚坐标点位历史轨迹 diff --git a/stwzhj-modules/stwzhj-location/src/main/java/org/dromara/location/LocationApplication.java b/stwzhj-modules/wzhj-location/src/main/java/org/dromara/location/LocationApplication.java similarity index 100% rename from stwzhj-modules/stwzhj-location/src/main/java/org/dromara/location/LocationApplication.java rename to stwzhj-modules/wzhj-location/src/main/java/org/dromara/location/LocationApplication.java diff --git a/stwzhj-modules/stwzhj-location/src/main/java/org/dromara/location/config/ElasticsearchConfig.java b/stwzhj-modules/wzhj-location/src/main/java/org/dromara/location/config/ElasticsearchConfig.java similarity index 100% rename from stwzhj-modules/stwzhj-location/src/main/java/org/dromara/location/config/ElasticsearchConfig.java rename to stwzhj-modules/wzhj-location/src/main/java/org/dromara/location/config/ElasticsearchConfig.java diff --git a/stwzhj-modules/stwzhj-location/src/main/java/org/dromara/location/controller/ElasticSearchController.java b/stwzhj-modules/wzhj-location/src/main/java/org/dromara/location/controller/ElasticSearchController.java similarity index 100% rename from stwzhj-modules/stwzhj-location/src/main/java/org/dromara/location/controller/ElasticSearchController.java rename to stwzhj-modules/wzhj-location/src/main/java/org/dromara/location/controller/ElasticSearchController.java diff --git a/stwzhj-modules/stwzhj-location/src/main/java/org/dromara/location/controller/LocationController.java b/stwzhj-modules/wzhj-location/src/main/java/org/dromara/location/controller/LocationController.java similarity index 77% rename from stwzhj-modules/stwzhj-location/src/main/java/org/dromara/location/controller/LocationController.java rename to stwzhj-modules/wzhj-location/src/main/java/org/dromara/location/controller/LocationController.java index 1cf210af..79946b6d 100644 --- a/stwzhj-modules/stwzhj-location/src/main/java/org/dromara/location/controller/LocationController.java +++ b/stwzhj-modules/wzhj-location/src/main/java/org/dromara/location/controller/LocationController.java @@ -9,6 +9,7 @@ import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONArray; import org.apache.dubbo.config.annotation.DubboReference; import org.dromara.common.core.domain.R; +import org.dromara.common.core.utils.RedisConstants; import org.dromara.common.redis.utils.RedisUtils; import org.dromara.system.api.RemoteDeviceService; import org.dromara.system.api.domain.bo.RemoteDeviceBo; @@ -26,6 +27,7 @@ import redis.clients.jedis.resps.GeoRadiusResponse; import javax.annotation.Resource; import java.util.*; +import java.util.stream.Collectors; @Configuration @RestController @@ -44,11 +46,10 @@ public class LocationController { /* - * 根据条件获取设备坐标信息集合 - * */ + * 根据条件获取设备坐标信息集合 + * */ @PostMapping("/getAllLocation") public R getAllLocaltion(@RequestBody Map params){ - String now = DateUtil.format(new Date(),"YYYY-MM-dd"); String keys = "online_users:"; String key = null; // 在不同条件下赋值 最后根据此key取值 if(CollectionUtils.isEmpty(params)){ @@ -61,9 +62,9 @@ public class LocationController { } if (null != params.get("type")){ String type = params.get("type").toString(); - key = keys + "*:[" +type+"]:*"; + key = keys + "[" +type+"]:*"; if (null != params.get("deptId")){ - key = keys + params.get("deptId").toString() + "*:["+type+"]:*"; // key值为 online_users:2022-04-20:3401*:[01,02]:* + key = keys + params.get("deptId").toString() + ":["+type+"]:*"; // key值为 online_users:2022-04-20:3401*:[01,02]:* } }else { @@ -97,33 +98,34 @@ public class LocationController { times = params.get("times").toString(); } String zzjgdms = ""; - List dlist = new ArrayList<>(); + List dlist = new ArrayList<>(); if (null != params.get("type")){ //类型不为空时 查询Redis数据 String type = params.get("type").toString(); // String[] types = Convert.toStrArray(type); + String key = keys + "["+type+"]:*"; // key值为 online_users:[01,02]:* zzjgdms = params.get("zzjgdm").toString(); String[] zzjgdm = Convert.toStrArray(zzjgdms); - for (String s : zzjgdm) { - s = deptIdSub(s); - String key = keys + s + ":["+type+"]:*"; // key值为 online_users:3401xxxx:[01,02]:* - List list = RedisUtils.searchAndGetKeysValues(key); - list.removeAll(Collections.singleton(null)); - dlist.addAll(list); - } + Set targetSet = new HashSet<>(List.of(zzjgdm)); // 转为HashSet提高查询效率 + List list = RedisUtils.searchAndGetKeysValues(key); + list.removeAll(Collections.singleton(null)); + List matchedObjects = list.stream() + .filter(obj -> targetSet.contains(obj.getStr("zzjgdm"))) + .collect(Collectors.toList()); //根据前端勾选机构和全部的redis记录匹配是否包含 这样减少多次查询和查库 + dlist.addAll(matchedObjects); }else { + String key = keys + "*"; // key值为 online_users:* zzjgdms = params.get("zzjgdm").toString(); String[] zzjgdm = Convert.toStrArray(zzjgdms); - for (String s : zzjgdm) { - s = deptIdSub(s); - String key = keys + s + ":*"; - List list = RedisUtils.searchAndGetKeysValues(key); - list.removeAll(Collections.singleton(null)); - dlist.addAll(list); - } + Set targetSet = new HashSet<>(List.of(zzjgdm)); // 转为HashSet提高查询效率 + List list = RedisUtils.searchAndGetKeysValues(key); + list.removeAll(Collections.singleton(null)); + List matchedObjects = list.stream() + .filter(obj -> targetSet.contains(obj.getStr("zzjgdm"))) + .collect(Collectors.toList()); //根据前端勾选机构和全部的redis记录匹配是否包含 这样减少多次查询和查库 + dlist.addAll(matchedObjects); } JSONArray.toJSONString(dlist); - if ("1".equals(times)){ - List nearList = new ArrayList<>(); + if ("1".equals(times)){ List nearList = new ArrayList<>(); for (Object o : dlist) { JSONObject object = JSONUtil.parseObj(o); Integer online = object.getInt("online"); @@ -138,12 +140,12 @@ public class LocationController { } /* - * 根据设备ID 获取设备信息 - * */ + * 根据设备ID 获取设备信息 + * */ @PostMapping("/getLocationByDeviceId") public R getLocationByDeviceId(@RequestBody Map params){ if(CollectionUtils.isEmpty(params)){ - return R.fail("参数不能为空"); + return R.fail("参数不能为空"); } String keys = "online_users:"; String key = ""; @@ -166,8 +168,8 @@ public class LocationController { /* - * 根据坐标和距离返回范围内设备 - * */ + * 根据坐标和距离返回范围内设备 + * */ @PostMapping("/getLocationByPoint") public R getLocationByPoint(@RequestBody Map params){ String keys = "online_users:"; @@ -177,28 +179,25 @@ public class LocationController { String lat = params.get("lat").toString(); String lng = params.get("lng").toString(); String dist = params.get("distance").toString(); - /* List geoRadiusResponses = redisUtil.nearByXYReadonly(RedisConstants.ONLINE_USERS_GEO, - Double.parseDouble(lng), Double.parseDouble(lat), Double.parseDouble(dist)); - List list = new ArrayList<>(); - for (GeoRadiusResponse geoRadiusRespons : geoRadiusResponses) { - String memberByString = geoRadiusRespons.getMemberByString(); - logger.info("member:"+memberByString); - String[] strs = memberByString.split("#"); - logger.info("key值:"+keys+":"+strs[0]+":"+strs[1]+":"+strs[2]); - Object object = redisUtil.get(keys+":"+strs[0]+":"+strs[1]+":"+strs[2]); + List geoRadiusResponses = RedisUtils.nearByXYReadonly( + Double.parseDouble(lng), Double.parseDouble(lat), Double.parseDouble(dist)); + List list = new ArrayList<>(); + for (String geoRadiusRespons : geoRadiusResponses) { + logger.info("member:"+geoRadiusRespons); + String[] strs = geoRadiusRespons.split("#"); + logger.info("key值:"+keys+":"+strs[0]+":"+strs[1]); + JSONObject object = RedisUtils.getBucket(keys+":"+strs[0]+":"+strs[1]); if (null != object){ - Device device = FastJSONUtil.parsePojo(object.toString(), Device.class); - //device = rebuildDevice(device); - list.add(device); + list.add(object); } - }*/ + } - return R.ok(); + return R.ok(list); } /*+ - * 根据机构、类型和模糊条件匹配设备 - * */ + * 根据机构、类型和模糊条件匹配设备 + * */ @PostMapping("/getObjByCondition") public R getObjByCondition(@RequestBody Map params){ if(CollectionUtils.isEmpty(params)){ diff --git a/stwzhj-modules/stwzhj-location/src/main/java/org/dromara/location/dubbo/RemoteElasticSearchServiceImpl.java b/stwzhj-modules/wzhj-location/src/main/java/org/dromara/location/dubbo/RemoteElasticSearchServiceImpl.java similarity index 100% rename from stwzhj-modules/stwzhj-location/src/main/java/org/dromara/location/dubbo/RemoteElasticSearchServiceImpl.java rename to stwzhj-modules/wzhj-location/src/main/java/org/dromara/location/dubbo/RemoteElasticSearchServiceImpl.java diff --git a/stwzhj-modules/stwzhj-location/src/main/java/org/dromara/location/package-info.java b/stwzhj-modules/wzhj-location/src/main/java/org/dromara/location/package-info.java similarity index 100% rename from stwzhj-modules/stwzhj-location/src/main/java/org/dromara/location/package-info.java rename to stwzhj-modules/wzhj-location/src/main/java/org/dromara/location/package-info.java diff --git a/stwzhj-modules/stwzhj-location/src/main/java/org/dromara/location/service/ISearchService.java b/stwzhj-modules/wzhj-location/src/main/java/org/dromara/location/service/ISearchService.java similarity index 100% rename from stwzhj-modules/stwzhj-location/src/main/java/org/dromara/location/service/ISearchService.java rename to stwzhj-modules/wzhj-location/src/main/java/org/dromara/location/service/ISearchService.java diff --git a/stwzhj-modules/stwzhj-location/src/main/java/org/dromara/location/service/impl/SearchServiceImpl.java b/stwzhj-modules/wzhj-location/src/main/java/org/dromara/location/service/impl/SearchServiceImpl.java similarity index 100% rename from stwzhj-modules/stwzhj-location/src/main/java/org/dromara/location/service/impl/SearchServiceImpl.java rename to stwzhj-modules/wzhj-location/src/main/java/org/dromara/location/service/impl/SearchServiceImpl.java diff --git a/stwzhj-modules/stwzhj-location/src/main/resources/application.yml b/stwzhj-modules/wzhj-location/src/main/resources/application.yml similarity index 100% rename from stwzhj-modules/stwzhj-location/src/main/resources/application.yml rename to stwzhj-modules/wzhj-location/src/main/resources/application.yml diff --git a/stwzhj-modules/stwzhj-location/src/main/resources/banner.txt b/stwzhj-modules/wzhj-location/src/main/resources/banner.txt similarity index 100% rename from stwzhj-modules/stwzhj-location/src/main/resources/banner.txt rename to stwzhj-modules/wzhj-location/src/main/resources/banner.txt diff --git a/stwzhj-modules/stwzhj-location/src/main/resources/logback-plus.xml b/stwzhj-modules/wzhj-location/src/main/resources/logback-plus.xml similarity index 100% rename from stwzhj-modules/stwzhj-location/src/main/resources/logback-plus.xml rename to stwzhj-modules/wzhj-location/src/main/resources/logback-plus.xml diff --git a/stwzhj-modules/stwzhj-system/Dockerfile b/stwzhj-modules/wzhj-system/Dockerfile similarity index 100% rename from stwzhj-modules/stwzhj-system/Dockerfile rename to stwzhj-modules/wzhj-system/Dockerfile diff --git a/stwzhj-modules/stwzhj-system/pom.xml b/stwzhj-modules/wzhj-system/pom.xml similarity index 98% rename from stwzhj-modules/stwzhj-system/pom.xml rename to stwzhj-modules/wzhj-system/pom.xml index e638f8c2..e36e422c 100644 --- a/stwzhj-modules/stwzhj-system/pom.xml +++ b/stwzhj-modules/wzhj-system/pom.xml @@ -9,10 +9,10 @@ 4.0.0 - stwzhj-system + wzhj-system - stwzhj-system系统模块 + wzhj-system系统模块 diff --git a/stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/RuoYiSystemApplication.java b/stwzhj-modules/wzhj-system/src/main/java/org/dromara/system/RuoYiSystemApplication.java similarity index 100% rename from stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/RuoYiSystemApplication.java rename to stwzhj-modules/wzhj-system/src/main/java/org/dromara/system/RuoYiSystemApplication.java diff --git a/stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/controller/monitor/CacheController.java b/stwzhj-modules/wzhj-system/src/main/java/org/dromara/system/controller/monitor/CacheController.java similarity index 100% rename from stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/controller/monitor/CacheController.java rename to stwzhj-modules/wzhj-system/src/main/java/org/dromara/system/controller/monitor/CacheController.java diff --git a/stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/controller/monitor/SysLogininforController.java b/stwzhj-modules/wzhj-system/src/main/java/org/dromara/system/controller/monitor/SysLogininforController.java similarity index 100% rename from stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/controller/monitor/SysLogininforController.java rename to stwzhj-modules/wzhj-system/src/main/java/org/dromara/system/controller/monitor/SysLogininforController.java diff --git a/stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/controller/monitor/SysOperlogController.java b/stwzhj-modules/wzhj-system/src/main/java/org/dromara/system/controller/monitor/SysOperlogController.java similarity index 100% rename from stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/controller/monitor/SysOperlogController.java rename to stwzhj-modules/wzhj-system/src/main/java/org/dromara/system/controller/monitor/SysOperlogController.java diff --git a/stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/controller/monitor/SysUserOnlineController.java b/stwzhj-modules/wzhj-system/src/main/java/org/dromara/system/controller/monitor/SysUserOnlineController.java similarity index 100% rename from stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/controller/monitor/SysUserOnlineController.java rename to stwzhj-modules/wzhj-system/src/main/java/org/dromara/system/controller/monitor/SysUserOnlineController.java diff --git a/stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/controller/system/IndexStaticsController.java b/stwzhj-modules/wzhj-system/src/main/java/org/dromara/system/controller/system/IndexStaticsController.java similarity index 100% rename from stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/controller/system/IndexStaticsController.java rename to stwzhj-modules/wzhj-system/src/main/java/org/dromara/system/controller/system/IndexStaticsController.java diff --git a/stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/controller/system/SysClientController.java b/stwzhj-modules/wzhj-system/src/main/java/org/dromara/system/controller/system/SysClientController.java similarity index 100% rename from stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/controller/system/SysClientController.java rename to stwzhj-modules/wzhj-system/src/main/java/org/dromara/system/controller/system/SysClientController.java diff --git a/stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/controller/system/SysConfigController.java b/stwzhj-modules/wzhj-system/src/main/java/org/dromara/system/controller/system/SysConfigController.java similarity index 100% rename from stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/controller/system/SysConfigController.java rename to stwzhj-modules/wzhj-system/src/main/java/org/dromara/system/controller/system/SysConfigController.java diff --git a/stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/controller/system/SysDeptController.java b/stwzhj-modules/wzhj-system/src/main/java/org/dromara/system/controller/system/SysDeptController.java similarity index 100% rename from stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/controller/system/SysDeptController.java rename to stwzhj-modules/wzhj-system/src/main/java/org/dromara/system/controller/system/SysDeptController.java diff --git a/stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/controller/system/SysDictDataController.java b/stwzhj-modules/wzhj-system/src/main/java/org/dromara/system/controller/system/SysDictDataController.java similarity index 100% rename from stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/controller/system/SysDictDataController.java rename to stwzhj-modules/wzhj-system/src/main/java/org/dromara/system/controller/system/SysDictDataController.java diff --git a/stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/controller/system/SysDictTypeController.java b/stwzhj-modules/wzhj-system/src/main/java/org/dromara/system/controller/system/SysDictTypeController.java similarity index 100% rename from stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/controller/system/SysDictTypeController.java rename to stwzhj-modules/wzhj-system/src/main/java/org/dromara/system/controller/system/SysDictTypeController.java diff --git a/stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/controller/system/SysMenuController.java b/stwzhj-modules/wzhj-system/src/main/java/org/dromara/system/controller/system/SysMenuController.java similarity index 100% rename from stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/controller/system/SysMenuController.java rename to stwzhj-modules/wzhj-system/src/main/java/org/dromara/system/controller/system/SysMenuController.java diff --git a/stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/controller/system/SysNoticeController.java b/stwzhj-modules/wzhj-system/src/main/java/org/dromara/system/controller/system/SysNoticeController.java similarity index 100% rename from stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/controller/system/SysNoticeController.java rename to stwzhj-modules/wzhj-system/src/main/java/org/dromara/system/controller/system/SysNoticeController.java diff --git a/stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/controller/system/SysPostController.java b/stwzhj-modules/wzhj-system/src/main/java/org/dromara/system/controller/system/SysPostController.java similarity index 100% rename from stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/controller/system/SysPostController.java rename to stwzhj-modules/wzhj-system/src/main/java/org/dromara/system/controller/system/SysPostController.java diff --git a/stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/controller/system/SysProfileController.java b/stwzhj-modules/wzhj-system/src/main/java/org/dromara/system/controller/system/SysProfileController.java similarity index 100% rename from stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/controller/system/SysProfileController.java rename to stwzhj-modules/wzhj-system/src/main/java/org/dromara/system/controller/system/SysProfileController.java diff --git a/stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/controller/system/SysRoleController.java b/stwzhj-modules/wzhj-system/src/main/java/org/dromara/system/controller/system/SysRoleController.java similarity index 100% rename from stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/controller/system/SysRoleController.java rename to stwzhj-modules/wzhj-system/src/main/java/org/dromara/system/controller/system/SysRoleController.java diff --git a/stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/controller/system/SysSocialController.java b/stwzhj-modules/wzhj-system/src/main/java/org/dromara/system/controller/system/SysSocialController.java similarity index 100% rename from stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/controller/system/SysSocialController.java rename to stwzhj-modules/wzhj-system/src/main/java/org/dromara/system/controller/system/SysSocialController.java diff --git a/stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/controller/system/SysTenantController.java b/stwzhj-modules/wzhj-system/src/main/java/org/dromara/system/controller/system/SysTenantController.java similarity index 100% rename from stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/controller/system/SysTenantController.java rename to stwzhj-modules/wzhj-system/src/main/java/org/dromara/system/controller/system/SysTenantController.java diff --git a/stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/controller/system/SysTenantPackageController.java b/stwzhj-modules/wzhj-system/src/main/java/org/dromara/system/controller/system/SysTenantPackageController.java similarity index 100% rename from stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/controller/system/SysTenantPackageController.java rename to stwzhj-modules/wzhj-system/src/main/java/org/dromara/system/controller/system/SysTenantPackageController.java diff --git a/stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/controller/system/SysUserController.java b/stwzhj-modules/wzhj-system/src/main/java/org/dromara/system/controller/system/SysUserController.java similarity index 100% rename from stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/controller/system/SysUserController.java rename to stwzhj-modules/wzhj-system/src/main/java/org/dromara/system/controller/system/SysUserController.java diff --git a/stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/controller/system/TDeviceController.java b/stwzhj-modules/wzhj-system/src/main/java/org/dromara/system/controller/system/TDeviceController.java similarity index 89% rename from stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/controller/system/TDeviceController.java rename to stwzhj-modules/wzhj-system/src/main/java/org/dromara/system/controller/system/TDeviceController.java index ac6b3bb1..40e8563f 100644 --- a/stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/controller/system/TDeviceController.java +++ b/stwzhj-modules/wzhj-system/src/main/java/org/dromara/system/controller/system/TDeviceController.java @@ -1,7 +1,8 @@ -package org.dromara.system.controller; +package org.dromara.system.controller.system; import java.util.ArrayList; import java.util.List; +import java.util.Objects; import lombok.RequiredArgsConstructor; import jakarta.servlet.http.HttpServletResponse; @@ -11,6 +12,7 @@ import org.dromara.common.excel.core.ExcelResult; import org.dromara.system.domain.vo.SysUserImportVo; import org.dromara.system.domain.vo.TDeviceExportVo; import org.dromara.system.domain.vo.TDeviceImportVo; +import org.dromara.system.exception.MyBusinessException; import org.dromara.system.listener.SysUserImportListener; import org.dromara.system.listener.TDeviceImportListener; import org.springframework.http.MediaType; @@ -55,6 +57,17 @@ public class TDeviceController extends BaseController { return tDeviceService.queryPageList(bo, pageQuery); } + @PostMapping("/getDeviceList") + public TableDataInfo getDeviceList(@RequestBody TDeviceBo bo){ + PageQuery pageQuery = new PageQuery(); + if (Objects.isNull(bo)) { + throw new MyBusinessException("请求参数不能为空"); + } + pageQuery.setPageNum(bo.getPageNum()); + pageQuery.setPageSize(bo.getPageSize()); + return tDeviceService.queryPageList(bo, pageQuery); + } + /** * 导出device列表 */ diff --git a/stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/domain/DeviceRedis.java b/stwzhj-modules/wzhj-system/src/main/java/org/dromara/system/domain/DeviceRedis.java similarity index 100% rename from stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/domain/DeviceRedis.java rename to stwzhj-modules/wzhj-system/src/main/java/org/dromara/system/domain/DeviceRedis.java diff --git a/stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/domain/SysClient.java b/stwzhj-modules/wzhj-system/src/main/java/org/dromara/system/domain/SysClient.java similarity index 100% rename from stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/domain/SysClient.java rename to stwzhj-modules/wzhj-system/src/main/java/org/dromara/system/domain/SysClient.java diff --git a/stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/domain/SysConfig.java b/stwzhj-modules/wzhj-system/src/main/java/org/dromara/system/domain/SysConfig.java similarity index 100% rename from stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/domain/SysConfig.java rename to stwzhj-modules/wzhj-system/src/main/java/org/dromara/system/domain/SysConfig.java diff --git a/stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/domain/SysDept.java b/stwzhj-modules/wzhj-system/src/main/java/org/dromara/system/domain/SysDept.java similarity index 100% rename from stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/domain/SysDept.java rename to stwzhj-modules/wzhj-system/src/main/java/org/dromara/system/domain/SysDept.java diff --git a/stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/domain/SysDictData.java b/stwzhj-modules/wzhj-system/src/main/java/org/dromara/system/domain/SysDictData.java similarity index 100% rename from stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/domain/SysDictData.java rename to stwzhj-modules/wzhj-system/src/main/java/org/dromara/system/domain/SysDictData.java diff --git a/stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/domain/SysDictType.java b/stwzhj-modules/wzhj-system/src/main/java/org/dromara/system/domain/SysDictType.java similarity index 100% rename from stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/domain/SysDictType.java rename to stwzhj-modules/wzhj-system/src/main/java/org/dromara/system/domain/SysDictType.java diff --git a/stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/domain/SysLogininfor.java b/stwzhj-modules/wzhj-system/src/main/java/org/dromara/system/domain/SysLogininfor.java similarity index 100% rename from stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/domain/SysLogininfor.java rename to stwzhj-modules/wzhj-system/src/main/java/org/dromara/system/domain/SysLogininfor.java diff --git a/stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/domain/SysMenu.java b/stwzhj-modules/wzhj-system/src/main/java/org/dromara/system/domain/SysMenu.java similarity index 100% rename from stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/domain/SysMenu.java rename to stwzhj-modules/wzhj-system/src/main/java/org/dromara/system/domain/SysMenu.java diff --git a/stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/domain/SysNotice.java b/stwzhj-modules/wzhj-system/src/main/java/org/dromara/system/domain/SysNotice.java similarity index 100% rename from stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/domain/SysNotice.java rename to stwzhj-modules/wzhj-system/src/main/java/org/dromara/system/domain/SysNotice.java diff --git a/stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/domain/SysOperLog.java b/stwzhj-modules/wzhj-system/src/main/java/org/dromara/system/domain/SysOperLog.java similarity index 100% rename from stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/domain/SysOperLog.java rename to stwzhj-modules/wzhj-system/src/main/java/org/dromara/system/domain/SysOperLog.java diff --git a/stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/domain/SysPost.java b/stwzhj-modules/wzhj-system/src/main/java/org/dromara/system/domain/SysPost.java similarity index 100% rename from stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/domain/SysPost.java rename to stwzhj-modules/wzhj-system/src/main/java/org/dromara/system/domain/SysPost.java diff --git a/stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/domain/SysRole.java b/stwzhj-modules/wzhj-system/src/main/java/org/dromara/system/domain/SysRole.java similarity index 100% rename from stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/domain/SysRole.java rename to stwzhj-modules/wzhj-system/src/main/java/org/dromara/system/domain/SysRole.java diff --git a/stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/domain/SysRoleDept.java b/stwzhj-modules/wzhj-system/src/main/java/org/dromara/system/domain/SysRoleDept.java similarity index 100% rename from stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/domain/SysRoleDept.java rename to stwzhj-modules/wzhj-system/src/main/java/org/dromara/system/domain/SysRoleDept.java diff --git a/stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/domain/SysRoleMenu.java b/stwzhj-modules/wzhj-system/src/main/java/org/dromara/system/domain/SysRoleMenu.java similarity index 100% rename from stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/domain/SysRoleMenu.java rename to stwzhj-modules/wzhj-system/src/main/java/org/dromara/system/domain/SysRoleMenu.java diff --git a/stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/domain/SysSocial.java b/stwzhj-modules/wzhj-system/src/main/java/org/dromara/system/domain/SysSocial.java similarity index 100% rename from stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/domain/SysSocial.java rename to stwzhj-modules/wzhj-system/src/main/java/org/dromara/system/domain/SysSocial.java diff --git a/stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/domain/SysTenant.java b/stwzhj-modules/wzhj-system/src/main/java/org/dromara/system/domain/SysTenant.java similarity index 100% rename from stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/domain/SysTenant.java rename to stwzhj-modules/wzhj-system/src/main/java/org/dromara/system/domain/SysTenant.java diff --git a/stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/domain/SysTenantPackage.java b/stwzhj-modules/wzhj-system/src/main/java/org/dromara/system/domain/SysTenantPackage.java similarity index 100% rename from stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/domain/SysTenantPackage.java rename to stwzhj-modules/wzhj-system/src/main/java/org/dromara/system/domain/SysTenantPackage.java diff --git a/stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/domain/SysUser.java b/stwzhj-modules/wzhj-system/src/main/java/org/dromara/system/domain/SysUser.java similarity index 100% rename from stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/domain/SysUser.java rename to stwzhj-modules/wzhj-system/src/main/java/org/dromara/system/domain/SysUser.java diff --git a/stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/domain/SysUserPost.java b/stwzhj-modules/wzhj-system/src/main/java/org/dromara/system/domain/SysUserPost.java similarity index 100% rename from stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/domain/SysUserPost.java rename to stwzhj-modules/wzhj-system/src/main/java/org/dromara/system/domain/SysUserPost.java diff --git a/stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/domain/SysUserRole.java b/stwzhj-modules/wzhj-system/src/main/java/org/dromara/system/domain/SysUserRole.java similarity index 100% rename from stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/domain/SysUserRole.java rename to stwzhj-modules/wzhj-system/src/main/java/org/dromara/system/domain/SysUserRole.java diff --git a/stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/domain/TDevice.java b/stwzhj-modules/wzhj-system/src/main/java/org/dromara/system/domain/TDevice.java similarity index 100% rename from stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/domain/TDevice.java rename to stwzhj-modules/wzhj-system/src/main/java/org/dromara/system/domain/TDevice.java diff --git a/stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/domain/bo/SysClientBo.java b/stwzhj-modules/wzhj-system/src/main/java/org/dromara/system/domain/bo/SysClientBo.java similarity index 100% rename from stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/domain/bo/SysClientBo.java rename to stwzhj-modules/wzhj-system/src/main/java/org/dromara/system/domain/bo/SysClientBo.java diff --git a/stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/domain/bo/SysConfigBo.java b/stwzhj-modules/wzhj-system/src/main/java/org/dromara/system/domain/bo/SysConfigBo.java similarity index 100% rename from stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/domain/bo/SysConfigBo.java rename to stwzhj-modules/wzhj-system/src/main/java/org/dromara/system/domain/bo/SysConfigBo.java diff --git a/stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/domain/bo/SysDeptBo.java b/stwzhj-modules/wzhj-system/src/main/java/org/dromara/system/domain/bo/SysDeptBo.java similarity index 100% rename from stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/domain/bo/SysDeptBo.java rename to stwzhj-modules/wzhj-system/src/main/java/org/dromara/system/domain/bo/SysDeptBo.java diff --git a/stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/domain/bo/SysDictDataBo.java b/stwzhj-modules/wzhj-system/src/main/java/org/dromara/system/domain/bo/SysDictDataBo.java similarity index 100% rename from stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/domain/bo/SysDictDataBo.java rename to stwzhj-modules/wzhj-system/src/main/java/org/dromara/system/domain/bo/SysDictDataBo.java diff --git a/stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/domain/bo/SysDictTypeBo.java b/stwzhj-modules/wzhj-system/src/main/java/org/dromara/system/domain/bo/SysDictTypeBo.java similarity index 100% rename from stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/domain/bo/SysDictTypeBo.java rename to stwzhj-modules/wzhj-system/src/main/java/org/dromara/system/domain/bo/SysDictTypeBo.java diff --git a/stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/domain/bo/SysLogininforBo.java b/stwzhj-modules/wzhj-system/src/main/java/org/dromara/system/domain/bo/SysLogininforBo.java similarity index 100% rename from stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/domain/bo/SysLogininforBo.java rename to stwzhj-modules/wzhj-system/src/main/java/org/dromara/system/domain/bo/SysLogininforBo.java diff --git a/stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/domain/bo/SysMenuBo.java b/stwzhj-modules/wzhj-system/src/main/java/org/dromara/system/domain/bo/SysMenuBo.java similarity index 100% rename from stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/domain/bo/SysMenuBo.java rename to stwzhj-modules/wzhj-system/src/main/java/org/dromara/system/domain/bo/SysMenuBo.java diff --git a/stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/domain/bo/SysNoticeBo.java b/stwzhj-modules/wzhj-system/src/main/java/org/dromara/system/domain/bo/SysNoticeBo.java similarity index 100% rename from stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/domain/bo/SysNoticeBo.java rename to stwzhj-modules/wzhj-system/src/main/java/org/dromara/system/domain/bo/SysNoticeBo.java diff --git a/stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/domain/bo/SysOperLogBo.java b/stwzhj-modules/wzhj-system/src/main/java/org/dromara/system/domain/bo/SysOperLogBo.java similarity index 100% rename from stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/domain/bo/SysOperLogBo.java rename to stwzhj-modules/wzhj-system/src/main/java/org/dromara/system/domain/bo/SysOperLogBo.java diff --git a/stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/domain/bo/SysPostBo.java b/stwzhj-modules/wzhj-system/src/main/java/org/dromara/system/domain/bo/SysPostBo.java similarity index 100% rename from stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/domain/bo/SysPostBo.java rename to stwzhj-modules/wzhj-system/src/main/java/org/dromara/system/domain/bo/SysPostBo.java diff --git a/stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/domain/bo/SysRoleBo.java b/stwzhj-modules/wzhj-system/src/main/java/org/dromara/system/domain/bo/SysRoleBo.java similarity index 100% rename from stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/domain/bo/SysRoleBo.java rename to stwzhj-modules/wzhj-system/src/main/java/org/dromara/system/domain/bo/SysRoleBo.java diff --git a/stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/domain/bo/SysSocialBo.java b/stwzhj-modules/wzhj-system/src/main/java/org/dromara/system/domain/bo/SysSocialBo.java similarity index 100% rename from stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/domain/bo/SysSocialBo.java rename to stwzhj-modules/wzhj-system/src/main/java/org/dromara/system/domain/bo/SysSocialBo.java diff --git a/stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/domain/bo/SysTenantBo.java b/stwzhj-modules/wzhj-system/src/main/java/org/dromara/system/domain/bo/SysTenantBo.java similarity index 100% rename from stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/domain/bo/SysTenantBo.java rename to stwzhj-modules/wzhj-system/src/main/java/org/dromara/system/domain/bo/SysTenantBo.java diff --git a/stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/domain/bo/SysTenantPackageBo.java b/stwzhj-modules/wzhj-system/src/main/java/org/dromara/system/domain/bo/SysTenantPackageBo.java similarity index 100% rename from stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/domain/bo/SysTenantPackageBo.java rename to stwzhj-modules/wzhj-system/src/main/java/org/dromara/system/domain/bo/SysTenantPackageBo.java diff --git a/stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/domain/bo/SysUserBo.java b/stwzhj-modules/wzhj-system/src/main/java/org/dromara/system/domain/bo/SysUserBo.java similarity index 100% rename from stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/domain/bo/SysUserBo.java rename to stwzhj-modules/wzhj-system/src/main/java/org/dromara/system/domain/bo/SysUserBo.java diff --git a/stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/domain/bo/SysUserPasswordBo.java b/stwzhj-modules/wzhj-system/src/main/java/org/dromara/system/domain/bo/SysUserPasswordBo.java similarity index 100% rename from stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/domain/bo/SysUserPasswordBo.java rename to stwzhj-modules/wzhj-system/src/main/java/org/dromara/system/domain/bo/SysUserPasswordBo.java diff --git a/stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/domain/bo/SysUserProfileBo.java b/stwzhj-modules/wzhj-system/src/main/java/org/dromara/system/domain/bo/SysUserProfileBo.java similarity index 100% rename from stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/domain/bo/SysUserProfileBo.java rename to stwzhj-modules/wzhj-system/src/main/java/org/dromara/system/domain/bo/SysUserProfileBo.java diff --git a/stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/domain/bo/TDeviceBo.java b/stwzhj-modules/wzhj-system/src/main/java/org/dromara/system/domain/bo/TDeviceBo.java similarity index 97% rename from stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/domain/bo/TDeviceBo.java rename to stwzhj-modules/wzhj-system/src/main/java/org/dromara/system/domain/bo/TDeviceBo.java index 2334e292..ee607b34 100644 --- a/stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/domain/bo/TDeviceBo.java +++ b/stwzhj-modules/wzhj-system/src/main/java/org/dromara/system/domain/bo/TDeviceBo.java @@ -95,5 +95,8 @@ public class TDeviceBo extends BaseEntity { private String[] zzjgdms; + private int pageNum; + + private int pageSize; } diff --git a/stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/domain/convert/SysClientVoConvert.java b/stwzhj-modules/wzhj-system/src/main/java/org/dromara/system/domain/convert/SysClientVoConvert.java similarity index 100% rename from stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/domain/convert/SysClientVoConvert.java rename to stwzhj-modules/wzhj-system/src/main/java/org/dromara/system/domain/convert/SysClientVoConvert.java diff --git a/stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/domain/convert/SysDictDataVoConvert.java b/stwzhj-modules/wzhj-system/src/main/java/org/dromara/system/domain/convert/SysDictDataVoConvert.java similarity index 100% rename from stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/domain/convert/SysDictDataVoConvert.java rename to stwzhj-modules/wzhj-system/src/main/java/org/dromara/system/domain/convert/SysDictDataVoConvert.java diff --git a/stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/domain/convert/SysLogininforBoConvert.java b/stwzhj-modules/wzhj-system/src/main/java/org/dromara/system/domain/convert/SysLogininforBoConvert.java similarity index 100% rename from stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/domain/convert/SysLogininforBoConvert.java rename to stwzhj-modules/wzhj-system/src/main/java/org/dromara/system/domain/convert/SysLogininforBoConvert.java diff --git a/stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/domain/convert/SysOperLogBoConvert.java b/stwzhj-modules/wzhj-system/src/main/java/org/dromara/system/domain/convert/SysOperLogBoConvert.java similarity index 100% rename from stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/domain/convert/SysOperLogBoConvert.java rename to stwzhj-modules/wzhj-system/src/main/java/org/dromara/system/domain/convert/SysOperLogBoConvert.java diff --git a/stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/domain/convert/SysSocialBoConvert.java b/stwzhj-modules/wzhj-system/src/main/java/org/dromara/system/domain/convert/SysSocialBoConvert.java similarity index 100% rename from stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/domain/convert/SysSocialBoConvert.java rename to stwzhj-modules/wzhj-system/src/main/java/org/dromara/system/domain/convert/SysSocialBoConvert.java diff --git a/stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/domain/convert/SysSocialVoConvert.java b/stwzhj-modules/wzhj-system/src/main/java/org/dromara/system/domain/convert/SysSocialVoConvert.java similarity index 100% rename from stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/domain/convert/SysSocialVoConvert.java rename to stwzhj-modules/wzhj-system/src/main/java/org/dromara/system/domain/convert/SysSocialVoConvert.java diff --git a/stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/domain/convert/SysTenantVoConvert.java b/stwzhj-modules/wzhj-system/src/main/java/org/dromara/system/domain/convert/SysTenantVoConvert.java similarity index 100% rename from stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/domain/convert/SysTenantVoConvert.java rename to stwzhj-modules/wzhj-system/src/main/java/org/dromara/system/domain/convert/SysTenantVoConvert.java diff --git a/stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/domain/convert/SysUserBoConvert.java b/stwzhj-modules/wzhj-system/src/main/java/org/dromara/system/domain/convert/SysUserBoConvert.java similarity index 100% rename from stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/domain/convert/SysUserBoConvert.java rename to stwzhj-modules/wzhj-system/src/main/java/org/dromara/system/domain/convert/SysUserBoConvert.java diff --git a/stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/domain/convert/SysUserVoConvert.java b/stwzhj-modules/wzhj-system/src/main/java/org/dromara/system/domain/convert/SysUserVoConvert.java similarity index 100% rename from stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/domain/convert/SysUserVoConvert.java rename to stwzhj-modules/wzhj-system/src/main/java/org/dromara/system/domain/convert/SysUserVoConvert.java diff --git a/stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/domain/vo/AvatarVo.java b/stwzhj-modules/wzhj-system/src/main/java/org/dromara/system/domain/vo/AvatarVo.java similarity index 100% rename from stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/domain/vo/AvatarVo.java rename to stwzhj-modules/wzhj-system/src/main/java/org/dromara/system/domain/vo/AvatarVo.java diff --git a/stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/domain/vo/CacheListInfoVo.java b/stwzhj-modules/wzhj-system/src/main/java/org/dromara/system/domain/vo/CacheListInfoVo.java similarity index 100% rename from stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/domain/vo/CacheListInfoVo.java rename to stwzhj-modules/wzhj-system/src/main/java/org/dromara/system/domain/vo/CacheListInfoVo.java diff --git a/stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/domain/vo/DeptTreeSelectVo.java b/stwzhj-modules/wzhj-system/src/main/java/org/dromara/system/domain/vo/DeptTreeSelectVo.java similarity index 100% rename from stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/domain/vo/DeptTreeSelectVo.java rename to stwzhj-modules/wzhj-system/src/main/java/org/dromara/system/domain/vo/DeptTreeSelectVo.java diff --git a/stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/domain/vo/DeviceRedisVo.java b/stwzhj-modules/wzhj-system/src/main/java/org/dromara/system/domain/vo/DeviceRedisVo.java similarity index 100% rename from stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/domain/vo/DeviceRedisVo.java rename to stwzhj-modules/wzhj-system/src/main/java/org/dromara/system/domain/vo/DeviceRedisVo.java diff --git a/stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/domain/vo/DeviceStaticsVo.java b/stwzhj-modules/wzhj-system/src/main/java/org/dromara/system/domain/vo/DeviceStaticsVo.java similarity index 100% rename from stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/domain/vo/DeviceStaticsVo.java rename to stwzhj-modules/wzhj-system/src/main/java/org/dromara/system/domain/vo/DeviceStaticsVo.java diff --git a/stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/domain/vo/MenuTreeSelectVo.java b/stwzhj-modules/wzhj-system/src/main/java/org/dromara/system/domain/vo/MenuTreeSelectVo.java similarity index 100% rename from stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/domain/vo/MenuTreeSelectVo.java rename to stwzhj-modules/wzhj-system/src/main/java/org/dromara/system/domain/vo/MenuTreeSelectVo.java diff --git a/stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/domain/vo/MetaVo.java b/stwzhj-modules/wzhj-system/src/main/java/org/dromara/system/domain/vo/MetaVo.java similarity index 100% rename from stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/domain/vo/MetaVo.java rename to stwzhj-modules/wzhj-system/src/main/java/org/dromara/system/domain/vo/MetaVo.java diff --git a/stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/domain/vo/ProfileVo.java b/stwzhj-modules/wzhj-system/src/main/java/org/dromara/system/domain/vo/ProfileVo.java similarity index 100% rename from stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/domain/vo/ProfileVo.java rename to stwzhj-modules/wzhj-system/src/main/java/org/dromara/system/domain/vo/ProfileVo.java diff --git a/stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/domain/vo/RouterVo.java b/stwzhj-modules/wzhj-system/src/main/java/org/dromara/system/domain/vo/RouterVo.java similarity index 100% rename from stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/domain/vo/RouterVo.java rename to stwzhj-modules/wzhj-system/src/main/java/org/dromara/system/domain/vo/RouterVo.java diff --git a/stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/domain/vo/SysClientVo.java b/stwzhj-modules/wzhj-system/src/main/java/org/dromara/system/domain/vo/SysClientVo.java similarity index 100% rename from stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/domain/vo/SysClientVo.java rename to stwzhj-modules/wzhj-system/src/main/java/org/dromara/system/domain/vo/SysClientVo.java diff --git a/stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/domain/vo/SysConfigVo.java b/stwzhj-modules/wzhj-system/src/main/java/org/dromara/system/domain/vo/SysConfigVo.java similarity index 100% rename from stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/domain/vo/SysConfigVo.java rename to stwzhj-modules/wzhj-system/src/main/java/org/dromara/system/domain/vo/SysConfigVo.java diff --git a/stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/domain/vo/SysDeptVo.java b/stwzhj-modules/wzhj-system/src/main/java/org/dromara/system/domain/vo/SysDeptVo.java similarity index 100% rename from stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/domain/vo/SysDeptVo.java rename to stwzhj-modules/wzhj-system/src/main/java/org/dromara/system/domain/vo/SysDeptVo.java diff --git a/stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/domain/vo/SysDictDataVo.java b/stwzhj-modules/wzhj-system/src/main/java/org/dromara/system/domain/vo/SysDictDataVo.java similarity index 100% rename from stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/domain/vo/SysDictDataVo.java rename to stwzhj-modules/wzhj-system/src/main/java/org/dromara/system/domain/vo/SysDictDataVo.java diff --git a/stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/domain/vo/SysDictTypeVo.java b/stwzhj-modules/wzhj-system/src/main/java/org/dromara/system/domain/vo/SysDictTypeVo.java similarity index 100% rename from stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/domain/vo/SysDictTypeVo.java rename to stwzhj-modules/wzhj-system/src/main/java/org/dromara/system/domain/vo/SysDictTypeVo.java diff --git a/stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/domain/vo/SysLogininforVo.java b/stwzhj-modules/wzhj-system/src/main/java/org/dromara/system/domain/vo/SysLogininforVo.java similarity index 100% rename from stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/domain/vo/SysLogininforVo.java rename to stwzhj-modules/wzhj-system/src/main/java/org/dromara/system/domain/vo/SysLogininforVo.java diff --git a/stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/domain/vo/SysMenuVo.java b/stwzhj-modules/wzhj-system/src/main/java/org/dromara/system/domain/vo/SysMenuVo.java similarity index 100% rename from stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/domain/vo/SysMenuVo.java rename to stwzhj-modules/wzhj-system/src/main/java/org/dromara/system/domain/vo/SysMenuVo.java diff --git a/stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/domain/vo/SysNoticeVo.java b/stwzhj-modules/wzhj-system/src/main/java/org/dromara/system/domain/vo/SysNoticeVo.java similarity index 100% rename from stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/domain/vo/SysNoticeVo.java rename to stwzhj-modules/wzhj-system/src/main/java/org/dromara/system/domain/vo/SysNoticeVo.java diff --git a/stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/domain/vo/SysOperLogVo.java b/stwzhj-modules/wzhj-system/src/main/java/org/dromara/system/domain/vo/SysOperLogVo.java similarity index 100% rename from stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/domain/vo/SysOperLogVo.java rename to stwzhj-modules/wzhj-system/src/main/java/org/dromara/system/domain/vo/SysOperLogVo.java diff --git a/stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/domain/vo/SysPostVo.java b/stwzhj-modules/wzhj-system/src/main/java/org/dromara/system/domain/vo/SysPostVo.java similarity index 100% rename from stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/domain/vo/SysPostVo.java rename to stwzhj-modules/wzhj-system/src/main/java/org/dromara/system/domain/vo/SysPostVo.java diff --git a/stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/domain/vo/SysRoleVo.java b/stwzhj-modules/wzhj-system/src/main/java/org/dromara/system/domain/vo/SysRoleVo.java similarity index 100% rename from stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/domain/vo/SysRoleVo.java rename to stwzhj-modules/wzhj-system/src/main/java/org/dromara/system/domain/vo/SysRoleVo.java diff --git a/stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/domain/vo/SysSocialVo.java b/stwzhj-modules/wzhj-system/src/main/java/org/dromara/system/domain/vo/SysSocialVo.java similarity index 100% rename from stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/domain/vo/SysSocialVo.java rename to stwzhj-modules/wzhj-system/src/main/java/org/dromara/system/domain/vo/SysSocialVo.java diff --git a/stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/domain/vo/SysTenantPackageVo.java b/stwzhj-modules/wzhj-system/src/main/java/org/dromara/system/domain/vo/SysTenantPackageVo.java similarity index 100% rename from stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/domain/vo/SysTenantPackageVo.java rename to stwzhj-modules/wzhj-system/src/main/java/org/dromara/system/domain/vo/SysTenantPackageVo.java diff --git a/stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/domain/vo/SysTenantVo.java b/stwzhj-modules/wzhj-system/src/main/java/org/dromara/system/domain/vo/SysTenantVo.java similarity index 100% rename from stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/domain/vo/SysTenantVo.java rename to stwzhj-modules/wzhj-system/src/main/java/org/dromara/system/domain/vo/SysTenantVo.java diff --git a/stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/domain/vo/SysUserExportVo.java b/stwzhj-modules/wzhj-system/src/main/java/org/dromara/system/domain/vo/SysUserExportVo.java similarity index 100% rename from stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/domain/vo/SysUserExportVo.java rename to stwzhj-modules/wzhj-system/src/main/java/org/dromara/system/domain/vo/SysUserExportVo.java diff --git a/stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/domain/vo/SysUserImportVo.java b/stwzhj-modules/wzhj-system/src/main/java/org/dromara/system/domain/vo/SysUserImportVo.java similarity index 100% rename from stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/domain/vo/SysUserImportVo.java rename to stwzhj-modules/wzhj-system/src/main/java/org/dromara/system/domain/vo/SysUserImportVo.java diff --git a/stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/domain/vo/SysUserInfoVo.java b/stwzhj-modules/wzhj-system/src/main/java/org/dromara/system/domain/vo/SysUserInfoVo.java similarity index 100% rename from stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/domain/vo/SysUserInfoVo.java rename to stwzhj-modules/wzhj-system/src/main/java/org/dromara/system/domain/vo/SysUserInfoVo.java diff --git a/stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/domain/vo/SysUserVo.java b/stwzhj-modules/wzhj-system/src/main/java/org/dromara/system/domain/vo/SysUserVo.java similarity index 100% rename from stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/domain/vo/SysUserVo.java rename to stwzhj-modules/wzhj-system/src/main/java/org/dromara/system/domain/vo/SysUserVo.java diff --git a/stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/domain/vo/TDeviceExportVo.java b/stwzhj-modules/wzhj-system/src/main/java/org/dromara/system/domain/vo/TDeviceExportVo.java similarity index 100% rename from stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/domain/vo/TDeviceExportVo.java rename to stwzhj-modules/wzhj-system/src/main/java/org/dromara/system/domain/vo/TDeviceExportVo.java diff --git a/stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/domain/vo/TDeviceImportVo.java b/stwzhj-modules/wzhj-system/src/main/java/org/dromara/system/domain/vo/TDeviceImportVo.java similarity index 100% rename from stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/domain/vo/TDeviceImportVo.java rename to stwzhj-modules/wzhj-system/src/main/java/org/dromara/system/domain/vo/TDeviceImportVo.java diff --git a/stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/domain/vo/TDeviceVo.java b/stwzhj-modules/wzhj-system/src/main/java/org/dromara/system/domain/vo/TDeviceVo.java similarity index 100% rename from stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/domain/vo/TDeviceVo.java rename to stwzhj-modules/wzhj-system/src/main/java/org/dromara/system/domain/vo/TDeviceVo.java diff --git a/stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/domain/vo/UserInfoVo.java b/stwzhj-modules/wzhj-system/src/main/java/org/dromara/system/domain/vo/UserInfoVo.java similarity index 100% rename from stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/domain/vo/UserInfoVo.java rename to stwzhj-modules/wzhj-system/src/main/java/org/dromara/system/domain/vo/UserInfoVo.java diff --git a/stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/dubbo/RemoteClientServiceImpl.java b/stwzhj-modules/wzhj-system/src/main/java/org/dromara/system/dubbo/RemoteClientServiceImpl.java similarity index 100% rename from stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/dubbo/RemoteClientServiceImpl.java rename to stwzhj-modules/wzhj-system/src/main/java/org/dromara/system/dubbo/RemoteClientServiceImpl.java diff --git a/stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/dubbo/RemoteConfigServiceImpl.java b/stwzhj-modules/wzhj-system/src/main/java/org/dromara/system/dubbo/RemoteConfigServiceImpl.java similarity index 100% rename from stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/dubbo/RemoteConfigServiceImpl.java rename to stwzhj-modules/wzhj-system/src/main/java/org/dromara/system/dubbo/RemoteConfigServiceImpl.java diff --git a/stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/dubbo/RemoteDataScopeServiceImpl.java b/stwzhj-modules/wzhj-system/src/main/java/org/dromara/system/dubbo/RemoteDataScopeServiceImpl.java similarity index 100% rename from stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/dubbo/RemoteDataScopeServiceImpl.java rename to stwzhj-modules/wzhj-system/src/main/java/org/dromara/system/dubbo/RemoteDataScopeServiceImpl.java diff --git a/stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/dubbo/RemoteDeptServiceImpl.java b/stwzhj-modules/wzhj-system/src/main/java/org/dromara/system/dubbo/RemoteDeptServiceImpl.java similarity index 100% rename from stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/dubbo/RemoteDeptServiceImpl.java rename to stwzhj-modules/wzhj-system/src/main/java/org/dromara/system/dubbo/RemoteDeptServiceImpl.java diff --git a/stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/dubbo/RemoteDeviceImpl.java b/stwzhj-modules/wzhj-system/src/main/java/org/dromara/system/dubbo/RemoteDeviceImpl.java similarity index 100% rename from stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/dubbo/RemoteDeviceImpl.java rename to stwzhj-modules/wzhj-system/src/main/java/org/dromara/system/dubbo/RemoteDeviceImpl.java diff --git a/stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/dubbo/RemoteDictServiceImpl.java b/stwzhj-modules/wzhj-system/src/main/java/org/dromara/system/dubbo/RemoteDictServiceImpl.java similarity index 100% rename from stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/dubbo/RemoteDictServiceImpl.java rename to stwzhj-modules/wzhj-system/src/main/java/org/dromara/system/dubbo/RemoteDictServiceImpl.java diff --git a/stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/dubbo/RemoteLogServiceImpl.java b/stwzhj-modules/wzhj-system/src/main/java/org/dromara/system/dubbo/RemoteLogServiceImpl.java similarity index 100% rename from stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/dubbo/RemoteLogServiceImpl.java rename to stwzhj-modules/wzhj-system/src/main/java/org/dromara/system/dubbo/RemoteLogServiceImpl.java diff --git a/stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/dubbo/RemoteSocialServiceImpl.java b/stwzhj-modules/wzhj-system/src/main/java/org/dromara/system/dubbo/RemoteSocialServiceImpl.java similarity index 100% rename from stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/dubbo/RemoteSocialServiceImpl.java rename to stwzhj-modules/wzhj-system/src/main/java/org/dromara/system/dubbo/RemoteSocialServiceImpl.java diff --git a/stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/dubbo/RemoteTenantServiceImpl.java b/stwzhj-modules/wzhj-system/src/main/java/org/dromara/system/dubbo/RemoteTenantServiceImpl.java similarity index 100% rename from stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/dubbo/RemoteTenantServiceImpl.java rename to stwzhj-modules/wzhj-system/src/main/java/org/dromara/system/dubbo/RemoteTenantServiceImpl.java diff --git a/stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/dubbo/RemoteUserServiceImpl.java b/stwzhj-modules/wzhj-system/src/main/java/org/dromara/system/dubbo/RemoteUserServiceImpl.java similarity index 100% rename from stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/dubbo/RemoteUserServiceImpl.java rename to stwzhj-modules/wzhj-system/src/main/java/org/dromara/system/dubbo/RemoteUserServiceImpl.java diff --git a/stwzhj-modules/wzhj-webscoket/src/main/java/org/dromara/webscoket/exception/MyBusinessException.java b/stwzhj-modules/wzhj-system/src/main/java/org/dromara/system/exception/MyBusinessException.java similarity index 96% rename from stwzhj-modules/wzhj-webscoket/src/main/java/org/dromara/webscoket/exception/MyBusinessException.java rename to stwzhj-modules/wzhj-system/src/main/java/org/dromara/system/exception/MyBusinessException.java index 010009bc..6a692bce 100644 --- a/stwzhj-modules/wzhj-webscoket/src/main/java/org/dromara/webscoket/exception/MyBusinessException.java +++ b/stwzhj-modules/wzhj-system/src/main/java/org/dromara/system/exception/MyBusinessException.java @@ -1,4 +1,4 @@ -package org.dromara.webscoket.exception; +package org.dromara.system.exception; /** *

description:

diff --git a/stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/listener/SysUserImportListener.java b/stwzhj-modules/wzhj-system/src/main/java/org/dromara/system/listener/SysUserImportListener.java similarity index 100% rename from stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/listener/SysUserImportListener.java rename to stwzhj-modules/wzhj-system/src/main/java/org/dromara/system/listener/SysUserImportListener.java diff --git a/stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/listener/TDeviceImportListener.java b/stwzhj-modules/wzhj-system/src/main/java/org/dromara/system/listener/TDeviceImportListener.java similarity index 100% rename from stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/listener/TDeviceImportListener.java rename to stwzhj-modules/wzhj-system/src/main/java/org/dromara/system/listener/TDeviceImportListener.java diff --git a/stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/mapper/DeviceRedisMapper.java b/stwzhj-modules/wzhj-system/src/main/java/org/dromara/system/mapper/DeviceRedisMapper.java similarity index 100% rename from stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/mapper/DeviceRedisMapper.java rename to stwzhj-modules/wzhj-system/src/main/java/org/dromara/system/mapper/DeviceRedisMapper.java diff --git a/stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/mapper/SysClientMapper.java b/stwzhj-modules/wzhj-system/src/main/java/org/dromara/system/mapper/SysClientMapper.java similarity index 100% rename from stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/mapper/SysClientMapper.java rename to stwzhj-modules/wzhj-system/src/main/java/org/dromara/system/mapper/SysClientMapper.java diff --git a/stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/mapper/SysConfigMapper.java b/stwzhj-modules/wzhj-system/src/main/java/org/dromara/system/mapper/SysConfigMapper.java similarity index 100% rename from stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/mapper/SysConfigMapper.java rename to stwzhj-modules/wzhj-system/src/main/java/org/dromara/system/mapper/SysConfigMapper.java diff --git a/stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/mapper/SysDeptMapper.java b/stwzhj-modules/wzhj-system/src/main/java/org/dromara/system/mapper/SysDeptMapper.java similarity index 100% rename from stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/mapper/SysDeptMapper.java rename to stwzhj-modules/wzhj-system/src/main/java/org/dromara/system/mapper/SysDeptMapper.java diff --git a/stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/mapper/SysDictDataMapper.java b/stwzhj-modules/wzhj-system/src/main/java/org/dromara/system/mapper/SysDictDataMapper.java similarity index 100% rename from stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/mapper/SysDictDataMapper.java rename to stwzhj-modules/wzhj-system/src/main/java/org/dromara/system/mapper/SysDictDataMapper.java diff --git a/stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/mapper/SysDictTypeMapper.java b/stwzhj-modules/wzhj-system/src/main/java/org/dromara/system/mapper/SysDictTypeMapper.java similarity index 100% rename from stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/mapper/SysDictTypeMapper.java rename to stwzhj-modules/wzhj-system/src/main/java/org/dromara/system/mapper/SysDictTypeMapper.java diff --git a/stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/mapper/SysLogininforMapper.java b/stwzhj-modules/wzhj-system/src/main/java/org/dromara/system/mapper/SysLogininforMapper.java similarity index 100% rename from stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/mapper/SysLogininforMapper.java rename to stwzhj-modules/wzhj-system/src/main/java/org/dromara/system/mapper/SysLogininforMapper.java diff --git a/stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/mapper/SysMenuMapper.java b/stwzhj-modules/wzhj-system/src/main/java/org/dromara/system/mapper/SysMenuMapper.java similarity index 100% rename from stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/mapper/SysMenuMapper.java rename to stwzhj-modules/wzhj-system/src/main/java/org/dromara/system/mapper/SysMenuMapper.java diff --git a/stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/mapper/SysNoticeMapper.java b/stwzhj-modules/wzhj-system/src/main/java/org/dromara/system/mapper/SysNoticeMapper.java similarity index 100% rename from stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/mapper/SysNoticeMapper.java rename to stwzhj-modules/wzhj-system/src/main/java/org/dromara/system/mapper/SysNoticeMapper.java diff --git a/stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/mapper/SysOperLogMapper.java b/stwzhj-modules/wzhj-system/src/main/java/org/dromara/system/mapper/SysOperLogMapper.java similarity index 100% rename from stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/mapper/SysOperLogMapper.java rename to stwzhj-modules/wzhj-system/src/main/java/org/dromara/system/mapper/SysOperLogMapper.java diff --git a/stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/mapper/SysPostMapper.java b/stwzhj-modules/wzhj-system/src/main/java/org/dromara/system/mapper/SysPostMapper.java similarity index 100% rename from stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/mapper/SysPostMapper.java rename to stwzhj-modules/wzhj-system/src/main/java/org/dromara/system/mapper/SysPostMapper.java diff --git a/stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/mapper/SysRoleDeptMapper.java b/stwzhj-modules/wzhj-system/src/main/java/org/dromara/system/mapper/SysRoleDeptMapper.java similarity index 100% rename from stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/mapper/SysRoleDeptMapper.java rename to stwzhj-modules/wzhj-system/src/main/java/org/dromara/system/mapper/SysRoleDeptMapper.java diff --git a/stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/mapper/SysRoleMapper.java b/stwzhj-modules/wzhj-system/src/main/java/org/dromara/system/mapper/SysRoleMapper.java similarity index 100% rename from stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/mapper/SysRoleMapper.java rename to stwzhj-modules/wzhj-system/src/main/java/org/dromara/system/mapper/SysRoleMapper.java diff --git a/stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/mapper/SysRoleMenuMapper.java b/stwzhj-modules/wzhj-system/src/main/java/org/dromara/system/mapper/SysRoleMenuMapper.java similarity index 100% rename from stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/mapper/SysRoleMenuMapper.java rename to stwzhj-modules/wzhj-system/src/main/java/org/dromara/system/mapper/SysRoleMenuMapper.java diff --git a/stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/mapper/SysSocialMapper.java b/stwzhj-modules/wzhj-system/src/main/java/org/dromara/system/mapper/SysSocialMapper.java similarity index 100% rename from stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/mapper/SysSocialMapper.java rename to stwzhj-modules/wzhj-system/src/main/java/org/dromara/system/mapper/SysSocialMapper.java diff --git a/stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/mapper/SysTenantMapper.java b/stwzhj-modules/wzhj-system/src/main/java/org/dromara/system/mapper/SysTenantMapper.java similarity index 100% rename from stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/mapper/SysTenantMapper.java rename to stwzhj-modules/wzhj-system/src/main/java/org/dromara/system/mapper/SysTenantMapper.java diff --git a/stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/mapper/SysTenantPackageMapper.java b/stwzhj-modules/wzhj-system/src/main/java/org/dromara/system/mapper/SysTenantPackageMapper.java similarity index 100% rename from stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/mapper/SysTenantPackageMapper.java rename to stwzhj-modules/wzhj-system/src/main/java/org/dromara/system/mapper/SysTenantPackageMapper.java diff --git a/stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/mapper/SysUserMapper.java b/stwzhj-modules/wzhj-system/src/main/java/org/dromara/system/mapper/SysUserMapper.java similarity index 100% rename from stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/mapper/SysUserMapper.java rename to stwzhj-modules/wzhj-system/src/main/java/org/dromara/system/mapper/SysUserMapper.java diff --git a/stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/mapper/SysUserPostMapper.java b/stwzhj-modules/wzhj-system/src/main/java/org/dromara/system/mapper/SysUserPostMapper.java similarity index 100% rename from stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/mapper/SysUserPostMapper.java rename to stwzhj-modules/wzhj-system/src/main/java/org/dromara/system/mapper/SysUserPostMapper.java diff --git a/stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/mapper/SysUserRoleMapper.java b/stwzhj-modules/wzhj-system/src/main/java/org/dromara/system/mapper/SysUserRoleMapper.java similarity index 100% rename from stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/mapper/SysUserRoleMapper.java rename to stwzhj-modules/wzhj-system/src/main/java/org/dromara/system/mapper/SysUserRoleMapper.java diff --git a/stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/mapper/TDeviceMapper.java b/stwzhj-modules/wzhj-system/src/main/java/org/dromara/system/mapper/TDeviceMapper.java similarity index 100% rename from stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/mapper/TDeviceMapper.java rename to stwzhj-modules/wzhj-system/src/main/java/org/dromara/system/mapper/TDeviceMapper.java diff --git a/stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/schedule/DeviceRedisSchedule.java b/stwzhj-modules/wzhj-system/src/main/java/org/dromara/system/schedule/DeviceRedisSchedule.java similarity index 100% rename from stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/schedule/DeviceRedisSchedule.java rename to stwzhj-modules/wzhj-system/src/main/java/org/dromara/system/schedule/DeviceRedisSchedule.java diff --git a/stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/service/IDeviceRedisService.java b/stwzhj-modules/wzhj-system/src/main/java/org/dromara/system/service/IDeviceRedisService.java similarity index 100% rename from stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/service/IDeviceRedisService.java rename to stwzhj-modules/wzhj-system/src/main/java/org/dromara/system/service/IDeviceRedisService.java diff --git a/stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/service/ISysClientService.java b/stwzhj-modules/wzhj-system/src/main/java/org/dromara/system/service/ISysClientService.java similarity index 100% rename from stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/service/ISysClientService.java rename to stwzhj-modules/wzhj-system/src/main/java/org/dromara/system/service/ISysClientService.java diff --git a/stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/service/ISysConfigService.java b/stwzhj-modules/wzhj-system/src/main/java/org/dromara/system/service/ISysConfigService.java similarity index 100% rename from stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/service/ISysConfigService.java rename to stwzhj-modules/wzhj-system/src/main/java/org/dromara/system/service/ISysConfigService.java diff --git a/stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/service/ISysDeptService.java b/stwzhj-modules/wzhj-system/src/main/java/org/dromara/system/service/ISysDeptService.java similarity index 100% rename from stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/service/ISysDeptService.java rename to stwzhj-modules/wzhj-system/src/main/java/org/dromara/system/service/ISysDeptService.java diff --git a/stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/service/ISysDictDataService.java b/stwzhj-modules/wzhj-system/src/main/java/org/dromara/system/service/ISysDictDataService.java similarity index 100% rename from stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/service/ISysDictDataService.java rename to stwzhj-modules/wzhj-system/src/main/java/org/dromara/system/service/ISysDictDataService.java diff --git a/stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/service/ISysDictTypeService.java b/stwzhj-modules/wzhj-system/src/main/java/org/dromara/system/service/ISysDictTypeService.java similarity index 100% rename from stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/service/ISysDictTypeService.java rename to stwzhj-modules/wzhj-system/src/main/java/org/dromara/system/service/ISysDictTypeService.java diff --git a/stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/service/ISysLogininforService.java b/stwzhj-modules/wzhj-system/src/main/java/org/dromara/system/service/ISysLogininforService.java similarity index 100% rename from stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/service/ISysLogininforService.java rename to stwzhj-modules/wzhj-system/src/main/java/org/dromara/system/service/ISysLogininforService.java diff --git a/stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/service/ISysMenuService.java b/stwzhj-modules/wzhj-system/src/main/java/org/dromara/system/service/ISysMenuService.java similarity index 100% rename from stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/service/ISysMenuService.java rename to stwzhj-modules/wzhj-system/src/main/java/org/dromara/system/service/ISysMenuService.java diff --git a/stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/service/ISysNoticeService.java b/stwzhj-modules/wzhj-system/src/main/java/org/dromara/system/service/ISysNoticeService.java similarity index 100% rename from stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/service/ISysNoticeService.java rename to stwzhj-modules/wzhj-system/src/main/java/org/dromara/system/service/ISysNoticeService.java diff --git a/stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/service/ISysOperLogService.java b/stwzhj-modules/wzhj-system/src/main/java/org/dromara/system/service/ISysOperLogService.java similarity index 100% rename from stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/service/ISysOperLogService.java rename to stwzhj-modules/wzhj-system/src/main/java/org/dromara/system/service/ISysOperLogService.java diff --git a/stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/service/ISysPermissionService.java b/stwzhj-modules/wzhj-system/src/main/java/org/dromara/system/service/ISysPermissionService.java similarity index 100% rename from stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/service/ISysPermissionService.java rename to stwzhj-modules/wzhj-system/src/main/java/org/dromara/system/service/ISysPermissionService.java diff --git a/stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/service/ISysPostService.java b/stwzhj-modules/wzhj-system/src/main/java/org/dromara/system/service/ISysPostService.java similarity index 100% rename from stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/service/ISysPostService.java rename to stwzhj-modules/wzhj-system/src/main/java/org/dromara/system/service/ISysPostService.java diff --git a/stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/service/ISysRoleService.java b/stwzhj-modules/wzhj-system/src/main/java/org/dromara/system/service/ISysRoleService.java similarity index 100% rename from stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/service/ISysRoleService.java rename to stwzhj-modules/wzhj-system/src/main/java/org/dromara/system/service/ISysRoleService.java diff --git a/stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/service/ISysSocialService.java b/stwzhj-modules/wzhj-system/src/main/java/org/dromara/system/service/ISysSocialService.java similarity index 100% rename from stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/service/ISysSocialService.java rename to stwzhj-modules/wzhj-system/src/main/java/org/dromara/system/service/ISysSocialService.java diff --git a/stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/service/ISysTenantPackageService.java b/stwzhj-modules/wzhj-system/src/main/java/org/dromara/system/service/ISysTenantPackageService.java similarity index 100% rename from stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/service/ISysTenantPackageService.java rename to stwzhj-modules/wzhj-system/src/main/java/org/dromara/system/service/ISysTenantPackageService.java diff --git a/stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/service/ISysTenantService.java b/stwzhj-modules/wzhj-system/src/main/java/org/dromara/system/service/ISysTenantService.java similarity index 100% rename from stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/service/ISysTenantService.java rename to stwzhj-modules/wzhj-system/src/main/java/org/dromara/system/service/ISysTenantService.java diff --git a/stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/service/ISysUserService.java b/stwzhj-modules/wzhj-system/src/main/java/org/dromara/system/service/ISysUserService.java similarity index 100% rename from stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/service/ISysUserService.java rename to stwzhj-modules/wzhj-system/src/main/java/org/dromara/system/service/ISysUserService.java diff --git a/stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/service/ITDeviceService.java b/stwzhj-modules/wzhj-system/src/main/java/org/dromara/system/service/ITDeviceService.java similarity index 100% rename from stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/service/ITDeviceService.java rename to stwzhj-modules/wzhj-system/src/main/java/org/dromara/system/service/ITDeviceService.java diff --git a/stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/service/impl/DeviceRedisServiceImpl.java b/stwzhj-modules/wzhj-system/src/main/java/org/dromara/system/service/impl/DeviceRedisServiceImpl.java similarity index 100% rename from stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/service/impl/DeviceRedisServiceImpl.java rename to stwzhj-modules/wzhj-system/src/main/java/org/dromara/system/service/impl/DeviceRedisServiceImpl.java diff --git a/stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/service/impl/SysClientServiceImpl.java b/stwzhj-modules/wzhj-system/src/main/java/org/dromara/system/service/impl/SysClientServiceImpl.java similarity index 100% rename from stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/service/impl/SysClientServiceImpl.java rename to stwzhj-modules/wzhj-system/src/main/java/org/dromara/system/service/impl/SysClientServiceImpl.java diff --git a/stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/service/impl/SysConfigServiceImpl.java b/stwzhj-modules/wzhj-system/src/main/java/org/dromara/system/service/impl/SysConfigServiceImpl.java similarity index 100% rename from stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/service/impl/SysConfigServiceImpl.java rename to stwzhj-modules/wzhj-system/src/main/java/org/dromara/system/service/impl/SysConfigServiceImpl.java diff --git a/stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/service/impl/SysDeptServiceImpl.java b/stwzhj-modules/wzhj-system/src/main/java/org/dromara/system/service/impl/SysDeptServiceImpl.java similarity index 100% rename from stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/service/impl/SysDeptServiceImpl.java rename to stwzhj-modules/wzhj-system/src/main/java/org/dromara/system/service/impl/SysDeptServiceImpl.java diff --git a/stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/service/impl/SysDictDataServiceImpl.java b/stwzhj-modules/wzhj-system/src/main/java/org/dromara/system/service/impl/SysDictDataServiceImpl.java similarity index 100% rename from stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/service/impl/SysDictDataServiceImpl.java rename to stwzhj-modules/wzhj-system/src/main/java/org/dromara/system/service/impl/SysDictDataServiceImpl.java diff --git a/stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/service/impl/SysDictTypeServiceImpl.java b/stwzhj-modules/wzhj-system/src/main/java/org/dromara/system/service/impl/SysDictTypeServiceImpl.java similarity index 100% rename from stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/service/impl/SysDictTypeServiceImpl.java rename to stwzhj-modules/wzhj-system/src/main/java/org/dromara/system/service/impl/SysDictTypeServiceImpl.java diff --git a/stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/service/impl/SysLogininforServiceImpl.java b/stwzhj-modules/wzhj-system/src/main/java/org/dromara/system/service/impl/SysLogininforServiceImpl.java similarity index 100% rename from stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/service/impl/SysLogininforServiceImpl.java rename to stwzhj-modules/wzhj-system/src/main/java/org/dromara/system/service/impl/SysLogininforServiceImpl.java diff --git a/stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/service/impl/SysMenuServiceImpl.java b/stwzhj-modules/wzhj-system/src/main/java/org/dromara/system/service/impl/SysMenuServiceImpl.java similarity index 100% rename from stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/service/impl/SysMenuServiceImpl.java rename to stwzhj-modules/wzhj-system/src/main/java/org/dromara/system/service/impl/SysMenuServiceImpl.java diff --git a/stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/service/impl/SysNoticeServiceImpl.java b/stwzhj-modules/wzhj-system/src/main/java/org/dromara/system/service/impl/SysNoticeServiceImpl.java similarity index 100% rename from stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/service/impl/SysNoticeServiceImpl.java rename to stwzhj-modules/wzhj-system/src/main/java/org/dromara/system/service/impl/SysNoticeServiceImpl.java diff --git a/stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/service/impl/SysOperLogServiceImpl.java b/stwzhj-modules/wzhj-system/src/main/java/org/dromara/system/service/impl/SysOperLogServiceImpl.java similarity index 100% rename from stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/service/impl/SysOperLogServiceImpl.java rename to stwzhj-modules/wzhj-system/src/main/java/org/dromara/system/service/impl/SysOperLogServiceImpl.java diff --git a/stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/service/impl/SysPermissionServiceImpl.java b/stwzhj-modules/wzhj-system/src/main/java/org/dromara/system/service/impl/SysPermissionServiceImpl.java similarity index 100% rename from stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/service/impl/SysPermissionServiceImpl.java rename to stwzhj-modules/wzhj-system/src/main/java/org/dromara/system/service/impl/SysPermissionServiceImpl.java diff --git a/stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/service/impl/SysPostServiceImpl.java b/stwzhj-modules/wzhj-system/src/main/java/org/dromara/system/service/impl/SysPostServiceImpl.java similarity index 100% rename from stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/service/impl/SysPostServiceImpl.java rename to stwzhj-modules/wzhj-system/src/main/java/org/dromara/system/service/impl/SysPostServiceImpl.java diff --git a/stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/service/impl/SysRoleServiceImpl.java b/stwzhj-modules/wzhj-system/src/main/java/org/dromara/system/service/impl/SysRoleServiceImpl.java similarity index 100% rename from stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/service/impl/SysRoleServiceImpl.java rename to stwzhj-modules/wzhj-system/src/main/java/org/dromara/system/service/impl/SysRoleServiceImpl.java diff --git a/stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/service/impl/SysSensitiveServiceImpl.java b/stwzhj-modules/wzhj-system/src/main/java/org/dromara/system/service/impl/SysSensitiveServiceImpl.java similarity index 100% rename from stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/service/impl/SysSensitiveServiceImpl.java rename to stwzhj-modules/wzhj-system/src/main/java/org/dromara/system/service/impl/SysSensitiveServiceImpl.java diff --git a/stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/service/impl/SysSocialServiceImpl.java b/stwzhj-modules/wzhj-system/src/main/java/org/dromara/system/service/impl/SysSocialServiceImpl.java similarity index 100% rename from stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/service/impl/SysSocialServiceImpl.java rename to stwzhj-modules/wzhj-system/src/main/java/org/dromara/system/service/impl/SysSocialServiceImpl.java diff --git a/stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/service/impl/SysTenantPackageServiceImpl.java b/stwzhj-modules/wzhj-system/src/main/java/org/dromara/system/service/impl/SysTenantPackageServiceImpl.java similarity index 100% rename from stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/service/impl/SysTenantPackageServiceImpl.java rename to stwzhj-modules/wzhj-system/src/main/java/org/dromara/system/service/impl/SysTenantPackageServiceImpl.java diff --git a/stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/service/impl/SysTenantServiceImpl.java b/stwzhj-modules/wzhj-system/src/main/java/org/dromara/system/service/impl/SysTenantServiceImpl.java similarity index 100% rename from stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/service/impl/SysTenantServiceImpl.java rename to stwzhj-modules/wzhj-system/src/main/java/org/dromara/system/service/impl/SysTenantServiceImpl.java diff --git a/stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/service/impl/SysUserServiceImpl.java b/stwzhj-modules/wzhj-system/src/main/java/org/dromara/system/service/impl/SysUserServiceImpl.java similarity index 100% rename from stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/service/impl/SysUserServiceImpl.java rename to stwzhj-modules/wzhj-system/src/main/java/org/dromara/system/service/impl/SysUserServiceImpl.java diff --git a/stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/service/impl/TDeviceServiceImpl.java b/stwzhj-modules/wzhj-system/src/main/java/org/dromara/system/service/impl/TDeviceServiceImpl.java similarity index 100% rename from stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/service/impl/TDeviceServiceImpl.java rename to stwzhj-modules/wzhj-system/src/main/java/org/dromara/system/service/impl/TDeviceServiceImpl.java diff --git a/stwzhj-modules/stwzhj-system/src/main/resources/application.yml b/stwzhj-modules/wzhj-system/src/main/resources/application.yml similarity index 100% rename from stwzhj-modules/stwzhj-system/src/main/resources/application.yml rename to stwzhj-modules/wzhj-system/src/main/resources/application.yml diff --git a/stwzhj-modules/stwzhj-system/src/main/resources/banner.txt b/stwzhj-modules/wzhj-system/src/main/resources/banner.txt similarity index 100% rename from stwzhj-modules/stwzhj-system/src/main/resources/banner.txt rename to stwzhj-modules/wzhj-system/src/main/resources/banner.txt diff --git a/stwzhj-modules/stwzhj-system/src/main/resources/logback-plus.xml b/stwzhj-modules/wzhj-system/src/main/resources/logback-plus.xml similarity index 100% rename from stwzhj-modules/stwzhj-system/src/main/resources/logback-plus.xml rename to stwzhj-modules/wzhj-system/src/main/resources/logback-plus.xml diff --git a/stwzhj-modules/stwzhj-system/src/main/resources/mapper/package-info.md b/stwzhj-modules/wzhj-system/src/main/resources/mapper/package-info.md similarity index 100% rename from stwzhj-modules/stwzhj-system/src/main/resources/mapper/package-info.md rename to stwzhj-modules/wzhj-system/src/main/resources/mapper/package-info.md diff --git a/stwzhj-modules/stwzhj-system/src/main/resources/mapper/system/DeviceRedisMapper.xml b/stwzhj-modules/wzhj-system/src/main/resources/mapper/system/DeviceRedisMapper.xml similarity index 100% rename from stwzhj-modules/stwzhj-system/src/main/resources/mapper/system/DeviceRedisMapper.xml rename to stwzhj-modules/wzhj-system/src/main/resources/mapper/system/DeviceRedisMapper.xml diff --git a/stwzhj-modules/stwzhj-system/src/main/resources/mapper/system/SysClientMapper.xml b/stwzhj-modules/wzhj-system/src/main/resources/mapper/system/SysClientMapper.xml similarity index 100% rename from stwzhj-modules/stwzhj-system/src/main/resources/mapper/system/SysClientMapper.xml rename to stwzhj-modules/wzhj-system/src/main/resources/mapper/system/SysClientMapper.xml diff --git a/stwzhj-modules/stwzhj-system/src/main/resources/mapper/system/SysConfigMapper.xml b/stwzhj-modules/wzhj-system/src/main/resources/mapper/system/SysConfigMapper.xml similarity index 100% rename from stwzhj-modules/stwzhj-system/src/main/resources/mapper/system/SysConfigMapper.xml rename to stwzhj-modules/wzhj-system/src/main/resources/mapper/system/SysConfigMapper.xml diff --git a/stwzhj-modules/stwzhj-system/src/main/resources/mapper/system/SysDeptMapper.xml b/stwzhj-modules/wzhj-system/src/main/resources/mapper/system/SysDeptMapper.xml similarity index 100% rename from stwzhj-modules/stwzhj-system/src/main/resources/mapper/system/SysDeptMapper.xml rename to stwzhj-modules/wzhj-system/src/main/resources/mapper/system/SysDeptMapper.xml diff --git a/stwzhj-modules/stwzhj-system/src/main/resources/mapper/system/SysDictDataMapper.xml b/stwzhj-modules/wzhj-system/src/main/resources/mapper/system/SysDictDataMapper.xml similarity index 100% rename from stwzhj-modules/stwzhj-system/src/main/resources/mapper/system/SysDictDataMapper.xml rename to stwzhj-modules/wzhj-system/src/main/resources/mapper/system/SysDictDataMapper.xml diff --git a/stwzhj-modules/stwzhj-system/src/main/resources/mapper/system/SysDictTypeMapper.xml b/stwzhj-modules/wzhj-system/src/main/resources/mapper/system/SysDictTypeMapper.xml similarity index 100% rename from stwzhj-modules/stwzhj-system/src/main/resources/mapper/system/SysDictTypeMapper.xml rename to stwzhj-modules/wzhj-system/src/main/resources/mapper/system/SysDictTypeMapper.xml diff --git a/stwzhj-modules/stwzhj-system/src/main/resources/mapper/system/SysLogininforMapper.xml b/stwzhj-modules/wzhj-system/src/main/resources/mapper/system/SysLogininforMapper.xml similarity index 100% rename from stwzhj-modules/stwzhj-system/src/main/resources/mapper/system/SysLogininforMapper.xml rename to stwzhj-modules/wzhj-system/src/main/resources/mapper/system/SysLogininforMapper.xml diff --git a/stwzhj-modules/stwzhj-system/src/main/resources/mapper/system/SysMenuMapper.xml b/stwzhj-modules/wzhj-system/src/main/resources/mapper/system/SysMenuMapper.xml similarity index 100% rename from stwzhj-modules/stwzhj-system/src/main/resources/mapper/system/SysMenuMapper.xml rename to stwzhj-modules/wzhj-system/src/main/resources/mapper/system/SysMenuMapper.xml diff --git a/stwzhj-modules/stwzhj-system/src/main/resources/mapper/system/SysNoticeMapper.xml b/stwzhj-modules/wzhj-system/src/main/resources/mapper/system/SysNoticeMapper.xml similarity index 100% rename from stwzhj-modules/stwzhj-system/src/main/resources/mapper/system/SysNoticeMapper.xml rename to stwzhj-modules/wzhj-system/src/main/resources/mapper/system/SysNoticeMapper.xml diff --git a/stwzhj-modules/stwzhj-system/src/main/resources/mapper/system/SysOperLogMapper.xml b/stwzhj-modules/wzhj-system/src/main/resources/mapper/system/SysOperLogMapper.xml similarity index 100% rename from stwzhj-modules/stwzhj-system/src/main/resources/mapper/system/SysOperLogMapper.xml rename to stwzhj-modules/wzhj-system/src/main/resources/mapper/system/SysOperLogMapper.xml diff --git a/stwzhj-modules/stwzhj-system/src/main/resources/mapper/system/SysPostMapper.xml b/stwzhj-modules/wzhj-system/src/main/resources/mapper/system/SysPostMapper.xml similarity index 100% rename from stwzhj-modules/stwzhj-system/src/main/resources/mapper/system/SysPostMapper.xml rename to stwzhj-modules/wzhj-system/src/main/resources/mapper/system/SysPostMapper.xml diff --git a/stwzhj-modules/stwzhj-system/src/main/resources/mapper/system/SysRoleDeptMapper.xml b/stwzhj-modules/wzhj-system/src/main/resources/mapper/system/SysRoleDeptMapper.xml similarity index 100% rename from stwzhj-modules/stwzhj-system/src/main/resources/mapper/system/SysRoleDeptMapper.xml rename to stwzhj-modules/wzhj-system/src/main/resources/mapper/system/SysRoleDeptMapper.xml diff --git a/stwzhj-modules/stwzhj-system/src/main/resources/mapper/system/SysRoleMapper.xml b/stwzhj-modules/wzhj-system/src/main/resources/mapper/system/SysRoleMapper.xml similarity index 100% rename from stwzhj-modules/stwzhj-system/src/main/resources/mapper/system/SysRoleMapper.xml rename to stwzhj-modules/wzhj-system/src/main/resources/mapper/system/SysRoleMapper.xml diff --git a/stwzhj-modules/stwzhj-system/src/main/resources/mapper/system/SysRoleMenuMapper.xml b/stwzhj-modules/wzhj-system/src/main/resources/mapper/system/SysRoleMenuMapper.xml similarity index 100% rename from stwzhj-modules/stwzhj-system/src/main/resources/mapper/system/SysRoleMenuMapper.xml rename to stwzhj-modules/wzhj-system/src/main/resources/mapper/system/SysRoleMenuMapper.xml diff --git a/stwzhj-modules/stwzhj-system/src/main/resources/mapper/system/SysSocialMapper.xml b/stwzhj-modules/wzhj-system/src/main/resources/mapper/system/SysSocialMapper.xml similarity index 100% rename from stwzhj-modules/stwzhj-system/src/main/resources/mapper/system/SysSocialMapper.xml rename to stwzhj-modules/wzhj-system/src/main/resources/mapper/system/SysSocialMapper.xml diff --git a/stwzhj-modules/stwzhj-system/src/main/resources/mapper/system/SysTenantMapper.xml b/stwzhj-modules/wzhj-system/src/main/resources/mapper/system/SysTenantMapper.xml similarity index 100% rename from stwzhj-modules/stwzhj-system/src/main/resources/mapper/system/SysTenantMapper.xml rename to stwzhj-modules/wzhj-system/src/main/resources/mapper/system/SysTenantMapper.xml diff --git a/stwzhj-modules/stwzhj-system/src/main/resources/mapper/system/SysTenantPackageMapper.xml b/stwzhj-modules/wzhj-system/src/main/resources/mapper/system/SysTenantPackageMapper.xml similarity index 100% rename from stwzhj-modules/stwzhj-system/src/main/resources/mapper/system/SysTenantPackageMapper.xml rename to stwzhj-modules/wzhj-system/src/main/resources/mapper/system/SysTenantPackageMapper.xml diff --git a/stwzhj-modules/stwzhj-system/src/main/resources/mapper/system/SysUserMapper.xml b/stwzhj-modules/wzhj-system/src/main/resources/mapper/system/SysUserMapper.xml similarity index 100% rename from stwzhj-modules/stwzhj-system/src/main/resources/mapper/system/SysUserMapper.xml rename to stwzhj-modules/wzhj-system/src/main/resources/mapper/system/SysUserMapper.xml diff --git a/stwzhj-modules/stwzhj-system/src/main/resources/mapper/system/SysUserPostMapper.xml b/stwzhj-modules/wzhj-system/src/main/resources/mapper/system/SysUserPostMapper.xml similarity index 100% rename from stwzhj-modules/stwzhj-system/src/main/resources/mapper/system/SysUserPostMapper.xml rename to stwzhj-modules/wzhj-system/src/main/resources/mapper/system/SysUserPostMapper.xml diff --git a/stwzhj-modules/stwzhj-system/src/main/resources/mapper/system/SysUserRoleMapper.xml b/stwzhj-modules/wzhj-system/src/main/resources/mapper/system/SysUserRoleMapper.xml similarity index 100% rename from stwzhj-modules/stwzhj-system/src/main/resources/mapper/system/SysUserRoleMapper.xml rename to stwzhj-modules/wzhj-system/src/main/resources/mapper/system/SysUserRoleMapper.xml diff --git a/stwzhj-modules/stwzhj-system/src/main/resources/mapper/system/TDeviceMapper.xml b/stwzhj-modules/wzhj-system/src/main/resources/mapper/system/TDeviceMapper.xml similarity index 100% rename from stwzhj-modules/stwzhj-system/src/main/resources/mapper/system/TDeviceMapper.xml rename to stwzhj-modules/wzhj-system/src/main/resources/mapper/system/TDeviceMapper.xml