From 016cca95f0669d46e376003e5632e206db4f7e56 Mon Sep 17 00:00:00 2001 From: qiaoqinzheng Date: Mon, 31 Jul 2023 17:11:52 +0800 Subject: [PATCH] =?UTF-8?q?=E7=B3=BB=E7=BB=9F=E7=B1=BB=E4=B8=8B=E5=AE=9E?= =?UTF-8?q?=E4=BD=93=E7=B1=BB=E7=A7=BB=E5=8A=A8=E5=88=B0base-core=E4=B8=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../entity/configuration}/GardsDetectors.java | 2 +- .../configuration}/GardsNuclearfacility.java | 2 +- .../entity/configuration}/GardsStations.java | 2 +- .../base/entity/postgre}/SysAnnouncement.java | 2 +- .../entity/postgre}/SysAnnouncementSend.java | 2 +- .../base/entity/postgre}/SysCategory.java | 2 +- .../base/entity/postgre}/SysCheckRule.java | 2 +- .../base/entity/postgre}/SysComment.java | 2 +- .../base/entity/postgre}/SysDataLog.java | 2 +- .../base/entity/postgre}/SysDataSource.java | 2 +- .../base/entity/postgre}/SysDepart.java | 2 +- .../entity/postgre}/SysDepartPermission.java | 2 +- .../base/entity/postgre}/SysDepartRole.java | 2 +- .../postgre}/SysDepartRolePermission.java | 2 +- .../entity/postgre}/SysDepartRoleUser.java | 2 +- .../modules/base/entity/postgre}/SysDict.java | 2 +- .../base/entity/postgre}/SysDictItem.java | 2 +- .../base/entity/postgre}/SysFiles.java | 2 +- .../base/entity/postgre}/SysFillRule.java | 2 +- .../base/entity/postgre}/SysFormFile.java | 2 +- .../base/entity/postgre}/SysGatewayRoute.java | 2 +- .../modules/base/entity/postgre}/SysLog.java | 2 +- .../entity/postgre}/SysPackPermission.java | 2 +- .../base/entity/postgre}/SysPermission.java | 2 +- .../postgre}/SysPermissionDataRule.java | 2 +- .../base/entity/postgre}/SysPosition.java | 2 +- .../base/entity/postgre}/SysRoleIndex.java | 2 +- .../entity/postgre}/SysRolePermission.java | 2 +- .../modules/base/entity/postgre}/SysTask.java | 2 +- .../base/entity/postgre}/SysTaskStation.java | 2 +- .../base/entity/postgre}/SysTenant.java | 2 +- .../base/entity/postgre}/SysTenantPack.java | 2 +- .../entity/postgre}/SysTenantPackUser.java | 2 +- .../base/entity/postgre}/SysThirdAccount.java | 2 +- .../base/entity/postgre}/SysUserAgent.java | 2 +- .../base/entity/postgre}/SysUserDepart.java | 2 +- .../base/entity/postgre}/SysUserRole.java | 2 +- .../base/entity/postgre}/SysUserTenant.java | 2 +- .../modules/aop/TenantPackUserLogAspect.java | 4 +- .../cas/controller/CasClientController.java | 4 +- .../feignclient/AbnormalAlarmClient.java | 4 +- .../jeecg/modules/message/SendMessage.java | 2 +- .../handle/impl/EmailPushMsgHandle.java | 5 +- .../handle/impl/EmailSendMsgHandle.java | 2 +- .../handle/impl/SystemSendMsgHandle.java | 11 +- .../service/impl/NgAlainServiceImpl.java | 3 +- .../jeecg/modules/quartz/job/SysInfoJob.java | 4 +- .../jeecg/modules/redisStream/ConsumeA1.java | 3 +- .../controller/GardsDetectorsController.java | 6 +- .../GardsNuclearfacilityController.java | 2 +- .../controller/GardsSampleDataController.java | 2 +- .../controller/GardsStationsController.java | 2 +- .../system/controller/LoginController.java | 8 +- .../controller/SysAnnouncementController.java | 5 +- .../SysAnnouncementSendController.java | 2 +- .../controller/SysCategoryController.java | 2 +- .../controller/SysCheckRuleController.java | 2 +- .../controller/SysCommentController.java | 2 +- .../controller/SysDataLogController.java | 2 +- .../controller/SysDataSourceController.java | 8 +- .../controller/SysDepartController.java | 5 +- .../SysDepartPermissionController.java | 10 +- .../controller/SysDepartRoleController.java | 10 +- .../system/controller/SysDictController.java | 7 +- .../controller/SysDictItemController.java | 7 +- .../system/controller/SysFilesController.java | 2 +- .../controller/SysFillRuleController.java | 2 +- .../controller/SysFormFileController.java | 2 +- .../controller/SysGatewayRouteController.java | 4 +- .../system/controller/SysLogController.java | 5 +- .../controller/SysPermissionController.java | 9 +- .../controller/SysPositionController.java | 3 +- .../system/controller/SysRoleController.java | 17 +- .../controller/SysRoleIndexController.java | 4 +- .../system/controller/SysTaskController.java | 14 +- .../controller/SysTenantController.java | 3 +- .../controller/SysUserAgentController.java | 7 +- .../system/controller/SysUserController.java | 8 +- .../controller/ThirdLoginController.java | 6 +- .../jeecg/modules/system/entity/SysRole.java | 83 ------- .../jeecg/modules/system/entity/SysUser.java | 211 ------------------ .../modules/system/entity/vo/SysTaskVo.java | 2 +- .../system/mapper/GardsDetectorsMapper.java | 2 +- .../mapper/GardsNuclearfacilityMapper.java | 2 +- .../system/mapper/GardsSampleDataMapper.java | 2 +- .../system/mapper/GardsStationsMapper.java | 2 +- .../system/mapper/SysAnnouncementMapper.java | 2 +- .../mapper/SysAnnouncementSendMapper.java | 2 +- .../system/mapper/SysCategoryMapper.java | 2 +- .../system/mapper/SysCheckRuleMapper.java | 2 +- .../system/mapper/SysCommentMapper.java | 2 +- .../system/mapper/SysDataLogMapper.java | 2 +- .../system/mapper/SysDataSourceMapper.java | 2 +- .../system/mapper/SysDepartMapper.java | 4 +- .../mapper/SysDepartPermissionMapper.java | 5 +- .../system/mapper/SysDepartRoleMapper.java | 2 +- .../mapper/SysDepartRolePermissionMapper.java | 5 +- .../mapper/SysDepartRoleUserMapper.java | 5 +- .../system/mapper/SysDictItemMapper.java | 2 +- .../modules/system/mapper/SysDictMapper.java | 2 +- .../modules/system/mapper/SysFilesMapper.java | 2 +- .../system/mapper/SysFillRuleMapper.java | 2 +- .../system/mapper/SysFormFileMapper.java | 2 +- .../system/mapper/SysGatewayRouteMapper.java | 2 +- .../modules/system/mapper/SysLogMapper.java | 2 +- .../mapper/SysPackPermissionMapper.java | 2 +- .../mapper/SysPermissionDataRuleMapper.java | 2 +- .../system/mapper/SysPermissionMapper.java | 2 +- .../system/mapper/SysPositionMapper.java | 2 +- .../system/mapper/SysRoleIndexMapper.java | 5 +- .../modules/system/mapper/SysRoleMapper.java | 2 +- .../mapper/SysRolePermissionMapper.java | 2 +- .../modules/system/mapper/SysTaskMapper.java | 4 +- .../system/mapper/SysTaskStationMapper.java | 2 +- .../system/mapper/SysTenantMapper.java | 2 +- .../system/mapper/SysTenantPackMapper.java | 2 +- .../mapper/SysTenantPackUserMapper.java | 2 +- .../system/mapper/SysThirdAccountMapper.java | 2 +- .../system/mapper/SysUserAgentMapper.java | 5 +- .../system/mapper/SysUserDepartMapper.java | 4 +- .../modules/system/mapper/SysUserMapper.java | 2 +- .../system/mapper/SysUserRoleMapper.java | 4 +- .../system/mapper/SysUserTenantMapper.java | 4 +- .../mapper/xml/GardsDetectorsMapper.xml | 2 +- .../mapper/xml/SysAnnouncementMapper.xml | 2 +- .../system/mapper/xml/SysDepartMapper.xml | 12 +- .../system/mapper/xml/SysDepartRoleMapper.xml | 2 +- .../system/mapper/xml/SysDictMapper.xml | 2 +- .../system/mapper/xml/SysPermissionMapper.xml | 4 +- .../system/mapper/xml/SysTaskMapper.xml | 2 +- .../system/mapper/xml/SysTenantMapper.xml | 2 +- .../mapper/xml/SysThirdAccountMapper.xml | 2 +- .../system/mapper/xml/SysUserDepartMapper.xml | 12 +- .../system/mapper/xml/SysUserMapper.xml | 20 +- .../system/mapper/xml/SysUserTenantMapper.xml | 2 +- .../modules/system/model/DepartIdModel.java | 2 +- .../system/model/SysDepartTreeModel.java | 2 +- .../modules/system/model/SysDictTree.java | 2 +- .../system/model/SysPermissionTree.java | 2 +- .../system/model/SysUserSysDepartModel.java | 2 - .../jeecg/modules/system/model/TreeModel.java | 2 +- .../modules/system/rule/CategoryCodeRule.java | 2 +- .../modules/system/rule/OrgCodeRule.java | 2 +- .../service/IGardsDetectorsService.java | 2 +- .../service/IGardsNuclearfacilityService.java | 2 +- .../service/IGardsSampleDataService.java | 2 +- .../system/service/IGardsStationsService.java | 2 +- .../service/ISysAnnouncementSendService.java | 2 +- .../service/ISysAnnouncementService.java | 2 +- .../system/service/ISysCategoryService.java | 2 +- .../system/service/ISysCheckRuleService.java | 2 +- .../system/service/ISysCommentService.java | 2 +- .../system/service/ISysDataLogService.java | 2 +- .../system/service/ISysDataSourceService.java | 2 +- .../service/ISysDepartPermissionService.java | 4 +- .../ISysDepartRolePermissionService.java | 2 +- .../system/service/ISysDepartRoleService.java | 2 +- .../service/ISysDepartRoleUserService.java | 2 +- .../system/service/ISysDepartService.java | 3 +- .../system/service/ISysDictItemService.java | 2 +- .../system/service/ISysDictService.java | 6 +- .../system/service/ISysFilesService.java | 2 +- .../system/service/ISysFillRuleService.java | 2 +- .../system/service/ISysFormFileService.java | 2 +- .../service/ISysGatewayRouteService.java | 2 +- .../system/service/ISysLogService.java | 2 +- .../service/ISysPackPermissionService.java | 2 +- .../ISysPermissionDataRuleService.java | 2 +- .../system/service/ISysPermissionService.java | 3 +- .../system/service/ISysPositionService.java | 2 +- .../system/service/ISysRoleIndexService.java | 2 +- .../service/ISysRolePermissionService.java | 2 +- .../system/service/ISysRoleService.java | 2 +- .../system/service/ISysTaskService.java | 4 +- .../service/ISysTaskStationService.java | 2 +- .../system/service/ISysTenantPackService.java | 4 +- .../system/service/ISysTenantService.java | 4 +- .../service/ISysThirdAccountService.java | 4 +- .../system/service/ISysUserAgentService.java | 2 +- .../system/service/ISysUserDepartService.java | 4 +- .../system/service/ISysUserRoleService.java | 4 +- .../system/service/ISysUserService.java | 5 +- .../system/service/ISysUserTenantService.java | 4 +- .../impl/GardsDetectorsServiceImpl.java | 3 +- .../impl/GardsNuclearfacilityServiceImpl.java | 4 +- .../impl/GardsSampleDataServiceImpl.java | 7 +- .../impl/GardsStationsServiceImpl.java | 4 +- .../impl/SysAnnouncementSendServiceImpl.java | 2 +- .../impl/SysAnnouncementServiceImpl.java | 4 +- .../system/service/impl/SysBaseApiImpl.java | 5 +- .../service/impl/SysCategoryServiceImpl.java | 3 +- .../service/impl/SysCheckRuleServiceImpl.java | 2 +- .../service/impl/SysCommentServiceImpl.java | 6 +- .../service/impl/SysDataLogServiceImpl.java | 2 +- .../impl/SysDataSourceServiceImpl.java | 2 +- .../impl/SysDepartPermissionServiceImpl.java | 8 +- .../SysDepartRolePermissionServiceImpl.java | 2 +- .../impl/SysDepartRoleServiceImpl.java | 2 +- .../impl/SysDepartRoleUserServiceImpl.java | 4 +- .../service/impl/SysDepartServiceImpl.java | 3 +- .../service/impl/SysDictItemServiceImpl.java | 2 +- .../service/impl/SysDictServiceImpl.java | 7 +- .../service/impl/SysFilesServiceImpl.java | 2 +- .../service/impl/SysFillRuleServiceImpl.java | 2 +- .../service/impl/SysFormFileServiceImpl.java | 2 +- .../impl/SysGatewayRouteServiceImpl.java | 5 +- .../service/impl/SysLogServiceImpl.java | 5 +- .../impl/SysPackPermissionServiceImpl.java | 2 +- .../impl/SysPermissionDataRuleImpl.java | 4 +- .../impl/SysPermissionServiceImpl.java | 4 +- .../service/impl/SysPositionServiceImpl.java | 2 +- .../service/impl/SysRoleIndexServiceImpl.java | 2 +- .../impl/SysRolePermissionServiceImpl.java | 2 +- .../service/impl/SysRoleServiceImpl.java | 2 +- .../service/impl/SysTaskServiceImpl.java | 10 +- .../impl/SysTaskStationServiceImpl.java | 2 +- .../impl/SysTenantPackServiceImpl.java | 6 +- .../service/impl/SysTenantServiceImpl.java | 2 +- .../impl/SysThirdAccountServiceImpl.java | 8 +- .../service/impl/SysUserAgentServiceImpl.java | 2 +- .../impl/SysUserDepartServiceImpl.java | 7 +- .../service/impl/SysUserRoleServiceImpl.java | 11 +- .../service/impl/SysUserServiceImpl.java | 9 +- .../impl/SysUserTenantServiceImpl.java | 5 +- .../impl/ThirdAppDingtalkServiceImpl.java | 2 +- .../ThirdAppWechatEnterpriseServiceImpl.java | 2 +- .../system/util/FindsDepartsChildrenUtil.java | 5 +- .../system/util/PermissionDataUtil.java | 2 +- .../jeecg/modules/system/vo/SysDictPage.java | 2 +- .../jeecg/modules/system/vo/UserAvatar.java | 2 +- .../modules/system/vo/lowapp/SysDictVo.java | 2 +- .../system/vo/lowapp/UpdateDepartInfo.java | 2 +- .../vo/tenant/TenantDepartAuthInfo.java | 2 +- 233 files changed, 322 insertions(+), 741 deletions(-) rename {jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/entity => jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/configuration}/GardsDetectors.java (98%) rename {jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/entity => jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/configuration}/GardsNuclearfacility.java (98%) rename {jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/entity => jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/configuration}/GardsStations.java (97%) rename {jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/entity => jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/postgre}/SysAnnouncement.java (98%) rename {jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/entity => jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/postgre}/SysAnnouncementSend.java (97%) rename {jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/entity => jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/postgre}/SysCategory.java (97%) rename {jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/entity => jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/postgre}/SysCheckRule.java (98%) rename {jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/entity => jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/postgre}/SysComment.java (98%) rename {jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/entity => jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/postgre}/SysDataLog.java (97%) rename {jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/entity => jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/postgre}/SysDataSource.java (98%) rename {jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/entity => jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/postgre}/SysDepart.java (99%) rename {jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/entity => jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/postgre}/SysDepartPermission.java (97%) rename {jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/entity => jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/postgre}/SysDepartRole.java (98%) rename {jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/entity => jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/postgre}/SysDepartRolePermission.java (97%) rename {jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/entity => jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/postgre}/SysDepartRoleUser.java (96%) rename {jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/entity => jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/postgre}/SysDict.java (97%) rename {jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/entity => jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/postgre}/SysDictItem.java (96%) rename {jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/entity => jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/postgre}/SysFiles.java (99%) rename {jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/entity => jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/postgre}/SysFillRule.java (98%) rename {jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/entity => jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/postgre}/SysFormFile.java (97%) rename {jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/entity => jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/postgre}/SysGatewayRoute.java (98%) rename {jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/entity => jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/postgre}/SysLog.java (97%) rename {jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/entity => jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/postgre}/SysPackPermission.java (97%) rename {jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/entity => jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/postgre}/SysPermission.java (98%) rename {jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/entity => jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/postgre}/SysPermissionDataRule.java (96%) rename {jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/entity => jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/postgre}/SysPosition.java (98%) rename {jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/entity => jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/postgre}/SysRoleIndex.java (98%) rename {jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/entity => jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/postgre}/SysRolePermission.java (96%) rename {jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/entity => jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/postgre}/SysTask.java (97%) rename {jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/entity => jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/postgre}/SysTaskStation.java (97%) rename {jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/entity => jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/postgre}/SysTenant.java (98%) rename {jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/entity => jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/postgre}/SysTenantPack.java (98%) rename {jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/entity => jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/postgre}/SysTenantPackUser.java (98%) rename {jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/entity => jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/postgre}/SysThirdAccount.java (98%) rename {jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/entity => jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/postgre}/SysUserAgent.java (98%) rename {jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/entity => jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/postgre}/SysUserDepart.java (94%) rename {jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/entity => jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/postgre}/SysUserRole.java (94%) rename {jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/entity => jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/postgre}/SysUserTenant.java (97%) delete mode 100644 jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/entity/SysRole.java delete mode 100644 jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/entity/SysUser.java diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/entity/GardsDetectors.java b/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/configuration/GardsDetectors.java similarity index 98% rename from jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/entity/GardsDetectors.java rename to jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/configuration/GardsDetectors.java index b8d1580e..cf115c55 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/entity/GardsDetectors.java +++ b/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/configuration/GardsDetectors.java @@ -1,4 +1,4 @@ -package org.jeecg.modules.system.entity; +package org.jeecg.modules.base.entity.configuration; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/entity/GardsNuclearfacility.java b/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/configuration/GardsNuclearfacility.java similarity index 98% rename from jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/entity/GardsNuclearfacility.java rename to jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/configuration/GardsNuclearfacility.java index 6b7eb08f..5d92eac0 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/entity/GardsNuclearfacility.java +++ b/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/configuration/GardsNuclearfacility.java @@ -1,4 +1,4 @@ -package org.jeecg.modules.system.entity; +package org.jeecg.modules.base.entity.configuration; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/entity/GardsStations.java b/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/configuration/GardsStations.java similarity index 97% rename from jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/entity/GardsStations.java rename to jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/configuration/GardsStations.java index ed51a64e..51a90ada 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/entity/GardsStations.java +++ b/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/configuration/GardsStations.java @@ -1,4 +1,4 @@ -package org.jeecg.modules.system.entity; +package org.jeecg.modules.base.entity.configuration; import com.baomidou.dynamic.datasource.annotation.DS; import com.baomidou.mybatisplus.annotation.TableField; diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/entity/SysAnnouncement.java b/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/postgre/SysAnnouncement.java similarity index 98% rename from jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/entity/SysAnnouncement.java rename to jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/postgre/SysAnnouncement.java index 63647e0f..bd59ff13 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/entity/SysAnnouncement.java +++ b/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/postgre/SysAnnouncement.java @@ -1,4 +1,4 @@ -package org.jeecg.modules.system.entity; +package org.jeecg.modules.base.entity.postgre; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/entity/SysAnnouncementSend.java b/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/postgre/SysAnnouncementSend.java similarity index 97% rename from jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/entity/SysAnnouncementSend.java rename to jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/postgre/SysAnnouncementSend.java index 1d2b955c..4dea53d6 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/entity/SysAnnouncementSend.java +++ b/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/postgre/SysAnnouncementSend.java @@ -1,4 +1,4 @@ -package org.jeecg.modules.system.entity; +package org.jeecg.modules.base.entity.postgre; import java.io.Serializable; import java.util.Date; diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/entity/SysCategory.java b/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/postgre/SysCategory.java similarity index 97% rename from jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/entity/SysCategory.java rename to jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/postgre/SysCategory.java index e19273b7..a128b155 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/entity/SysCategory.java +++ b/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/postgre/SysCategory.java @@ -1,4 +1,4 @@ -package org.jeecg.modules.system.entity; +package org.jeecg.modules.base.entity.postgre; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/entity/SysCheckRule.java b/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/postgre/SysCheckRule.java similarity index 98% rename from jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/entity/SysCheckRule.java rename to jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/postgre/SysCheckRule.java index a287f352..080bef91 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/entity/SysCheckRule.java +++ b/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/postgre/SysCheckRule.java @@ -1,4 +1,4 @@ -package org.jeecg.modules.system.entity; +package org.jeecg.modules.base.entity.postgre; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/entity/SysComment.java b/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/postgre/SysComment.java similarity index 98% rename from jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/entity/SysComment.java rename to jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/postgre/SysComment.java index d36d09b0..016af696 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/entity/SysComment.java +++ b/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/postgre/SysComment.java @@ -1,4 +1,4 @@ -package org.jeecg.modules.system.entity; +package org.jeecg.modules.base.entity.postgre; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/entity/SysDataLog.java b/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/postgre/SysDataLog.java similarity index 97% rename from jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/entity/SysDataLog.java rename to jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/postgre/SysDataLog.java index dd055ed3..6b054541 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/entity/SysDataLog.java +++ b/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/postgre/SysDataLog.java @@ -1,4 +1,4 @@ -package org.jeecg.modules.system.entity; +package org.jeecg.modules.base.entity.postgre; import java.io.Serializable; import java.util.Date; diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/entity/SysDataSource.java b/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/postgre/SysDataSource.java similarity index 98% rename from jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/entity/SysDataSource.java rename to jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/postgre/SysDataSource.java index 76c0e802..494eef4e 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/entity/SysDataSource.java +++ b/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/postgre/SysDataSource.java @@ -1,4 +1,4 @@ -package org.jeecg.modules.system.entity; +package org.jeecg.modules.base.entity.postgre; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/entity/SysDepart.java b/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/postgre/SysDepart.java similarity index 99% rename from jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/entity/SysDepart.java rename to jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/postgre/SysDepart.java index 077ca2a9..344012ea 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/entity/SysDepart.java +++ b/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/postgre/SysDepart.java @@ -1,4 +1,4 @@ -package org.jeecg.modules.system.entity; +package org.jeecg.modules.base.entity.postgre; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableField; diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/entity/SysDepartPermission.java b/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/postgre/SysDepartPermission.java similarity index 97% rename from jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/entity/SysDepartPermission.java rename to jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/postgre/SysDepartPermission.java index a833af4d..7e4390b9 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/entity/SysDepartPermission.java +++ b/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/postgre/SysDepartPermission.java @@ -1,4 +1,4 @@ -package org.jeecg.modules.system.entity; +package org.jeecg.modules.base.entity.postgre; import java.io.Serializable; import java.util.Date; diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/entity/SysDepartRole.java b/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/postgre/SysDepartRole.java similarity index 98% rename from jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/entity/SysDepartRole.java rename to jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/postgre/SysDepartRole.java index cc3f74f4..580f06c3 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/entity/SysDepartRole.java +++ b/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/postgre/SysDepartRole.java @@ -1,4 +1,4 @@ -package org.jeecg.modules.system.entity; +package org.jeecg.modules.base.entity.postgre; import java.io.Serializable; import java.util.Date; diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/entity/SysDepartRolePermission.java b/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/postgre/SysDepartRolePermission.java similarity index 97% rename from jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/entity/SysDepartRolePermission.java rename to jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/postgre/SysDepartRolePermission.java index 61b3fc2c..62418b31 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/entity/SysDepartRolePermission.java +++ b/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/postgre/SysDepartRolePermission.java @@ -1,4 +1,4 @@ -package org.jeecg.modules.system.entity; +package org.jeecg.modules.base.entity.postgre; import java.io.Serializable; import java.util.Date; diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/entity/SysDepartRoleUser.java b/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/postgre/SysDepartRoleUser.java similarity index 96% rename from jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/entity/SysDepartRoleUser.java rename to jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/postgre/SysDepartRoleUser.java index 01316dc3..135ccaa1 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/entity/SysDepartRoleUser.java +++ b/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/postgre/SysDepartRoleUser.java @@ -1,4 +1,4 @@ -package org.jeecg.modules.system.entity; +package org.jeecg.modules.base.entity.postgre; import java.io.Serializable; import java.util.Date; diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/entity/SysDict.java b/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/postgre/SysDict.java similarity index 97% rename from jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/entity/SysDict.java rename to jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/postgre/SysDict.java index 8e7569cd..4390c06b 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/entity/SysDict.java +++ b/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/postgre/SysDict.java @@ -1,4 +1,4 @@ -package org.jeecg.modules.system.entity; +package org.jeecg.modules.base.entity.postgre; import java.io.Serializable; import java.util.Date; diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/entity/SysDictItem.java b/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/postgre/SysDictItem.java similarity index 96% rename from jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/entity/SysDictItem.java rename to jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/postgre/SysDictItem.java index e5e91ccd..48bd4b4f 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/entity/SysDictItem.java +++ b/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/postgre/SysDictItem.java @@ -1,4 +1,4 @@ -package org.jeecg.modules.system.entity; +package org.jeecg.modules.base.entity.postgre; import java.io.Serializable; import java.math.BigDecimal; diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/entity/SysFiles.java b/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/postgre/SysFiles.java similarity index 99% rename from jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/entity/SysFiles.java rename to jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/postgre/SysFiles.java index 560bfdba..bbd5d8a9 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/entity/SysFiles.java +++ b/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/postgre/SysFiles.java @@ -1,4 +1,4 @@ -package org.jeecg.modules.system.entity; +package org.jeecg.modules.base.entity.postgre; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableField; diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/entity/SysFillRule.java b/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/postgre/SysFillRule.java similarity index 98% rename from jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/entity/SysFillRule.java rename to jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/postgre/SysFillRule.java index 928ce016..97fb24b9 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/entity/SysFillRule.java +++ b/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/postgre/SysFillRule.java @@ -1,4 +1,4 @@ -package org.jeecg.modules.system.entity; +package org.jeecg.modules.base.entity.postgre; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/entity/SysFormFile.java b/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/postgre/SysFormFile.java similarity index 97% rename from jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/entity/SysFormFile.java rename to jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/postgre/SysFormFile.java index 77057880..e8a7fb20 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/entity/SysFormFile.java +++ b/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/postgre/SysFormFile.java @@ -1,4 +1,4 @@ -package org.jeecg.modules.system.entity; +package org.jeecg.modules.base.entity.postgre; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/entity/SysGatewayRoute.java b/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/postgre/SysGatewayRoute.java similarity index 98% rename from jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/entity/SysGatewayRoute.java rename to jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/postgre/SysGatewayRoute.java index db9a6add..f335a34e 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/entity/SysGatewayRoute.java +++ b/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/postgre/SysGatewayRoute.java @@ -1,4 +1,4 @@ -package org.jeecg.modules.system.entity; +package org.jeecg.modules.base.entity.postgre; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/entity/SysLog.java b/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/postgre/SysLog.java similarity index 97% rename from jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/entity/SysLog.java rename to jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/postgre/SysLog.java index de2c11d7..d66b4a08 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/entity/SysLog.java +++ b/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/postgre/SysLog.java @@ -1,4 +1,4 @@ -package org.jeecg.modules.system.entity; +package org.jeecg.modules.base.entity.postgre; import java.util.Date; diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/entity/SysPackPermission.java b/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/postgre/SysPackPermission.java similarity index 97% rename from jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/entity/SysPackPermission.java rename to jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/postgre/SysPackPermission.java index 44319a1e..ddd9379d 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/entity/SysPackPermission.java +++ b/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/postgre/SysPackPermission.java @@ -1,4 +1,4 @@ -package org.jeecg.modules.system.entity; +package org.jeecg.modules.base.entity.postgre; import java.io.Serializable; import java.util.Date; diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/entity/SysPermission.java b/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/postgre/SysPermission.java similarity index 98% rename from jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/entity/SysPermission.java rename to jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/postgre/SysPermission.java index 8d8663fa..053961c1 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/entity/SysPermission.java +++ b/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/postgre/SysPermission.java @@ -1,4 +1,4 @@ -package org.jeecg.modules.system.entity; +package org.jeecg.modules.base.entity.postgre; import java.io.Serializable; import java.util.Date; diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/entity/SysPermissionDataRule.java b/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/postgre/SysPermissionDataRule.java similarity index 96% rename from jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/entity/SysPermissionDataRule.java rename to jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/postgre/SysPermissionDataRule.java index 4a0af834..ff30d0be 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/entity/SysPermissionDataRule.java +++ b/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/postgre/SysPermissionDataRule.java @@ -1,4 +1,4 @@ -package org.jeecg.modules.system.entity; +package org.jeecg.modules.base.entity.postgre; import java.io.Serializable; import java.util.Date; diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/entity/SysPosition.java b/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/postgre/SysPosition.java similarity index 98% rename from jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/entity/SysPosition.java rename to jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/postgre/SysPosition.java index 92877a9c..fdd017c8 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/entity/SysPosition.java +++ b/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/postgre/SysPosition.java @@ -1,4 +1,4 @@ -package org.jeecg.modules.system.entity; +package org.jeecg.modules.base.entity.postgre; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/entity/SysRoleIndex.java b/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/postgre/SysRoleIndex.java similarity index 98% rename from jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/entity/SysRoleIndex.java rename to jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/postgre/SysRoleIndex.java index d270fc5c..8b6c3c29 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/entity/SysRoleIndex.java +++ b/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/postgre/SysRoleIndex.java @@ -1,4 +1,4 @@ -package org.jeecg.modules.system.entity; +package org.jeecg.modules.base.entity.postgre; import java.io.Serializable; import java.util.Date; diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/entity/SysRolePermission.java b/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/postgre/SysRolePermission.java similarity index 96% rename from jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/entity/SysRolePermission.java rename to jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/postgre/SysRolePermission.java index f0a301d2..8722faf0 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/entity/SysRolePermission.java +++ b/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/postgre/SysRolePermission.java @@ -1,4 +1,4 @@ -package org.jeecg.modules.system.entity; +package org.jeecg.modules.base.entity.postgre; import java.io.Serializable; import java.util.Date; diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/entity/SysTask.java b/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/postgre/SysTask.java similarity index 97% rename from jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/entity/SysTask.java rename to jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/postgre/SysTask.java index 5af2e4c3..e50247a3 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/entity/SysTask.java +++ b/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/postgre/SysTask.java @@ -1,4 +1,4 @@ -package org.jeecg.modules.system.entity; +package org.jeecg.modules.base.entity.postgre; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableField; diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/entity/SysTaskStation.java b/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/postgre/SysTaskStation.java similarity index 97% rename from jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/entity/SysTaskStation.java rename to jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/postgre/SysTaskStation.java index d9545e9e..7ad176b5 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/entity/SysTaskStation.java +++ b/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/postgre/SysTaskStation.java @@ -1,4 +1,4 @@ -package org.jeecg.modules.system.entity; +package org.jeecg.modules.base.entity.postgre; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableField; diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/entity/SysTenant.java b/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/postgre/SysTenant.java similarity index 98% rename from jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/entity/SysTenant.java rename to jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/postgre/SysTenant.java index bfc3ed28..32be51f0 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/entity/SysTenant.java +++ b/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/postgre/SysTenant.java @@ -1,4 +1,4 @@ -package org.jeecg.modules.system.entity; +package org.jeecg.modules.base.entity.postgre; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableLogic; diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/entity/SysTenantPack.java b/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/postgre/SysTenantPack.java similarity index 98% rename from jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/entity/SysTenantPack.java rename to jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/postgre/SysTenantPack.java index a3c3f145..af05935d 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/entity/SysTenantPack.java +++ b/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/postgre/SysTenantPack.java @@ -1,4 +1,4 @@ -package org.jeecg.modules.system.entity; +package org.jeecg.modules.base.entity.postgre; import java.io.Serializable; import java.util.Date; diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/entity/SysTenantPackUser.java b/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/postgre/SysTenantPackUser.java similarity index 98% rename from jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/entity/SysTenantPackUser.java rename to jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/postgre/SysTenantPackUser.java index 8a064db8..ba7d12bc 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/entity/SysTenantPackUser.java +++ b/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/postgre/SysTenantPackUser.java @@ -1,4 +1,4 @@ -package org.jeecg.modules.system.entity; +package org.jeecg.modules.base.entity.postgre; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/entity/SysThirdAccount.java b/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/postgre/SysThirdAccount.java similarity index 98% rename from jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/entity/SysThirdAccount.java rename to jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/postgre/SysThirdAccount.java index f3b583f8..b82ebac9 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/entity/SysThirdAccount.java +++ b/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/postgre/SysThirdAccount.java @@ -1,4 +1,4 @@ -package org.jeecg.modules.system.entity; +package org.jeecg.modules.base.entity.postgre; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/entity/SysUserAgent.java b/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/postgre/SysUserAgent.java similarity index 98% rename from jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/entity/SysUserAgent.java rename to jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/postgre/SysUserAgent.java index f443f5d2..6f1fc4c2 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/entity/SysUserAgent.java +++ b/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/postgre/SysUserAgent.java @@ -1,4 +1,4 @@ -package org.jeecg.modules.system.entity; +package org.jeecg.modules.base.entity.postgre; import java.io.Serializable; import java.util.Date; diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/entity/SysUserDepart.java b/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/postgre/SysUserDepart.java similarity index 94% rename from jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/entity/SysUserDepart.java rename to jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/postgre/SysUserDepart.java index d370ddde..d0b22364 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/entity/SysUserDepart.java +++ b/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/postgre/SysUserDepart.java @@ -1,4 +1,4 @@ -package org.jeecg.modules.system.entity; +package org.jeecg.modules.base.entity.postgre; import java.io.Serializable; diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/entity/SysUserRole.java b/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/postgre/SysUserRole.java similarity index 94% rename from jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/entity/SysUserRole.java rename to jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/postgre/SysUserRole.java index b8145ee7..c09ad482 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/entity/SysUserRole.java +++ b/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/postgre/SysUserRole.java @@ -1,4 +1,4 @@ -package org.jeecg.modules.system.entity; +package org.jeecg.modules.base.entity.postgre; import java.io.Serializable; diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/entity/SysUserTenant.java b/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/postgre/SysUserTenant.java similarity index 97% rename from jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/entity/SysUserTenant.java rename to jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/postgre/SysUserTenant.java index d85931ea..ce3fc01a 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/entity/SysUserTenant.java +++ b/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/postgre/SysUserTenant.java @@ -1,4 +1,4 @@ -package org.jeecg.modules.system.entity; +package org.jeecg.modules.base.entity.postgre; import java.io.Serializable; import java.util.Date; diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/aop/TenantPackUserLogAspect.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/aop/TenantPackUserLogAspect.java index 19209f23..e34307dd 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/aop/TenantPackUserLogAspect.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/aop/TenantPackUserLogAspect.java @@ -10,8 +10,8 @@ import org.aspectj.lang.reflect.MethodSignature; import org.jeecg.common.api.dto.LogDTO; import org.jeecg.common.system.vo.LoginUser; import org.jeecg.modules.base.service.BaseCommonService; -import org.jeecg.modules.system.entity.SysTenantPack; -import org.jeecg.modules.system.entity.SysTenantPackUser; +import org.jeecg.modules.base.entity.postgre.SysTenantPack; +import org.jeecg.modules.base.entity.postgre.SysTenantPackUser; import org.springframework.stereotype.Component; import javax.annotation.Resource; diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/cas/controller/CasClientController.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/cas/controller/CasClientController.java index 84209572..b1ed0bf8 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/cas/controller/CasClientController.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/cas/controller/CasClientController.java @@ -12,8 +12,8 @@ import org.jeecg.common.system.util.JwtUtil; import org.jeecg.common.util.RedisUtil; import org.jeecg.modules.cas.util.CasServiceUtil; import org.jeecg.modules.cas.util.XmlUtils; -import org.jeecg.modules.system.entity.SysDepart; -import org.jeecg.modules.system.entity.SysUser; +import org.jeecg.modules.base.entity.postgre.SysDepart; +import org.jeecg.modules.base.entity.postgre.SysUser; import org.jeecg.modules.system.service.ISysDepartService; import org.jeecg.modules.system.service.ISysUserService; import org.springframework.beans.factory.annotation.Autowired; diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/feignclient/AbnormalAlarmClient.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/feignclient/AbnormalAlarmClient.java index aded039b..e0e672b2 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/feignclient/AbnormalAlarmClient.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/feignclient/AbnormalAlarmClient.java @@ -1,8 +1,8 @@ package org.jeecg.modules.feignclient; import org.jeecg.common.api.vo.Result; -import org.jeecg.modules.base.entity.AlarmLog; -import org.jeecg.modules.base.entity.SysEmail; +import org.jeecg.modules.base.entity.postgre.AlarmLog; +import org.jeecg.modules.base.entity.postgre.SysEmail; import org.springframework.cloud.openfeign.FeignClient; import org.springframework.stereotype.Component; import org.springframework.web.bind.annotation.GetMapping; diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/message/SendMessage.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/message/SendMessage.java index bd4d520e..67996131 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/message/SendMessage.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/message/SendMessage.java @@ -6,7 +6,7 @@ import org.jeecg.common.api.dto.message.MessageDTO; import org.jeecg.common.config.mqtoken.UserTokenContext; import org.jeecg.common.system.api.ISysBaseAPI; import org.jeecg.modules.feignclient.AbnormalAlarmClient; -import org.jeecg.modules.system.entity.SysUser; +import org.jeecg.modules.base.entity.postgre.SysUser; import org.jeecg.modules.system.service.ISysUserService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/message/handle/impl/EmailPushMsgHandle.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/message/handle/impl/EmailPushMsgHandle.java index 44d6b04b..67cd8643 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/message/handle/impl/EmailPushMsgHandle.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/message/handle/impl/EmailPushMsgHandle.java @@ -3,16 +3,13 @@ package org.jeecg.modules.message.handle.impl; import lombok.extern.slf4j.Slf4j; import org.jeecg.common.api.dto.message.MessageDTO; import org.jeecg.common.email.EmailServiceManager; -import org.jeecg.modules.base.entity.SysEmail; +import org.jeecg.modules.base.entity.postgre.SysEmail; import org.jeecg.modules.feignclient.AbnormalAlarmClient; import org.jeecg.modules.message.handle.ISendMsgHandle; import org.jeecg.modules.message.service.ISysMessageService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; -import javax.mail.MessagingException; -import java.io.UnsupportedEncodingException; - import static org.jeecg.common.email.EmailServiceManager.getInstance; /** diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/message/handle/impl/EmailSendMsgHandle.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/message/handle/impl/EmailSendMsgHandle.java index 3cedbedc..990192f9 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/message/handle/impl/EmailSendMsgHandle.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/message/handle/impl/EmailSendMsgHandle.java @@ -11,7 +11,7 @@ import org.jeecg.common.util.SpringContextUtils; import org.jeecg.common.util.oConvertUtils; import org.jeecg.config.StaticConfig; import org.jeecg.modules.message.handle.ISendMsgHandle; -import org.jeecg.modules.system.entity.SysUser; +import org.jeecg.modules.base.entity.postgre.SysUser; import org.jeecg.modules.system.mapper.SysUserMapper; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.mail.javamail.JavaMailSender; diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/message/handle/impl/SystemSendMsgHandle.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/message/handle/impl/SystemSendMsgHandle.java index 82794bf3..8dd668a6 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/message/handle/impl/SystemSendMsgHandle.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/message/handle/impl/SystemSendMsgHandle.java @@ -1,8 +1,6 @@ package org.jeecg.modules.message.handle.impl; -import cn.hutool.core.util.ArrayUtil; import cn.hutool.core.util.ObjectUtil; -import cn.hutool.core.util.StrUtil; import com.alibaba.fastjson.JSONObject; import org.jeecg.common.api.dto.message.MessageDTO; import org.jeecg.common.constant.CommonConstant; @@ -11,13 +9,12 @@ import org.jeecg.common.exception.JeecgBootException; import org.jeecg.common.system.api.ISysBaseAPI; import org.jeecg.common.util.SpringContextUtils; import org.jeecg.common.util.oConvertUtils; -import org.jeecg.modules.message.enums.Vue3MessageHrefEnum; import org.jeecg.modules.message.handle.ISendMsgHandle; import org.jeecg.modules.message.service.ISysMessageService; import org.jeecg.modules.message.websocket.WebSocket; -import org.jeecg.modules.system.entity.SysAnnouncement; -import org.jeecg.modules.system.entity.SysAnnouncementSend; -import org.jeecg.modules.system.entity.SysUser; +import org.jeecg.modules.base.entity.postgre.SysAnnouncement; +import org.jeecg.modules.base.entity.postgre.SysAnnouncementSend; +import org.jeecg.modules.base.entity.postgre.SysUser; import org.jeecg.modules.system.mapper.SysAnnouncementMapper; import org.jeecg.modules.system.mapper.SysAnnouncementSendMapper; import org.jeecg.modules.system.mapper.SysUserMapper; @@ -25,9 +22,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; import javax.annotation.Resource; -import java.util.Arrays; import java.util.Date; -import java.util.Map; @Component("systemSendMsgHandle") public class SystemSendMsgHandle implements ISendMsgHandle { diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/ngalain/service/impl/NgAlainServiceImpl.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/ngalain/service/impl/NgAlainServiceImpl.java index bcad44ac..e083cb05 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/ngalain/service/impl/NgAlainServiceImpl.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/ngalain/service/impl/NgAlainServiceImpl.java @@ -6,12 +6,11 @@ import org.jeecg.common.constant.CommonConstant; import org.jeecg.common.constant.SymbolConstant; import org.jeecg.common.util.oConvertUtils; import org.jeecg.modules.ngalain.service.NgAlainService; -import org.jeecg.modules.system.entity.SysPermission; +import org.jeecg.modules.base.entity.postgre.SysPermission; import org.jeecg.modules.system.mapper.SysDictMapper; import org.jeecg.modules.system.service.ISysPermissionService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; import java.util.Base64; import java.util.List; diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/quartz/job/SysInfoJob.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/quartz/job/SysInfoJob.java index 7e25c188..ff8d1e4b 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/quartz/job/SysInfoJob.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/quartz/job/SysInfoJob.java @@ -12,8 +12,8 @@ import org.jeecg.common.constant.CommonConstant; import org.jeecg.common.util.RedisStreamUtil; import org.jeecg.common.util.SpringContextUtils; import org.jeecg.modules.base.entity.monitor.ItemHistory; -import org.jeecg.modules.base.entity.AlarmLog; -import org.jeecg.modules.base.entity.AlarmRule; +import org.jeecg.modules.base.entity.postgre.AlarmLog; +import org.jeecg.modules.base.entity.postgre.AlarmRule; import org.jeecg.modules.base.entity.Rule; import org.jeecg.modules.feignclient.AbnormalAlarmClient; import org.jeecg.modules.feignclient.MonitorSystem; diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/redisStream/ConsumeA1.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/redisStream/ConsumeA1.java index 7892ea3e..c745ff21 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/redisStream/ConsumeA1.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/redisStream/ConsumeA1.java @@ -1,6 +1,5 @@ package org.jeecg.modules.redisStream; -import cn.hutool.core.util.NumberUtil; import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.StrUtil; import com.fasterxml.jackson.core.JsonProcessingException; @@ -13,7 +12,7 @@ import org.jeecg.common.constant.SymbolConstant; import org.jeecg.common.util.RedisStreamUtil; import org.jeecg.common.util.SpringContextUtils; import org.jeecg.modules.base.dto.RuleDto; -import org.jeecg.modules.base.entity.AlarmRule; +import org.jeecg.modules.base.entity.postgre.AlarmRule; import org.jeecg.modules.base.entity.Rule; import org.jeecg.modules.message.SendMessage; import org.springframework.data.redis.connection.stream.ObjectRecord; diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/controller/GardsDetectorsController.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/controller/GardsDetectorsController.java index 57060a17..1032533d 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/controller/GardsDetectorsController.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/controller/GardsDetectorsController.java @@ -1,24 +1,20 @@ package org.jeecg.modules.system.controller; -import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; -import com.baomidou.mybatisplus.core.toolkit.CollectionUtils; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.jeecg.common.api.QueryRequest; import org.jeecg.common.api.vo.Result; import org.jeecg.config.valid.InsertGroup; import org.jeecg.config.valid.UpdateGroup; -import org.jeecg.modules.system.entity.GardsDetectors; +import org.jeecg.modules.base.entity.configuration.GardsDetectors; import org.jeecg.modules.system.service.IGardsDetectorsService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; -import java.util.HashMap; import java.util.List; import java.util.Map; -import java.util.stream.Collectors; @RestController @RequestMapping("gardsDetectors") diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/controller/GardsNuclearfacilityController.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/controller/GardsNuclearfacilityController.java index 09532b33..103cff75 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/controller/GardsNuclearfacilityController.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/controller/GardsNuclearfacilityController.java @@ -7,7 +7,7 @@ import org.jeecg.common.api.QueryRequest; import org.jeecg.common.api.vo.Result; import org.jeecg.config.valid.InsertGroup; import org.jeecg.config.valid.UpdateGroup; -import org.jeecg.modules.system.entity.GardsNuclearfacility; +import org.jeecg.modules.base.entity.configuration.GardsNuclearfacility; import org.jeecg.modules.system.service.IGardsNuclearfacilityService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.validation.annotation.Validated; diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/controller/GardsSampleDataController.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/controller/GardsSampleDataController.java index 423176cc..19fa0818 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/controller/GardsSampleDataController.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/controller/GardsSampleDataController.java @@ -6,7 +6,7 @@ import io.swagger.annotations.ApiOperation; import org.jeecg.common.api.QueryRequest; import org.jeecg.common.api.vo.Result; import org.jeecg.common.util.RedisUtil; -import org.jeecg.modules.base.entity.GardsSampleData; +import org.jeecg.modules.base.entity.original.GardsSampleData; import org.jeecg.modules.system.service.IGardsSampleDataService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.DeleteMapping; diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/controller/GardsStationsController.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/controller/GardsStationsController.java index 2e063ec0..949ba295 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/controller/GardsStationsController.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/controller/GardsStationsController.java @@ -7,7 +7,7 @@ import org.jeecg.common.api.QueryRequest; import org.jeecg.common.api.vo.Result; import org.jeecg.config.valid.InsertGroup; import org.jeecg.config.valid.UpdateGroup; -import org.jeecg.modules.system.entity.GardsStations; +import org.jeecg.modules.base.entity.configuration.GardsStations; import org.jeecg.modules.system.service.IGardsStationsService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.validation.annotation.Validated; diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/controller/LoginController.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/controller/LoginController.java index 15c22bb9..2a27d7e3 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/controller/LoginController.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/controller/LoginController.java @@ -20,17 +20,15 @@ import org.jeecg.common.util.*; import org.jeecg.common.util.encryption.EncryptedString; import org.jeecg.config.JeecgBaseConfig; import org.jeecg.modules.base.service.BaseCommonService; -import org.jeecg.modules.system.entity.SysDepart; -import org.jeecg.modules.system.entity.SysRoleIndex; -import org.jeecg.modules.system.entity.SysTenant; -import org.jeecg.modules.system.entity.SysUser; +import org.jeecg.modules.base.entity.postgre.SysDepart; +import org.jeecg.modules.base.entity.postgre.SysRoleIndex; +import org.jeecg.modules.base.entity.postgre.SysUser; import org.jeecg.modules.system.model.SysLoginModel; import org.jeecg.modules.system.service.*; import org.jeecg.modules.system.service.impl.SysBaseApiImpl; import org.jeecg.modules.system.util.RandImageUtil; import org.springframework.beans.BeanUtils; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.http.HttpStatus; import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/controller/SysAnnouncementController.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/controller/SysAnnouncementController.java index 63cf65cd..54923f2f 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/controller/SysAnnouncementController.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/controller/SysAnnouncementController.java @@ -1,6 +1,5 @@ package org.jeecg.modules.system.controller; -import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; @@ -25,8 +24,8 @@ import org.jeecg.common.util.oConvertUtils; import org.jeecg.config.mybatis.MybatisPlusSaasConfig; import org.jeecg.modules.message.enums.RangeDateEnum; import org.jeecg.modules.message.websocket.WebSocket; -import org.jeecg.modules.system.entity.SysAnnouncement; -import org.jeecg.modules.system.entity.SysAnnouncementSend; +import org.jeecg.modules.base.entity.postgre.SysAnnouncement; +import org.jeecg.modules.base.entity.postgre.SysAnnouncementSend; import org.jeecg.modules.system.service.ISysAnnouncementSendService; import org.jeecg.modules.system.service.ISysAnnouncementService; import org.jeecg.modules.system.service.impl.SysBaseApiImpl; diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/controller/SysAnnouncementSendController.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/controller/SysAnnouncementSendController.java index 72462d19..355d811c 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/controller/SysAnnouncementSendController.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/controller/SysAnnouncementSendController.java @@ -14,7 +14,7 @@ import org.jeecg.common.system.vo.LoginUser; import org.jeecg.common.util.SqlInjectionUtil; import org.jeecg.common.util.oConvertUtils; import org.jeecg.modules.message.websocket.WebSocket; -import org.jeecg.modules.system.entity.SysAnnouncementSend; +import org.jeecg.modules.base.entity.postgre.SysAnnouncementSend; import org.jeecg.modules.system.model.AnnouncementSendModel; import org.jeecg.modules.system.service.ISysAnnouncementSendService; import org.springframework.beans.factory.annotation.Autowired; diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/controller/SysCategoryController.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/controller/SysCategoryController.java index 6a7725e4..7aa91731 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/controller/SysCategoryController.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/controller/SysCategoryController.java @@ -18,7 +18,7 @@ import org.jeecg.common.util.ImportExcelUtil; import org.jeecg.common.util.SqlInjectionUtil; import org.jeecg.common.util.oConvertUtils; import org.jeecg.config.mybatis.MybatisPlusSaasConfig; -import org.jeecg.modules.system.entity.SysCategory; +import org.jeecg.modules.base.entity.postgre.SysCategory; import org.jeecg.modules.system.model.TreeSelectModel; import org.jeecg.modules.system.service.ISysCategoryService; import org.jeecgframework.poi.excel.ExcelImportUtil; diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/controller/SysCheckRuleController.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/controller/SysCheckRuleController.java index c7e75847..b5bf815d 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/controller/SysCheckRuleController.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/controller/SysCheckRuleController.java @@ -11,7 +11,7 @@ import org.jeecg.common.api.vo.Result; import org.jeecg.common.aspect.annotation.AutoLog; import org.jeecg.common.system.base.controller.JeecgController; import org.jeecg.common.system.query.QueryGenerator; -import org.jeecg.modules.system.entity.SysCheckRule; +import org.jeecg.modules.base.entity.postgre.SysCheckRule; import org.jeecg.modules.system.service.ISysCheckRuleService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/controller/SysCommentController.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/controller/SysCommentController.java index 93f31dc4..62f1124f 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/controller/SysCommentController.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/controller/SysCommentController.java @@ -14,7 +14,7 @@ import org.jeecg.common.system.api.ISysBaseAPI; import org.jeecg.common.system.base.controller.JeecgController; import org.jeecg.common.system.query.QueryGenerator; import org.jeecg.common.system.vo.LoginUser; -import org.jeecg.modules.system.entity.SysComment; +import org.jeecg.modules.base.entity.postgre.SysComment; import org.jeecg.modules.system.service.ISysCommentService; import org.jeecg.modules.system.vo.SysCommentFileVo; import org.jeecg.modules.system.vo.SysCommentVO; diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/controller/SysDataLogController.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/controller/SysDataLogController.java index 9523e70c..a4afc18e 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/controller/SysDataLogController.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/controller/SysDataLogController.java @@ -9,7 +9,7 @@ import org.jeecg.common.api.vo.Result; import org.jeecg.common.constant.CommonConstant; import org.jeecg.common.system.query.QueryGenerator; import org.jeecg.common.util.oConvertUtils; -import org.jeecg.modules.system.entity.SysDataLog; +import org.jeecg.modules.base.entity.postgre.SysDataLog; import org.jeecg.modules.system.service.ISysDataLogService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.RequestMapping; diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/controller/SysDataSourceController.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/controller/SysDataSourceController.java index 6bc52d10..988eab8e 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/controller/SysDataSourceController.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/controller/SysDataSourceController.java @@ -3,9 +3,6 @@ package org.jeecg.modules.system.controller; import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; -import com.baomidou.dynamic.datasource.DynamicRoutingDataSource; -import com.baomidou.dynamic.datasource.creator.DruidDataSourceCreator; -import com.baomidou.dynamic.datasource.spring.boot.autoconfigure.DataSourceProperty; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; @@ -13,8 +10,6 @@ import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang.StringUtils; -import org.apache.shiro.authz.annotation.RequiresPermissions; -import org.apache.shiro.authz.annotation.RequiresRoles; import org.jeecg.common.api.vo.Result; import org.jeecg.common.aspect.annotation.AutoLog; import org.jeecg.common.config.TenantContext; @@ -25,7 +20,7 @@ import org.jeecg.common.util.dynamic.db.DataSourceCachePool; import org.jeecg.common.util.oConvertUtils; import org.jeecg.common.util.security.JdbcSecurityUtil; import org.jeecg.config.mybatis.MybatisPlusSaasConfig; -import org.jeecg.modules.system.entity.SysDataSource; +import org.jeecg.modules.base.entity.postgre.SysDataSource; import org.jeecg.modules.system.service.ISysDataSourceService; import org.jeecg.modules.system.util.SecurityUtil; import org.springframework.beans.factory.annotation.Autowired; @@ -34,7 +29,6 @@ import org.springframework.web.servlet.ModelAndView; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import javax.sql.DataSource; import java.util.Arrays; import java.util.List; diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/controller/SysDepartController.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/controller/SysDepartController.java index 8ff7db31..0fb844e8 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/controller/SysDepartController.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/controller/SysDepartController.java @@ -6,7 +6,6 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.StringUtils; import org.apache.shiro.SecurityUtils; -import org.apache.shiro.authz.annotation.RequiresPermissions; import org.jeecg.common.api.vo.Result; import org.jeecg.common.config.TenantContext; import org.jeecg.common.constant.CacheConstant; @@ -18,8 +17,8 @@ import org.jeecg.common.util.ImportExcelUtil; import org.jeecg.common.util.YouBianCodeUtil; import org.jeecg.common.util.oConvertUtils; import org.jeecg.config.mybatis.MybatisPlusSaasConfig; -import org.jeecg.modules.system.entity.SysDepart; -import org.jeecg.modules.system.entity.SysUser; +import org.jeecg.modules.base.entity.postgre.SysDepart; +import org.jeecg.modules.base.entity.postgre.SysUser; import org.jeecg.modules.system.model.DepartIdModel; import org.jeecg.modules.system.model.SysDepartTreeModel; import org.jeecg.modules.system.service.ISysDepartService; diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/controller/SysDepartPermissionController.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/controller/SysDepartPermissionController.java index 219be7fe..8f1175ba 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/controller/SysDepartPermissionController.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/controller/SysDepartPermissionController.java @@ -2,7 +2,6 @@ package org.jeecg.modules.system.controller; import java.util.*; import java.util.stream.Collectors; -import javax.annotation.Resource; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; @@ -12,14 +11,13 @@ import org.apache.shiro.SecurityUtils; import org.jeecg.common.api.vo.Result; import org.jeecg.common.constant.CommonConstant; import org.jeecg.common.system.query.QueryGenerator; -import org.jeecg.common.aspect.annotation.AutoLog; import org.jeecg.common.system.vo.LoginUser; import org.jeecg.common.util.oConvertUtils; import org.jeecg.modules.base.service.BaseCommonService; -import org.jeecg.modules.system.entity.SysDepartPermission; -import org.jeecg.modules.system.entity.SysDepartRolePermission; -import org.jeecg.modules.system.entity.SysPermission; -import org.jeecg.modules.system.entity.SysPermissionDataRule; +import org.jeecg.modules.base.entity.postgre.SysDepartPermission; +import org.jeecg.modules.base.entity.postgre.SysDepartRolePermission; +import org.jeecg.modules.base.entity.postgre.SysPermission; +import org.jeecg.modules.base.entity.postgre.SysPermissionDataRule; import org.jeecg.modules.system.model.TreeModel; import org.jeecg.modules.system.service.ISysDepartPermissionService; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/controller/SysDepartRoleController.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/controller/SysDepartRoleController.java index 30fb5f70..627ca23f 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/controller/SysDepartRoleController.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/controller/SysDepartRoleController.java @@ -2,23 +2,23 @@ package org.jeecg.modules.system.controller; import java.util.*; import java.util.stream.Collectors; -import javax.annotation.Resource; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import org.apache.shiro.SecurityUtils; -import org.apache.shiro.authz.annotation.RequiresPermissions; -import org.apache.shiro.authz.annotation.RequiresRoles; import org.jeecg.common.api.vo.Result; import org.jeecg.common.constant.CommonConstant; import org.jeecg.common.system.query.QueryGenerator; import org.jeecg.common.aspect.annotation.AutoLog; import org.jeecg.common.system.vo.LoginUser; import org.jeecg.common.util.oConvertUtils; +import org.jeecg.modules.base.entity.postgre.SysDepartRole; +import org.jeecg.modules.base.entity.postgre.SysDepartRolePermission; +import org.jeecg.modules.base.entity.postgre.SysDepartRoleUser; +import org.jeecg.modules.base.entity.postgre.SysPermissionDataRule; import org.jeecg.modules.base.service.BaseCommonService; -import org.jeecg.modules.system.entity.*; import org.jeecg.modules.system.service.*; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; @@ -209,7 +209,7 @@ public class SysDepartRoleController extends JeecgController> getDeptRoleByUserId(@RequestParam(value = "userId") String userId,@RequestParam(value = "departId") String departId){ + public Result> getDeptRoleByUserId(@RequestParam(value = "userId") String userId, @RequestParam(value = "departId") String departId){ Result> result = new Result<>(); //查询部门下角色 List roleList = sysDepartRoleService.list(new QueryWrapper().eq("depart_id",departId)); diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/controller/SysDictController.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/controller/SysDictController.java index 3d836e25..cbb6088e 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/controller/SysDictController.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/controller/SysDictController.java @@ -8,7 +8,6 @@ import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import lombok.extern.slf4j.Slf4j; import org.apache.shiro.SecurityUtils; -import org.apache.shiro.authz.annotation.RequiresPermissions; import org.jeecg.common.api.vo.Result; import org.jeecg.common.config.TenantContext; import org.jeecg.common.constant.CacheConstant; @@ -20,9 +19,9 @@ import org.jeecg.common.system.vo.DictQuery; import org.jeecg.common.system.vo.LoginUser; import org.jeecg.common.util.*; import org.jeecg.config.mybatis.MybatisPlusSaasConfig; -import org.jeecg.modules.system.entity.GardsStations; -import org.jeecg.modules.system.entity.SysDict; -import org.jeecg.modules.system.entity.SysDictItem; +import org.jeecg.modules.base.entity.configuration.GardsStations; +import org.jeecg.modules.base.entity.postgre.SysDict; +import org.jeecg.modules.base.entity.postgre.SysDictItem; import org.jeecg.modules.system.model.SysDictTree; import org.jeecg.modules.system.model.TreeSelectModel; import org.jeecg.modules.system.security.DictQueryBlackListHandler; diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/controller/SysDictItemController.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/controller/SysDictItemController.java index 6cc67a16..6cba3621 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/controller/SysDictItemController.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/controller/SysDictItemController.java @@ -2,22 +2,17 @@ package org.jeecg.modules.system.controller; import java.util.*; -import java.util.stream.Collectors; import javax.servlet.http.HttpServletRequest; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import com.baomidou.mybatisplus.core.toolkit.CollectionUtils; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.apache.commons.lang.StringUtils; -import org.apache.shiro.authz.annotation.RequiresPermissions; -import org.apache.shiro.authz.annotation.RequiresRoles; import org.jeecg.common.api.vo.Result; import org.jeecg.common.constant.CacheConstant; import org.jeecg.common.system.query.QueryGenerator; -import org.jeecg.common.util.oConvertUtils; -import org.jeecg.modules.system.entity.SysDictItem; +import org.jeecg.modules.base.entity.postgre.SysDictItem; import org.jeecg.modules.system.service.ISysDictItemService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.cache.annotation.CacheEvict; diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/controller/SysFilesController.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/controller/SysFilesController.java index 45b31487..b9a3e80b 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/controller/SysFilesController.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/controller/SysFilesController.java @@ -10,7 +10,7 @@ import org.jeecg.common.api.vo.Result; import org.jeecg.common.aspect.annotation.AutoLog; import org.jeecg.common.system.base.controller.JeecgController; import org.jeecg.common.system.query.QueryGenerator; -import org.jeecg.modules.system.entity.SysFiles; +import org.jeecg.modules.base.entity.postgre.SysFiles; import org.jeecg.modules.system.service.ISysFilesService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/controller/SysFillRuleController.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/controller/SysFillRuleController.java index 29354fb8..e3a62984 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/controller/SysFillRuleController.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/controller/SysFillRuleController.java @@ -13,7 +13,7 @@ import org.jeecg.common.aspect.annotation.AutoLog; import org.jeecg.common.system.base.controller.JeecgController; import org.jeecg.common.system.query.QueryGenerator; import org.jeecg.common.util.FillRuleUtil; -import org.jeecg.modules.system.entity.SysFillRule; +import org.jeecg.modules.base.entity.postgre.SysFillRule; import org.jeecg.modules.system.service.ISysFillRuleService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/controller/SysFormFileController.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/controller/SysFormFileController.java index 33dca546..c1dc1b9e 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/controller/SysFormFileController.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/controller/SysFormFileController.java @@ -10,7 +10,7 @@ import org.jeecg.common.api.vo.Result; import org.jeecg.common.aspect.annotation.AutoLog; import org.jeecg.common.system.base.controller.JeecgController; import org.jeecg.common.system.query.QueryGenerator; -import org.jeecg.modules.system.entity.SysFormFile; +import org.jeecg.modules.base.entity.postgre.SysFormFile; import org.jeecg.modules.system.service.ISysFormFileService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/controller/SysGatewayRouteController.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/controller/SysGatewayRouteController.java index 5bdedef8..d3fa05ae 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/controller/SysGatewayRouteController.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/controller/SysGatewayRouteController.java @@ -5,12 +5,10 @@ import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import io.swagger.annotations.Api; import lombok.extern.slf4j.Slf4j; -import org.apache.shiro.authz.annotation.RequiresPermissions; -import org.apache.shiro.authz.annotation.RequiresRoles; import org.jeecg.common.api.vo.Result; import org.jeecg.common.system.base.controller.JeecgController; import org.jeecg.common.util.oConvertUtils; -import org.jeecg.modules.system.entity.SysGatewayRoute; +import org.jeecg.modules.base.entity.postgre.SysGatewayRoute; import org.jeecg.modules.system.service.ISysGatewayRouteService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/controller/SysLogController.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/controller/SysLogController.java index 1853a7f2..372d3c9a 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/controller/SysLogController.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/controller/SysLogController.java @@ -6,11 +6,10 @@ import java.util.Arrays; import javax.servlet.http.HttpServletRequest; import org.jeecg.common.api.vo.Result; -import org.jeecg.common.constant.CommonConstant; import org.jeecg.common.system.query.QueryGenerator; import org.jeecg.common.util.oConvertUtils; -import org.jeecg.modules.system.entity.SysLog; -import org.jeecg.modules.system.entity.SysRole; +import org.jeecg.modules.base.entity.postgre.SysLog; +import org.jeecg.modules.base.entity.postgre.SysRole; import org.jeecg.modules.system.service.ISysLogService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.RequestMapping; diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/controller/SysPermissionController.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/controller/SysPermissionController.java index bc3ef5cf..3b6043c3 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/controller/SysPermissionController.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/controller/SysPermissionController.java @@ -1,15 +1,11 @@ package org.jeecg.modules.system.controller; -import cn.hutool.core.util.ObjectUtil; import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import lombok.extern.slf4j.Slf4j; -import org.apache.commons.lang3.StringUtils; import org.apache.shiro.SecurityUtils; -import org.apache.shiro.authz.annotation.RequiresPermissions; -import org.apache.shiro.authz.annotation.RequiresRoles; import org.jeecg.common.api.vo.Result; import org.jeecg.common.constant.CommonConstant; import org.jeecg.common.constant.SymbolConstant; @@ -18,8 +14,11 @@ import org.jeecg.common.system.vo.LoginUser; import org.jeecg.common.util.Md5Util; import org.jeecg.common.util.oConvertUtils; import org.jeecg.config.JeecgBaseConfig; +import org.jeecg.modules.base.entity.postgre.SysDepartPermission; +import org.jeecg.modules.base.entity.postgre.SysPermission; +import org.jeecg.modules.base.entity.postgre.SysPermissionDataRule; +import org.jeecg.modules.base.entity.postgre.SysRolePermission; import org.jeecg.modules.base.service.BaseCommonService; -import org.jeecg.modules.system.entity.*; import org.jeecg.modules.system.model.SysPermissionTree; import org.jeecg.modules.system.model.TreeModel; import org.jeecg.modules.system.service.*; diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/controller/SysPositionController.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/controller/SysPositionController.java index e8c1fcd7..9646381c 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/controller/SysPositionController.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/controller/SysPositionController.java @@ -18,7 +18,7 @@ import org.jeecg.common.system.vo.LoginUser; import org.jeecg.common.util.ImportExcelUtil; import org.jeecg.common.util.oConvertUtils; import org.jeecg.config.mybatis.MybatisPlusSaasConfig; -import org.jeecg.modules.system.entity.SysPosition; +import org.jeecg.modules.base.entity.postgre.SysPosition; import org.jeecg.modules.system.service.ISysPositionService; import org.jeecg.modules.system.service.ISysUserService; import org.jeecgframework.poi.excel.ExcelImportUtil; @@ -41,7 +41,6 @@ import java.util.ArrayList; import java.util.Arrays; import java.util.List; import java.util.Map; -import java.util.stream.Collectors; /** * @Description: 职务表 diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/controller/SysRoleController.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/controller/SysRoleController.java index 55a477db..83de8bc3 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/controller/SysRoleController.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/controller/SysRoleController.java @@ -1,10 +1,8 @@ package org.jeecg.modules.system.controller; -import java.io.File; import java.io.IOException; import java.util.ArrayList; -import java.util.Arrays; import java.util.Date; import java.util.HashMap; import java.util.List; @@ -13,23 +11,22 @@ import java.util.Map; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import com.baomidou.mybatisplus.extension.plugins.pagination.PageDTO; -import org.apache.shiro.authz.annotation.RequiresPermissions; import org.jeecg.common.api.vo.Result; import org.jeecg.common.config.TenantContext; import org.jeecg.common.constant.CommonConstant; import org.jeecg.common.system.query.QueryGenerator; import org.jeecg.common.util.oConvertUtils; import org.jeecg.config.mybatis.MybatisPlusSaasConfig; -import org.jeecg.modules.system.entity.*; +import org.jeecg.modules.base.entity.postgre.SysPermission; +import org.jeecg.modules.base.entity.postgre.SysPermissionDataRule; +import org.jeecg.modules.base.entity.postgre.SysRole; +import org.jeecg.modules.base.entity.postgre.SysRolePermission; import org.jeecg.modules.system.model.TreeModel; import org.jeecg.modules.system.service.*; -import org.jeecg.modules.system.vo.SysUserRoleCountVo; import org.jeecgframework.poi.excel.def.NormalExcelConstants; import org.jeecgframework.poi.excel.entity.ExportParams; import org.jeecgframework.poi.excel.entity.ImportParams; import org.jeecgframework.poi.excel.view.JeecgEntityExcelView; -import org.springframework.beans.BeanUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PathVariable; @@ -90,9 +87,9 @@ public class SysRoleController { //@RequiresPermissions("system:role:list") @RequestMapping(value = "/list", method = RequestMethod.GET) public Result> queryPageList(SysRole role, - @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, - @RequestParam(name="pageSize", defaultValue="10") Integer pageSize, - HttpServletRequest req) { + @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, + @RequestParam(name="pageSize", defaultValue="10") Integer pageSize, + HttpServletRequest req) { Result> result = new Result>(); QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(role, req.getParameterMap()); Page page = new Page(pageNo, pageSize); diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/controller/SysRoleIndexController.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/controller/SysRoleIndexController.java index eb349f3f..780b4168 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/controller/SysRoleIndexController.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/controller/SysRoleIndexController.java @@ -5,12 +5,10 @@ import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import org.apache.shiro.authz.annotation.RequiresPermissions; -import org.apache.shiro.authz.annotation.RequiresRoles; import org.jeecg.common.api.vo.Result; import org.jeecg.common.system.query.QueryGenerator; import org.jeecg.common.aspect.annotation.AutoLog; -import org.jeecg.modules.system.entity.SysRoleIndex; +import org.jeecg.modules.base.entity.postgre.SysRoleIndex; import org.jeecg.modules.system.service.ISysRoleIndexService; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/controller/SysTaskController.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/controller/SysTaskController.java index b9a67724..88f27980 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/controller/SysTaskController.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/controller/SysTaskController.java @@ -1,40 +1,28 @@ package org.jeecg.modules.system.controller; -import com.baomidou.mybatisplus.core.toolkit.CollectionUtils; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.extern.slf4j.Slf4j; -import org.apache.poi.ss.usermodel.Workbook; import org.jeecg.common.Excel.ImportExcel; import org.jeecg.common.api.vo.Result; -import org.jeecg.common.util.DateUtils; import org.jeecg.config.valid.InsertGroup; import org.jeecg.config.valid.UpdateGroup; -import org.jeecg.modules.system.entity.SysTask; -import org.jeecg.modules.system.entity.SysTaskStation; +import org.jeecg.modules.base.entity.postgre.SysTask; import org.jeecg.modules.system.entity.vo.ImportViewVo; import org.jeecg.modules.system.entity.vo.SysTaskChangeVo; import org.jeecg.modules.system.entity.vo.SysTaskExportVo; import org.jeecg.modules.system.entity.vo.SysTaskVo; import org.jeecg.modules.system.service.ISysTaskService; -import org.jeecgframework.poi.excel.ExcelExportUtil; -import org.jeecgframework.poi.excel.entity.ExportParams; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.format.annotation.DateTimeFormat; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; import org.springframework.web.multipart.MultipartFile; -import javax.servlet.ServletOutputStream; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import java.io.FileOutputStream; import java.io.IOException; -import java.io.UnsupportedEncodingException; -import java.net.URLEncoder; import java.text.ParseException; -import java.text.SimpleDateFormat; -import java.time.LocalDate; import java.util.*; @Slf4j diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/controller/SysTenantController.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/controller/SysTenantController.java index 9ad486cf..48e0c8ba 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/controller/SysTenantController.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/controller/SysTenantController.java @@ -8,7 +8,6 @@ import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import lombok.extern.slf4j.Slf4j; import org.apache.shiro.SecurityUtils; -import org.apache.shiro.authz.annotation.RequiresPermissions; import org.jeecg.common.api.vo.Result; import org.jeecg.common.aspect.annotation.PermissionData; import org.jeecg.common.config.TenantContext; @@ -20,8 +19,8 @@ import org.jeecg.common.util.PasswordUtil; import org.jeecg.common.util.TokenUtils; import org.jeecg.common.util.oConvertUtils; import org.jeecg.config.mybatis.MybatisPlusSaasConfig; +import org.jeecg.modules.base.entity.postgre.*; import org.jeecg.modules.base.service.BaseCommonService; -import org.jeecg.modules.system.entity.*; import org.jeecg.modules.system.service.ISysTenantPackService; import org.jeecg.modules.system.service.ISysTenantService; import org.jeecg.modules.system.service.ISysUserService; diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/controller/SysUserAgentController.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/controller/SysUserAgentController.java index cd6daeed..d031696e 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/controller/SysUserAgentController.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/controller/SysUserAgentController.java @@ -1,8 +1,6 @@ package org.jeecg.modules.system.controller; import java.io.IOException; -import java.io.UnsupportedEncodingException; -import java.net.URLDecoder; import java.util.Arrays; import java.util.List; import java.util.Map; @@ -14,8 +12,7 @@ import org.apache.shiro.SecurityUtils; import org.jeecg.common.api.vo.Result; import org.jeecg.common.system.query.QueryGenerator; import org.jeecg.common.system.vo.LoginUser; -import org.jeecg.common.util.oConvertUtils; -import org.jeecg.modules.system.entity.SysUserAgent; +import org.jeecg.modules.base.entity.postgre.SysUserAgent; import org.jeecg.modules.system.service.ISysUserAgentService; import org.jeecgframework.poi.excel.ExcelImportUtil; import org.jeecgframework.poi.excel.def.NormalExcelConstants; @@ -27,7 +24,6 @@ import org.springframework.beans.factory.annotation.Value; import org.springframework.web.bind.annotation.DeleteMapping; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.PutMapping; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMethod; @@ -37,7 +33,6 @@ import org.springframework.web.multipart.MultipartFile; import org.springframework.web.multipart.MultipartHttpServletRequest; import org.springframework.web.servlet.ModelAndView; -import com.alibaba.fastjson.JSON; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/controller/SysUserController.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/controller/SysUserController.java index a1d96a43..8bb56fbb 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/controller/SysUserController.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/controller/SysUserController.java @@ -9,12 +9,10 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; -import com.baomidou.mybatisplus.core.toolkit.CollectionUtils; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang.StringUtils; import org.apache.shiro.SecurityUtils; -import org.apache.shiro.authz.annotation.RequiresPermissions; import org.apache.shiro.authz.annotation.RequiresRoles; import org.jeecg.common.api.vo.Result; import org.jeecg.common.aspect.annotation.PermissionData; @@ -22,12 +20,13 @@ import org.jeecg.common.config.TenantContext; import org.jeecg.common.constant.CommonConstant; import org.jeecg.common.constant.SymbolConstant; import org.jeecg.config.mybatis.MybatisPlusSaasConfig; +import org.jeecg.modules.base.entity.postgre.*; import org.jeecg.modules.base.service.BaseCommonService; import org.jeecg.common.system.query.QueryGenerator; import org.jeecg.common.system.util.JwtUtil; import org.jeecg.common.system.vo.LoginUser; import org.jeecg.common.util.*; -import org.jeecg.modules.system.entity.*; +import org.jeecg.modules.base.entity.postgre.SysUser; import org.jeecg.modules.system.model.DepartIdModel; import org.jeecg.modules.system.model.SysUserSysDepartModel; import org.jeecg.modules.system.service.*; @@ -268,8 +267,7 @@ public class SysUserController { String[] arr = ids.split(","); for (String id : arr) { if(oConvertUtils.isNotEmpty(id)) { - this.sysUserService.update(new SysUser().setStatus(Integer.parseInt(status)), - new UpdateWrapper().lambda().eq(SysUser::getId,id)); + this.sysUserService.update(new SysUser().setStatus(Integer.parseInt(status)), new UpdateWrapper().lambda().eq(SysUser::getId,id)); } } } catch (Exception e) { diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/controller/ThirdLoginController.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/controller/ThirdLoginController.java index 22ee91a1..9af3b228 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/controller/ThirdLoginController.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/controller/ThirdLoginController.java @@ -1,6 +1,5 @@ package org.jeecg.modules.system.controller; -import cn.hutool.core.util.RandomUtil; import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.xkcoding.justauth.AuthRequestFactory; @@ -17,8 +16,8 @@ import org.jeecg.common.util.*; import org.jeecg.config.thirdapp.ThirdAppConfig; import org.jeecg.config.thirdapp.ThirdAppTypeItemVo; import org.jeecg.modules.base.service.BaseCommonService; -import org.jeecg.modules.system.entity.SysThirdAccount; -import org.jeecg.modules.system.entity.SysUser; +import org.jeecg.modules.base.entity.postgre.SysThirdAccount; +import org.jeecg.modules.base.entity.postgre.SysUser; import org.jeecg.modules.system.model.ThirdLoginModel; import org.jeecg.modules.system.service.ISysDictService; import org.jeecg.modules.system.service.ISysThirdAccountService; @@ -35,7 +34,6 @@ import javax.servlet.http.HttpServletResponse; import java.io.IOException; import java.io.UnsupportedEncodingException; import java.net.URLEncoder; -import java.util.Date; import java.util.List; /** diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/entity/SysRole.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/entity/SysRole.java deleted file mode 100644 index 61631234..00000000 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/entity/SysRole.java +++ /dev/null @@ -1,83 +0,0 @@ -package org.jeecg.modules.system.entity; - -import java.io.Serializable; -import java.time.LocalDateTime; -import java.util.Date; - -import org.jeecgframework.poi.excel.annotation.Excel; -import org.springframework.format.annotation.DateTimeFormat; - -import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableId; -import com.fasterxml.jackson.annotation.JsonFormat; - -import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.experimental.Accessors; - -/** - *

- * 角色表 - *

- * - * @Author scott - * @since 2018-12-19 - */ -@Data -@EqualsAndHashCode(callSuper = false) -@Accessors(chain = true) -public class SysRole implements Serializable { - - private static final long serialVersionUID = 1L; - - /** - * id - */ - @TableId(type = IdType.ASSIGN_ID) - private String id; - - /** - * 角色名称 - */ - @Excel(name="角色名",width=15) - private String roleName; - - /** - * 角色编码 - */ - @Excel(name="角色编码",width=15) - private String roleCode; - - /** - * 描述 - */ - @Excel(name="描述",width=60) - private String description; - - /** - * 创建人 - */ - private String createBy; - - /** - * 创建时间 - */ - @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") - @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") - private Date createTime; - - /** - * 更新人 - */ - private String updateBy; - - /** - * 更新时间 - */ - @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") - @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") - private Date updateTime; - - /**租户ID*/ - private java.lang.Integer tenantId; -} diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/entity/SysUser.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/entity/SysUser.java deleted file mode 100644 index 7cf1dd92..00000000 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/entity/SysUser.java +++ /dev/null @@ -1,211 +0,0 @@ -package org.jeecg.modules.system.entity; - -import java.util.Date; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableLogic; -import com.fasterxml.jackson.annotation.JsonProperty; -import org.jeecg.common.aspect.annotation.Dict; -import org.jeecgframework.poi.excel.annotation.Excel; -import org.springframework.format.annotation.DateTimeFormat; - -import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableId; -import com.fasterxml.jackson.annotation.JsonFormat; - -import java.io.Serializable; -import java.util.List; - -import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.experimental.Accessors; - -/** - *

- * 用户表 - *

- * - * @Author scott - * @since 2018-12-20 - */ -@Data -@EqualsAndHashCode(callSuper = false) -@Accessors(chain = true) -public class SysUser implements Serializable { - - private static final long serialVersionUID = 1L; - - /** - * id - */ - @TableId(type = IdType.ASSIGN_ID) - private String id; - - /** - * 登录账号 - */ - @Excel(name = "登录账号", width = 15) - private String username; - - /** - * 真实姓名 - */ - @Excel(name = "真实姓名", width = 15) - private String realname; - - /** - * 密码 - */ - @JsonProperty(access = JsonProperty.Access.WRITE_ONLY) - private String password; - - /** - * md5密码盐 - */ - @JsonProperty(access = JsonProperty.Access.WRITE_ONLY) - private String salt; - - /** - * 头像 - */ - @Excel(name = "头像", width = 15,type = 2) - private String avatar; - - /** - * 生日 - */ - @Excel(name = "生日", width = 15, format = "yyyy-MM-dd") - @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd") - @DateTimeFormat(pattern = "yyyy-MM-dd") - private Date birthday; - - /** - * 性别（1：男 2：女） - */ - @Excel(name = "性别", width = 15,dicCode="sex") - @Dict(dicCode = "sex") - private Integer sex; - - /** - * 电子邮件 - */ - @Excel(name = "电子邮件", width = 15) - private String email; - - /** - * 电话 - */ - @Excel(name = "电话", width = 15) - private String phone; - - /** - * 登录选择部门编码 - */ - private String orgCode; - /** - * 登录选择租户ID - */ - private Integer loginTenantId; - - /**部门名称*/ - private transient String orgCodeTxt; - - /** - * 状态(1：正常 2：冻结 ） - */ - @Excel(name = "状态", width = 15,dicCode="user_status") - @Dict(dicCode = "user_status") - private Integer status; - - /** - * 删除状态（0，正常，1已删除） - */ - @Excel(name = "删除状态", width = 15,dicCode="del_flag") - @TableLogic - private Integer delFlag; - - /** - * 工号，唯一键 - */ - @Excel(name = "工号", width = 15) - private String workNo; - - /** - * 职务，关联职务表 - */ - @Excel(name = "职务", width = 15) - @Dict(dictTable ="sys_position",dicText = "name",dicCode = "code") - private String post; - - /** - * 座机号 - */ - @Excel(name = "座机号", width = 15) - private String telephone; - - /** - * 创建人 - */ - private String createBy; - - /** - * 创建时间 - */ - private Date createTime; - - /** - * 更新人 - */ - private String updateBy; - - /** - * 更新时间 - */ - private Date updateTime; - /** - * 同步工作流引擎1同步0不同步 - */ - private Integer activitiSync; - - /** - * 身份（0 普通成员 1 上级） - */ - @Excel(name="（1普通成员 2上级）",width = 15) - private Integer userIdentity; - - /** - * 负责部门 - */ - @Excel(name="负责部门",width = 15,dictTable ="sys_depart",dicText = "depart_name",dicCode = "id") - @Dict(dictTable ="sys_depart",dicText = "depart_name",dicCode = "id") - private String departIds; - - /** - * 多租户ids临时用，不持久化数据库(数据库字段不存在) - */ - @TableField(exist = false) - private String relTenantIds; - - /**设备id uniapp推送用*/ - private String clientId; - - /** - * 登录首页地址 - */ - @TableField(exist = false) - private String homePath; - - /** - * 职位名称 - */ - @TableField(exist = false) - private String postText; - - @TableField(exist = false) - private List roles; - - /** - * 流程状态 - */ - private String bpmStatus; -} diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/entity/vo/SysTaskVo.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/entity/vo/SysTaskVo.java index 7e9e30b6..d35406f4 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/entity/vo/SysTaskVo.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/entity/vo/SysTaskVo.java @@ -1,7 +1,7 @@ package org.jeecg.modules.system.entity.vo; import lombok.Data; -import org.jeecg.modules.system.entity.SysTaskStation; +import org.jeecg.modules.base.entity.postgre.SysTaskStation; import org.springframework.format.annotation.DateTimeFormat; import java.util.Date; diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/mapper/GardsDetectorsMapper.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/mapper/GardsDetectorsMapper.java index fa056350..7fef8c6a 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/mapper/GardsDetectorsMapper.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/mapper/GardsDetectorsMapper.java @@ -2,7 +2,7 @@ package org.jeecg.modules.system.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import org.jeecg.modules.system.entity.GardsDetectors; +import org.jeecg.modules.base.entity.configuration.GardsDetectors; import java.util.List; diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/mapper/GardsNuclearfacilityMapper.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/mapper/GardsNuclearfacilityMapper.java index eb05b898..fb2c4a33 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/mapper/GardsNuclearfacilityMapper.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/mapper/GardsNuclearfacilityMapper.java @@ -1,7 +1,7 @@ package org.jeecg.modules.system.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import org.jeecg.modules.system.entity.GardsNuclearfacility; +import org.jeecg.modules.base.entity.configuration.GardsNuclearfacility; import java.util.List; diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/mapper/GardsSampleDataMapper.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/mapper/GardsSampleDataMapper.java index eef52594..53b693cd 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/mapper/GardsSampleDataMapper.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/mapper/GardsSampleDataMapper.java @@ -1,7 +1,7 @@ package org.jeecg.modules.system.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import org.jeecg.modules.base.entity.GardsSampleData; +import org.jeecg.modules.base.entity.original.GardsSampleData; public interface GardsSampleDataMapper extends BaseMapper { } diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/mapper/GardsStationsMapper.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/mapper/GardsStationsMapper.java index 973d4180..1fb19eaa 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/mapper/GardsStationsMapper.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/mapper/GardsStationsMapper.java @@ -1,7 +1,7 @@ package org.jeecg.modules.system.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import org.jeecg.modules.system.entity.GardsStations; +import org.jeecg.modules.base.entity.configuration.GardsStations; import java.util.List; diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/mapper/SysAnnouncementMapper.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/mapper/SysAnnouncementMapper.java index 33358657..46e3c3c5 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/mapper/SysAnnouncementMapper.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/mapper/SysAnnouncementMapper.java @@ -4,7 +4,7 @@ import java.util.Date; import java.util.List; import org.apache.ibatis.annotations.Param; -import org.jeecg.modules.system.entity.SysAnnouncement; +import org.jeecg.modules.base.entity.postgre.SysAnnouncement; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/mapper/SysAnnouncementSendMapper.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/mapper/SysAnnouncementSendMapper.java index 7871b628..e9af8505 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/mapper/SysAnnouncementSendMapper.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/mapper/SysAnnouncementSendMapper.java @@ -3,7 +3,7 @@ package org.jeecg.modules.system.mapper; import java.util.List; import org.apache.ibatis.annotations.Param; -import org.jeecg.modules.system.entity.SysAnnouncementSend; +import org.jeecg.modules.base.entity.postgre.SysAnnouncementSend; import org.jeecg.modules.system.model.AnnouncementSendModel; import com.baomidou.mybatisplus.core.mapper.BaseMapper; diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/mapper/SysCategoryMapper.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/mapper/SysCategoryMapper.java index efb194c3..38b04ed0 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/mapper/SysCategoryMapper.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/mapper/SysCategoryMapper.java @@ -5,7 +5,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Select; -import org.jeecg.modules.system.entity.SysCategory; +import org.jeecg.modules.base.entity.postgre.SysCategory; import org.jeecg.modules.system.model.TreeSelectModel; import java.util.List; diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/mapper/SysCheckRuleMapper.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/mapper/SysCheckRuleMapper.java index c017318b..6ff0baca 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/mapper/SysCheckRuleMapper.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/mapper/SysCheckRuleMapper.java @@ -1,7 +1,7 @@ package org.jeecg.modules.system.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import org.jeecg.modules.system.entity.SysCheckRule; +import org.jeecg.modules.base.entity.postgre.SysCheckRule; /** * @Description: 编码校验规则 diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/mapper/SysCommentMapper.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/mapper/SysCommentMapper.java index 63c3740c..ceb17b85 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/mapper/SysCommentMapper.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/mapper/SysCommentMapper.java @@ -3,7 +3,7 @@ package org.jeecg.modules.system.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import org.apache.ibatis.annotations.Param; -import org.jeecg.modules.system.entity.SysComment; +import org.jeecg.modules.base.entity.postgre.SysComment; import org.jeecg.modules.system.vo.SysCommentFileVo; import org.jeecg.modules.system.vo.SysCommentVO; import org.jeecg.modules.system.vo.UserAvatar; diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/mapper/SysDataLogMapper.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/mapper/SysDataLogMapper.java index 4bdcffd5..78f8e608 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/mapper/SysDataLogMapper.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/mapper/SysDataLogMapper.java @@ -1,7 +1,7 @@ package org.jeecg.modules.system.mapper; import org.apache.ibatis.annotations.Param; -import org.jeecg.modules.system.entity.SysDataLog; +import org.jeecg.modules.base.entity.postgre.SysDataLog; import com.baomidou.mybatisplus.core.mapper.BaseMapper; diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/mapper/SysDataSourceMapper.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/mapper/SysDataSourceMapper.java index 260bf41b..c1b15384 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/mapper/SysDataSourceMapper.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/mapper/SysDataSourceMapper.java @@ -1,7 +1,7 @@ package org.jeecg.modules.system.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import org.jeecg.modules.system.entity.SysDataSource; +import org.jeecg.modules.base.entity.postgre.SysDataSource; /** * @Description: 多数据源管理 diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/mapper/SysDepartMapper.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/mapper/SysDepartMapper.java index a8d84d9f..cf60311f 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/mapper/SysDepartMapper.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/mapper/SysDepartMapper.java @@ -5,9 +5,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import org.apache.ibatis.annotations.Select; import org.apache.ibatis.annotations.Update; -import org.jeecg.modules.system.entity.SysDepart; -import org.jeecg.modules.system.model.SysDepartTreeModel; -import org.jeecg.modules.system.model.TreeModel; +import org.jeecg.modules.base.entity.postgre.SysDepart; import org.springframework.data.repository.query.Param; import java.util.List; diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/mapper/SysDepartPermissionMapper.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/mapper/SysDepartPermissionMapper.java index bfc44f41..08cb22d3 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/mapper/SysDepartPermissionMapper.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/mapper/SysDepartPermissionMapper.java @@ -1,9 +1,6 @@ package org.jeecg.modules.system.mapper; -import java.util.List; - -import org.apache.ibatis.annotations.Param; -import org.jeecg.modules.system.entity.SysDepartPermission; +import org.jeecg.modules.base.entity.postgre.SysDepartPermission; import com.baomidou.mybatisplus.core.mapper.BaseMapper; /** diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/mapper/SysDepartRoleMapper.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/mapper/SysDepartRoleMapper.java index 8ee074ed..c2414136 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/mapper/SysDepartRoleMapper.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/mapper/SysDepartRoleMapper.java @@ -3,7 +3,7 @@ package org.jeecg.modules.system.mapper; import java.util.List; import org.apache.ibatis.annotations.Param; -import org.jeecg.modules.system.entity.SysDepartRole; +import org.jeecg.modules.base.entity.postgre.SysDepartRole; import com.baomidou.mybatisplus.core.mapper.BaseMapper; /** diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/mapper/SysDepartRolePermissionMapper.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/mapper/SysDepartRolePermissionMapper.java index 8fc98482..092699fc 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/mapper/SysDepartRolePermissionMapper.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/mapper/SysDepartRolePermissionMapper.java @@ -1,9 +1,6 @@ package org.jeecg.modules.system.mapper; -import java.util.List; - -import org.apache.ibatis.annotations.Param; -import org.jeecg.modules.system.entity.SysDepartRolePermission; +import org.jeecg.modules.base.entity.postgre.SysDepartRolePermission; import com.baomidou.mybatisplus.core.mapper.BaseMapper; /** diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/mapper/SysDepartRoleUserMapper.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/mapper/SysDepartRoleUserMapper.java index 9e57c6d7..287c93e2 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/mapper/SysDepartRoleUserMapper.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/mapper/SysDepartRoleUserMapper.java @@ -1,9 +1,6 @@ package org.jeecg.modules.system.mapper; -import java.util.List; - -import org.apache.ibatis.annotations.Param; -import org.jeecg.modules.system.entity.SysDepartRoleUser; +import org.jeecg.modules.base.entity.postgre.SysDepartRoleUser; import com.baomidou.mybatisplus.core.mapper.BaseMapper; /** diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/mapper/SysDictItemMapper.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/mapper/SysDictItemMapper.java index d53093e5..c5e1f858 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/mapper/SysDictItemMapper.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/mapper/SysDictItemMapper.java @@ -1,7 +1,7 @@ package org.jeecg.modules.system.mapper; import org.apache.ibatis.annotations.Select; -import org.jeecg.modules.system.entity.SysDictItem; +import org.jeecg.modules.base.entity.postgre.SysDictItem; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import java.util.List; diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/mapper/SysDictMapper.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/mapper/SysDictMapper.java index 49e51282..e7324d71 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/mapper/SysDictMapper.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/mapper/SysDictMapper.java @@ -10,7 +10,7 @@ import org.apache.ibatis.annotations.Update; import org.jeecg.common.system.vo.DictModel; import org.jeecg.common.system.vo.DictModelMany; import org.jeecg.common.system.vo.DictQuery; -import org.jeecg.modules.system.entity.SysDict; +import org.jeecg.modules.base.entity.postgre.SysDict; import org.jeecg.modules.system.model.DuplicateCheckVo; import org.jeecg.modules.system.model.TreeSelectModel; diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/mapper/SysFilesMapper.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/mapper/SysFilesMapper.java index 0ed7e17c..3203f3df 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/mapper/SysFilesMapper.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/mapper/SysFilesMapper.java @@ -1,7 +1,7 @@ package org.jeecg.modules.system.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import org.jeecg.modules.system.entity.SysFiles; +import org.jeecg.modules.base.entity.postgre.SysFiles; /** * @Description: 知识库-文档管理 diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/mapper/SysFillRuleMapper.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/mapper/SysFillRuleMapper.java index 51969548..7cfffd6b 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/mapper/SysFillRuleMapper.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/mapper/SysFillRuleMapper.java @@ -1,7 +1,7 @@ package org.jeecg.modules.system.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import org.jeecg.modules.system.entity.SysFillRule; +import org.jeecg.modules.base.entity.postgre.SysFillRule; /** * @Description: 填值规则 diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/mapper/SysFormFileMapper.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/mapper/SysFormFileMapper.java index 8287514c..c55e102b 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/mapper/SysFormFileMapper.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/mapper/SysFormFileMapper.java @@ -1,7 +1,7 @@ package org.jeecg.modules.system.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import org.jeecg.modules.system.entity.SysFormFile; +import org.jeecg.modules.base.entity.postgre.SysFormFile; /** * @Description: 表单评论文件 diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/mapper/SysGatewayRouteMapper.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/mapper/SysGatewayRouteMapper.java index 43cb00b8..5864ce72 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/mapper/SysGatewayRouteMapper.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/mapper/SysGatewayRouteMapper.java @@ -1,7 +1,7 @@ package org.jeecg.modules.system.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import org.jeecg.modules.system.entity.SysGatewayRoute; +import org.jeecg.modules.base.entity.postgre.SysGatewayRoute; /** * @Description: gateway路由管理 diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/mapper/SysLogMapper.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/mapper/SysLogMapper.java index f84d124b..3686b1b7 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/mapper/SysLogMapper.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/mapper/SysLogMapper.java @@ -5,7 +5,7 @@ import java.util.List; import java.util.Map; import org.apache.ibatis.annotations.Param; -import org.jeecg.modules.system.entity.SysLog; +import org.jeecg.modules.base.entity.postgre.SysLog; import com.baomidou.mybatisplus.core.mapper.BaseMapper; diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/mapper/SysPackPermissionMapper.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/mapper/SysPackPermissionMapper.java index 15cdaa85..a4b61bc7 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/mapper/SysPackPermissionMapper.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/mapper/SysPackPermissionMapper.java @@ -3,7 +3,7 @@ package org.jeecg.modules.system.mapper; import java.util.List; import org.apache.ibatis.annotations.Param; -import org.jeecg.modules.system.entity.SysPackPermission; +import org.jeecg.modules.base.entity.postgre.SysPackPermission; import com.baomidou.mybatisplus.core.mapper.BaseMapper; /** diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/mapper/SysPermissionDataRuleMapper.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/mapper/SysPermissionDataRuleMapper.java index 61a55a46..1d47ed50 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/mapper/SysPermissionDataRuleMapper.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/mapper/SysPermissionDataRuleMapper.java @@ -3,7 +3,7 @@ package org.jeecg.modules.system.mapper; import java.util.List; import org.apache.ibatis.annotations.Param; -import org.jeecg.modules.system.entity.SysPermissionDataRule; +import org.jeecg.modules.base.entity.postgre.SysPermissionDataRule; import com.baomidou.mybatisplus.core.mapper.BaseMapper; diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/mapper/SysPermissionMapper.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/mapper/SysPermissionMapper.java index d68abf65..02fe59ae 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/mapper/SysPermissionMapper.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/mapper/SysPermissionMapper.java @@ -5,7 +5,7 @@ import java.util.List; import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Select; import org.apache.ibatis.annotations.Update; -import org.jeecg.modules.system.entity.SysPermission; +import org.jeecg.modules.base.entity.postgre.SysPermission; import org.jeecg.modules.system.model.TreeModel; import com.baomidou.mybatisplus.core.mapper.BaseMapper; diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/mapper/SysPositionMapper.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/mapper/SysPositionMapper.java index eb9104b5..53dbf9e0 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/mapper/SysPositionMapper.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/mapper/SysPositionMapper.java @@ -1,7 +1,7 @@ package org.jeecg.modules.system.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import org.jeecg.modules.system.entity.SysPosition; +import org.jeecg.modules.base.entity.postgre.SysPosition; /** * @Description: 职务表 diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/mapper/SysRoleIndexMapper.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/mapper/SysRoleIndexMapper.java index 206f7b72..8559b7a4 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/mapper/SysRoleIndexMapper.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/mapper/SysRoleIndexMapper.java @@ -1,9 +1,6 @@ package org.jeecg.modules.system.mapper; -import java.util.List; - -import org.apache.ibatis.annotations.Param; -import org.jeecg.modules.system.entity.SysRoleIndex; +import org.jeecg.modules.base.entity.postgre.SysRoleIndex; import com.baomidou.mybatisplus.core.mapper.BaseMapper; /** diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/mapper/SysRoleMapper.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/mapper/SysRoleMapper.java index 00c96079..0327f225 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/mapper/SysRoleMapper.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/mapper/SysRoleMapper.java @@ -3,7 +3,7 @@ package org.jeecg.modules.system.mapper; import org.apache.ibatis.annotations.Delete; import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Update; -import org.jeecg.modules.system.entity.SysRole; +import org.jeecg.modules.base.entity.postgre.SysRole; import com.baomidou.mybatisplus.core.mapper.BaseMapper; diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/mapper/SysRolePermissionMapper.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/mapper/SysRolePermissionMapper.java index 25c08d27..25ba2366 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/mapper/SysRolePermissionMapper.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/mapper/SysRolePermissionMapper.java @@ -1,6 +1,6 @@ package org.jeecg.modules.system.mapper; -import org.jeecg.modules.system.entity.SysRolePermission; +import org.jeecg.modules.base.entity.postgre.SysRolePermission; import com.baomidou.mybatisplus.core.mapper.BaseMapper; /** diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/mapper/SysTaskMapper.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/mapper/SysTaskMapper.java index 1a63af38..93834794 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/mapper/SysTaskMapper.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/mapper/SysTaskMapper.java @@ -2,8 +2,8 @@ package org.jeecg.modules.system.mapper; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import org.jeecg.modules.system.entity.SysTask; -import org.jeecg.modules.system.entity.SysTaskStation; +import org.jeecg.modules.base.entity.postgre.SysTask; +import org.jeecg.modules.base.entity.postgre.SysTaskStation; import org.jeecg.modules.system.entity.vo.SysTaskVo; import java.util.List; diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/mapper/SysTaskStationMapper.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/mapper/SysTaskStationMapper.java index 045cfe8d..6ab48ef3 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/mapper/SysTaskStationMapper.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/mapper/SysTaskStationMapper.java @@ -1,7 +1,7 @@ package org.jeecg.modules.system.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import org.jeecg.modules.system.entity.SysTaskStation; +import org.jeecg.modules.base.entity.postgre.SysTaskStation; public interface SysTaskStationMapper extends BaseMapper { } diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/mapper/SysTenantMapper.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/mapper/SysTenantMapper.java index cad0c421..d2c57f24 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/mapper/SysTenantMapper.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/mapper/SysTenantMapper.java @@ -4,7 +4,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Select; -import org.jeecg.modules.system.entity.SysTenant; +import org.jeecg.modules.base.entity.postgre.SysTenant; import org.jeecg.modules.system.vo.tenant.TenantPackUser; import org.jeecg.modules.system.vo.tenant.TenantPackUserCount; import org.jeecg.modules.system.vo.tenant.UserDepart; diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/mapper/SysTenantPackMapper.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/mapper/SysTenantPackMapper.java index aae21d43..84c9e764 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/mapper/SysTenantPackMapper.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/mapper/SysTenantPackMapper.java @@ -1,7 +1,7 @@ package org.jeecg.modules.system.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import org.jeecg.modules.system.entity.SysTenantPack; +import org.jeecg.modules.base.entity.postgre.SysTenantPack; /** * @Description: 租户产品包 diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/mapper/SysTenantPackUserMapper.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/mapper/SysTenantPackUserMapper.java index e6e3a185..7753e84c 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/mapper/SysTenantPackUserMapper.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/mapper/SysTenantPackUserMapper.java @@ -1,7 +1,7 @@ package org.jeecg.modules.system.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import org.jeecg.modules.system.entity.SysTenantPackUser; +import org.jeecg.modules.base.entity.postgre.SysTenantPackUser; /** * @Description: 租户产品包用户关系 diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/mapper/SysThirdAccountMapper.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/mapper/SysThirdAccountMapper.java index 2d0b9157..69853f75 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/mapper/SysThirdAccountMapper.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/mapper/SysThirdAccountMapper.java @@ -2,7 +2,7 @@ package org.jeecg.modules.system.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import org.apache.ibatis.annotations.Param; -import org.jeecg.modules.system.entity.SysThirdAccount; +import org.jeecg.modules.base.entity.postgre.SysThirdAccount; import java.util.List; diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/mapper/SysUserAgentMapper.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/mapper/SysUserAgentMapper.java index 346933b9..a002a8d2 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/mapper/SysUserAgentMapper.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/mapper/SysUserAgentMapper.java @@ -1,9 +1,6 @@ package org.jeecg.modules.system.mapper; -import java.util.List; - -import org.apache.ibatis.annotations.Param; -import org.jeecg.modules.system.entity.SysUserAgent; +import org.jeecg.modules.base.entity.postgre.SysUserAgent; import com.baomidou.mybatisplus.core.mapper.BaseMapper; /** diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/mapper/SysUserDepartMapper.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/mapper/SysUserDepartMapper.java index 16ab3e95..29ab5302 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/mapper/SysUserDepartMapper.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/mapper/SysUserDepartMapper.java @@ -4,8 +4,8 @@ import java.util.List; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import org.apache.ibatis.annotations.Param; -import org.jeecg.modules.system.entity.SysUser; -import org.jeecg.modules.system.entity.SysUserDepart; +import org.jeecg.modules.base.entity.postgre.SysUser; +import org.jeecg.modules.base.entity.postgre.SysUserDepart; import com.baomidou.mybatisplus.core.mapper.BaseMapper; /** diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/mapper/SysUserMapper.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/mapper/SysUserMapper.java index a989f2cc..edcd17ed 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/mapper/SysUserMapper.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/mapper/SysUserMapper.java @@ -5,7 +5,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.toolkit.Constants; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import org.apache.ibatis.annotations.Param; -import org.jeecg.modules.system.entity.SysUser; +import org.jeecg.modules.base.entity.postgre.SysUser; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import org.jeecg.modules.system.model.SysUserSysDepartModel; import org.jeecg.modules.system.vo.SysUserDepVo; diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/mapper/SysUserRoleMapper.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/mapper/SysUserRoleMapper.java index 93154b87..f37d097d 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/mapper/SysUserRoleMapper.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/mapper/SysUserRoleMapper.java @@ -3,8 +3,8 @@ package org.jeecg.modules.system.mapper; import java.util.List; import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Select; -import org.jeecg.modules.system.entity.SysRole; -import org.jeecg.modules.system.entity.SysUserRole; +import org.jeecg.modules.base.entity.postgre.SysRole; +import org.jeecg.modules.base.entity.postgre.SysUserRole; import com.baomidou.mybatisplus.core.mapper.BaseMapper; /** diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/mapper/SysUserTenantMapper.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/mapper/SysUserTenantMapper.java index 74ebff23..5627ec46 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/mapper/SysUserTenantMapper.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/mapper/SysUserTenantMapper.java @@ -4,8 +4,8 @@ import java.util.List; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import org.apache.ibatis.annotations.Param; -import org.jeecg.modules.system.entity.SysUser; -import org.jeecg.modules.system.entity.SysUserTenant; +import org.jeecg.modules.base.entity.postgre.SysUser; +import org.jeecg.modules.base.entity.postgre.SysUserTenant; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import org.jeecg.modules.system.vo.SysUserTenantVo; diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/mapper/xml/GardsDetectorsMapper.xml b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/mapper/xml/GardsDetectorsMapper.xml index 905e33e8..adf1747b 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/mapper/xml/GardsDetectorsMapper.xml +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/mapper/xml/GardsDetectorsMapper.xml @@ -2,7 +2,7 @@ - SELECT DETECTOR_ID, DETECTOR_CODE, diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/mapper/xml/SysAnnouncementMapper.xml b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/mapper/xml/SysAnnouncementMapper.xml index c2a02b8e..10be8556 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/mapper/xml/SysAnnouncementMapper.xml +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/mapper/xml/SysAnnouncementMapper.xml @@ -2,7 +2,7 @@ - + diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/mapper/xml/SysDepartMapper.xml b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/mapper/xml/SysDepartMapper.xml index 4ec9d852..df407112 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/mapper/xml/SysDepartMapper.xml +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/mapper/xml/SysDepartMapper.xml @@ -2,12 +2,12 @@ - select * from sys_depart where id IN ( select dep_id from sys_user_depart where user_id = #{userId} ) - SELECT * FROM sys_depart WHERE id IN ( @@ -34,7 +34,7 @@ - SELECT * FROM sys_depart where del_flag = '0' @@ -48,12 +48,12 @@ - select * from sys_depart where del_flag = '0' and org_category='1' and org_code= #{orgCode,jdbcType=VARCHAR} - SELECT * FROM sys_depart WHERE del_flag = '0' @@ -78,7 +78,7 @@ - SELECT * FROM sys_depart WHERE diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/mapper/xml/SysDepartRoleMapper.xml b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/mapper/xml/SysDepartRoleMapper.xml index a9e3f058..12cbc170 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/mapper/xml/SysDepartRoleMapper.xml +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/mapper/xml/SysDepartRoleMapper.xml @@ -3,7 +3,7 @@ - SELECT * FROM sys_depart_role WHERE depart_id IN ( SELECT id FROM sys_depart WHERE id IN (SELECT dep_id FROM sys_user_depart WHERE user_id=#{userId}) AND org_code LIKE CONCAT(#{orgCode},'%') diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/mapper/xml/SysDictMapper.xml b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/mapper/xml/SysDictMapper.xml index d87729d2..2ca118bd 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/mapper/xml/SysDictMapper.xml +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/mapper/xml/SysDictMapper.xml @@ -222,7 +222,7 @@ - select id,dict_name,dict_code from sys_dict where del_flag = 0 diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/mapper/xml/SysPermissionMapper.xml b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/mapper/xml/SysPermissionMapper.xml index d31b94a1..35b7bb98 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/mapper/xml/SysPermissionMapper.xml +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/mapper/xml/SysPermissionMapper.xml @@ -12,7 +12,7 @@ - + @@ -121,7 +121,7 @@ - SELECT * FROM sys_permission where del_flag = 0 and id in ( diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/mapper/xml/SysTaskMapper.xml b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/mapper/xml/SysTaskMapper.xml index 19d1e6e3..75567827 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/mapper/xml/SysTaskMapper.xml +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/mapper/xml/SysTaskMapper.xml @@ -16,7 +16,7 @@ group by t.user_id,t.scheduling_date,t.id,u.username - SELECT t.user_id as userId, t.scheduling_date as schedulingDate, diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/mapper/xml/SysTenantMapper.xml b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/mapper/xml/SysTenantMapper.xml index edff252b..6810a96f 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/mapper/xml/SysTenantMapper.xml +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/mapper/xml/SysTenantMapper.xml @@ -3,7 +3,7 @@ - SELECT id,name,company_logo,house_number,status FROM sys_tenant WHERE del_flag = 1 diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/mapper/xml/SysThirdAccountMapper.xml b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/mapper/xml/SysThirdAccountMapper.xml index 51dace64..89f90720 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/mapper/xml/SysThirdAccountMapper.xml +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/mapper/xml/SysThirdAccountMapper.xml @@ -3,7 +3,7 @@ - SELECT third_user_id FROM sys_third_account INNER JOIN sys_user ON sys_user.id = sys_third_account.sys_user_id WHERE sys_third_account.third_type = #{thirdType} AND diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/mapper/xml/SysUserDepartMapper.xml b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/mapper/xml/SysUserDepartMapper.xml index 9887fe83..fe7ae98d 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/mapper/xml/SysUserDepartMapper.xml +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/mapper/xml/SysUserDepartMapper.xml @@ -1,14 +1,14 @@ - SELECT * FROM sys_user_depart WHERE user_id = #{userId, jdbcType=VARCHAR} - select a.* from sys_user a join sys_user_depart b on b.user_id = a.id join sys_depart c on b.dep_id = c.id @@ -22,7 +22,7 @@ - select a.*, c.depart_name as org_code_txt from sys_user a join sys_user_depart b on b.user_id = a.id join sys_depart c on b.dep_id = c.id @@ -39,7 +39,7 @@ - select DISTINCT a.* from sys_user a left join sys_user_depart b on b.user_id = a.id left join sys_depart c on b.dep_id = c.id @@ -56,7 +56,7 @@ - select DISTINCT a.* from sys_user a left join sys_user_depart b on b.user_id = a.id left join sys_depart c on b.dep_id = c.id @@ -88,7 +88,7 @@ - select * from sys_user_depart where user_id = #{userId} diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/mapper/xml/SysUserMapper.xml b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/mapper/xml/SysUserMapper.xml index 6a28e5cb..69cc813e 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/mapper/xml/SysUserMapper.xml +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/mapper/xml/SysUserMapper.xml @@ -3,12 +3,12 @@ - select * from sys_user where username = #{username} and del_flag = 0 - select * from sys_user where del_flag = 0 and id in (select user_id from sys_user_depart where dep_id=#{departId}) and username = #{username} @@ -24,7 +24,7 @@ - select * from sys_user where del_flag = 0 and id in (select user_id from sys_user_depart where dep_id in @@ -39,7 +39,7 @@ - select * from sys_user where del_flag = 0 and id in (select user_id from sys_user_role where role_id=#{roleId}) and username = #{username} @@ -63,12 +63,12 @@ - select * from sys_user where phone = #{phone} and del_flag = 0 - select * from sys_user where email = #{email} and del_flag = 0 @@ -140,7 +140,7 @@ - SELECT * FROM sys_user ${ew.customSqlSegment} @@ -180,7 +180,7 @@ - select * from sys_user where del_flag = 0 and id in (select user_id from sys_user_depart where dep_id in @@ -195,7 +195,7 @@ - select DISTINCT a.* from sys_user a left join sys_user_role ur on ur.user_id = a.id where @@ -215,7 +215,7 @@ - select su.id,su.username,su.realname,su.sex from sys_user su join sys_user_tenant sut on sut.user_id = su.id and sut.status = '2' where diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/mapper/xml/SysUserTenantMapper.xml b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/mapper/xml/SysUserTenantMapper.xml index 67aab946..cb6fb875 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/mapper/xml/SysUserTenantMapper.xml +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/mapper/xml/SysUserTenantMapper.xml @@ -3,7 +3,7 @@ - SELECT su.id,su.username,su.realname,su.sex,su.phone FROM sys_user su JOIN sys_user_tenant str ON str.user_id = su.id and str.status = '1' WHERE su.del_flag = 0 diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/model/DepartIdModel.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/model/DepartIdModel.java index af157006..777711ae 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/model/DepartIdModel.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/model/DepartIdModel.java @@ -4,7 +4,7 @@ import java.io.Serializable; import java.util.ArrayList; import java.util.List; -import org.jeecg.modules.system.entity.SysDepart; +import org.jeecg.modules.base.entity.postgre.SysDepart; /** *

diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/model/SysDepartTreeModel.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/model/SysDepartTreeModel.java index b50832e3..d16f46e8 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/model/SysDepartTreeModel.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/model/SysDepartTreeModel.java @@ -1,6 +1,6 @@ package org.jeecg.modules.system.model; -import org.jeecg.modules.system.entity.SysDepart; +import org.jeecg.modules.base.entity.postgre.SysDepart; import java.io.Serializable; import java.util.ArrayList; diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/model/SysDictTree.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/model/SysDictTree.java index fb7983ab..d5dd5f74 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/model/SysDictTree.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/model/SysDictTree.java @@ -3,7 +3,7 @@ package org.jeecg.modules.system.model; import java.io.Serializable; import java.util.Date; -import org.jeecg.modules.system.entity.SysDict; +import org.jeecg.modules.base.entity.postgre.SysDict; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/model/SysPermissionTree.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/model/SysPermissionTree.java index be9b16bc..9eae1f27 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/model/SysPermissionTree.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/model/SysPermissionTree.java @@ -4,7 +4,7 @@ import java.io.Serializable; import java.util.ArrayList; import java.util.Date; import java.util.List; -import org.jeecg.modules.system.entity.SysPermission; +import org.jeecg.modules.base.entity.postgre.SysPermission; /** * @Description: 菜单树，封装树结构 diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/model/SysUserSysDepartModel.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/model/SysUserSysDepartModel.java index 65c0ddd7..50b29b32 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/model/SysUserSysDepartModel.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/model/SysUserSysDepartModel.java @@ -1,8 +1,6 @@ package org.jeecg.modules.system.model; import lombok.Data; -import org.jeecg.modules.system.entity.SysDepart; -import org.jeecg.modules.system.entity.SysUser; /** * 包含 SysUser 和 SysDepart 的 Model diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/model/TreeModel.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/model/TreeModel.java index c2da973a..c7172272 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/model/TreeModel.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/model/TreeModel.java @@ -6,7 +6,7 @@ import java.util.HashMap; import java.util.List; import java.util.Map; -import org.jeecg.modules.system.entity.SysPermission; +import org.jeecg.modules.base.entity.postgre.SysPermission; /** * 树形列表用到 diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/rule/CategoryCodeRule.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/rule/CategoryCodeRule.java index dff63ae0..4621ed7a 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/rule/CategoryCodeRule.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/rule/CategoryCodeRule.java @@ -7,7 +7,7 @@ import org.jeecg.common.handler.IFillRuleHandler; import org.jeecg.common.util.SpringContextUtils; import org.jeecg.common.util.YouBianCodeUtil; import org.jeecg.common.util.oConvertUtils; -import org.jeecg.modules.system.entity.SysCategory; +import org.jeecg.modules.base.entity.postgre.SysCategory; import org.jeecg.modules.system.mapper.SysCategoryMapper; import java.util.List; diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/rule/OrgCodeRule.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/rule/OrgCodeRule.java index 56c028fa..f268810a 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/rule/OrgCodeRule.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/rule/OrgCodeRule.java @@ -8,7 +8,7 @@ import io.netty.util.internal.StringUtil; import org.jeecg.common.handler.IFillRuleHandler; import org.jeecg.common.util.SpringContextUtils; import org.jeecg.common.util.YouBianCodeUtil; -import org.jeecg.modules.system.entity.SysDepart; +import org.jeecg.modules.base.entity.postgre.SysDepart; import org.jeecg.modules.system.service.ISysDepartService; import java.util.ArrayList; diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/IGardsDetectorsService.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/IGardsDetectorsService.java index 403102b9..d40e3881 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/IGardsDetectorsService.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/IGardsDetectorsService.java @@ -4,7 +4,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.service.IService; import org.jeecg.common.api.QueryRequest; import org.jeecg.common.api.vo.Result; -import org.jeecg.modules.system.entity.GardsDetectors; +import org.jeecg.modules.base.entity.configuration.GardsDetectors; import java.util.List; import java.util.Map; diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/IGardsNuclearfacilityService.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/IGardsNuclearfacilityService.java index e009ae4b..1b563e61 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/IGardsNuclearfacilityService.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/IGardsNuclearfacilityService.java @@ -4,7 +4,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.service.IService; import org.jeecg.common.api.QueryRequest; import org.jeecg.common.api.vo.Result; -import org.jeecg.modules.system.entity.GardsNuclearfacility; +import org.jeecg.modules.base.entity.configuration.GardsNuclearfacility; import java.util.List; diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/IGardsSampleDataService.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/IGardsSampleDataService.java index d4027b5f..0ace27f6 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/IGardsSampleDataService.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/IGardsSampleDataService.java @@ -4,7 +4,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.service.IService; import org.jeecg.common.api.QueryRequest; import org.jeecg.common.api.vo.Result; -import org.jeecg.modules.base.entity.GardsSampleData; +import org.jeecg.modules.base.entity.original.GardsSampleData; public interface IGardsSampleDataService extends IService { diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/IGardsStationsService.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/IGardsStationsService.java index b5f0bfb0..5423113b 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/IGardsStationsService.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/IGardsStationsService.java @@ -4,7 +4,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.service.IService; import org.jeecg.common.api.QueryRequest; import org.jeecg.common.api.vo.Result; -import org.jeecg.modules.system.entity.GardsStations; +import org.jeecg.modules.base.entity.configuration.GardsStations; import java.util.List; diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/ISysAnnouncementSendService.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/ISysAnnouncementSendService.java index a846d232..c290ce29 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/ISysAnnouncementSendService.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/ISysAnnouncementSendService.java @@ -2,7 +2,7 @@ package org.jeecg.modules.system.service; import java.util.List; -import org.jeecg.modules.system.entity.SysAnnouncementSend; +import org.jeecg.modules.base.entity.postgre.SysAnnouncementSend; import org.jeecg.modules.system.model.AnnouncementSendModel; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/ISysAnnouncementService.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/ISysAnnouncementService.java index bf0ea45f..9e38b0b3 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/ISysAnnouncementService.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/ISysAnnouncementService.java @@ -2,7 +2,7 @@ package org.jeecg.modules.system.service; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.IService; -import org.jeecg.modules.system.entity.SysAnnouncement; +import org.jeecg.modules.base.entity.postgre.SysAnnouncement; import java.util.Date; import java.util.List; diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/ISysCategoryService.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/ISysCategoryService.java index 6c8b3015..fc995ba1 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/ISysCategoryService.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/ISysCategoryService.java @@ -2,7 +2,7 @@ package org.jeecg.modules.system.service; import com.baomidou.mybatisplus.extension.service.IService; import org.jeecg.common.exception.JeecgBootException; -import org.jeecg.modules.system.entity.SysCategory; +import org.jeecg.modules.base.entity.postgre.SysCategory; import org.jeecg.modules.system.model.TreeSelectModel; import java.util.List; diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/ISysCheckRuleService.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/ISysCheckRuleService.java index c0871de2..657aad3a 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/ISysCheckRuleService.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/ISysCheckRuleService.java @@ -2,7 +2,7 @@ package org.jeecg.modules.system.service; import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.extension.service.IService; -import org.jeecg.modules.system.entity.SysCheckRule; +import org.jeecg.modules.base.entity.postgre.SysCheckRule; /** * @Description: 编码校验规则 diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/ISysCommentService.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/ISysCommentService.java index 3e4e686d..09a5830a 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/ISysCommentService.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/ISysCommentService.java @@ -1,7 +1,7 @@ package org.jeecg.modules.system.service; import com.baomidou.mybatisplus.extension.service.IService; -import org.jeecg.modules.system.entity.SysComment; +import org.jeecg.modules.base.entity.postgre.SysComment; import org.jeecg.modules.system.vo.SysCommentFileVo; import org.jeecg.modules.system.vo.SysCommentVO; diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/ISysDataLogService.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/ISysDataLogService.java index 3886fc5c..74b46ad9 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/ISysDataLogService.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/ISysDataLogService.java @@ -1,6 +1,6 @@ package org.jeecg.modules.system.service; -import org.jeecg.modules.system.entity.SysDataLog; +import org.jeecg.modules.base.entity.postgre.SysDataLog; import com.baomidou.mybatisplus.extension.service.IService; diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/ISysDataSourceService.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/ISysDataSourceService.java index eab243c7..26e28aba 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/ISysDataSourceService.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/ISysDataSourceService.java @@ -2,7 +2,7 @@ package org.jeecg.modules.system.service; import com.baomidou.mybatisplus.extension.service.IService; import org.jeecg.common.api.vo.Result; -import org.jeecg.modules.system.entity.SysDataSource; +import org.jeecg.modules.base.entity.postgre.SysDataSource; /** * @Description: 多数据源管理 diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/ISysDepartPermissionService.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/ISysDepartPermissionService.java index 08ff1be3..05a51a8b 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/ISysDepartPermissionService.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/ISysDepartPermissionService.java @@ -1,8 +1,8 @@ package org.jeecg.modules.system.service; -import org.jeecg.modules.system.entity.SysDepartPermission; +import org.jeecg.modules.base.entity.postgre.SysDepartPermission; import com.baomidou.mybatisplus.extension.service.IService; -import org.jeecg.modules.system.entity.SysPermissionDataRule; +import org.jeecg.modules.base.entity.postgre.SysPermissionDataRule; import java.util.List; diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/ISysDepartRolePermissionService.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/ISysDepartRolePermissionService.java index 29c488a6..18c4c219 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/ISysDepartRolePermissionService.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/ISysDepartRolePermissionService.java @@ -1,6 +1,6 @@ package org.jeecg.modules.system.service; -import org.jeecg.modules.system.entity.SysDepartRolePermission; +import org.jeecg.modules.base.entity.postgre.SysDepartRolePermission; import com.baomidou.mybatisplus.extension.service.IService; /** diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/ISysDepartRoleService.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/ISysDepartRoleService.java index a8568f97..619b19a5 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/ISysDepartRoleService.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/ISysDepartRoleService.java @@ -1,6 +1,6 @@ package org.jeecg.modules.system.service; -import org.jeecg.modules.system.entity.SysDepartRole; +import org.jeecg.modules.base.entity.postgre.SysDepartRole; import com.baomidou.mybatisplus.extension.service.IService; import java.util.List; diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/ISysDepartRoleUserService.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/ISysDepartRoleUserService.java index 2c5ca6ff..c47fa471 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/ISysDepartRoleUserService.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/ISysDepartRoleUserService.java @@ -1,6 +1,6 @@ package org.jeecg.modules.system.service; -import org.jeecg.modules.system.entity.SysDepartRoleUser; +import org.jeecg.modules.base.entity.postgre.SysDepartRoleUser; import com.baomidou.mybatisplus.extension.service.IService; import java.util.List; diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/ISysDepartService.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/ISysDepartService.java index 6973dd33..fecb8297 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/ISysDepartService.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/ISysDepartService.java @@ -4,11 +4,10 @@ import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.IService; -import org.jeecg.modules.system.entity.SysDepart; +import org.jeecg.modules.base.entity.postgre.SysDepart; import org.jeecg.modules.system.model.DepartIdModel; import org.jeecg.modules.system.model.SysDepartTreeModel; -import javax.servlet.http.HttpServletRequest; import java.util.List; /** diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/ISysDictItemService.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/ISysDictItemService.java index 913945a6..7e005aa9 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/ISysDictItemService.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/ISysDictItemService.java @@ -1,6 +1,6 @@ package org.jeecg.modules.system.service; -import org.jeecg.modules.system.entity.SysDictItem; +import org.jeecg.modules.base.entity.postgre.SysDictItem; import com.baomidou.mybatisplus.extension.service.IService; import java.util.List; diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/ISysDictService.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/ISysDictService.java index b66933b3..d55637f6 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/ISysDictService.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/ISysDictService.java @@ -3,9 +3,9 @@ package org.jeecg.modules.system.service; import com.baomidou.mybatisplus.extension.service.IService; import org.jeecg.common.system.vo.DictModel; import org.jeecg.common.system.vo.DictQuery; -import org.jeecg.modules.system.entity.GardsStations; -import org.jeecg.modules.system.entity.SysDict; -import org.jeecg.modules.system.entity.SysDictItem; +import org.jeecg.modules.base.entity.configuration.GardsStations; +import org.jeecg.modules.base.entity.postgre.SysDict; +import org.jeecg.modules.base.entity.postgre.SysDictItem; import org.jeecg.modules.system.model.TreeSelectModel; import org.jeecg.modules.system.vo.lowapp.SysDictVo; diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/ISysFilesService.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/ISysFilesService.java index 1bcb7ead..edaeebce 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/ISysFilesService.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/ISysFilesService.java @@ -1,7 +1,7 @@ package org.jeecg.modules.system.service; import com.baomidou.mybatisplus.extension.service.IService; -import org.jeecg.modules.system.entity.SysFiles; +import org.jeecg.modules.base.entity.postgre.SysFiles; /** * @Description: 知识库-文档管理 diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/ISysFillRuleService.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/ISysFillRuleService.java index 5afcd1a1..399b592d 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/ISysFillRuleService.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/ISysFillRuleService.java @@ -1,7 +1,7 @@ package org.jeecg.modules.system.service; import com.baomidou.mybatisplus.extension.service.IService; -import org.jeecg.modules.system.entity.SysFillRule; +import org.jeecg.modules.base.entity.postgre.SysFillRule; /** * @Description: 填值规则 diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/ISysFormFileService.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/ISysFormFileService.java index 2a2e4f97..be22c2f9 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/ISysFormFileService.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/ISysFormFileService.java @@ -1,7 +1,7 @@ package org.jeecg.modules.system.service; import com.baomidou.mybatisplus.extension.service.IService; -import org.jeecg.modules.system.entity.SysFormFile; +import org.jeecg.modules.base.entity.postgre.SysFormFile; /** * @Description: 表单评论文件 diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/ISysGatewayRouteService.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/ISysGatewayRouteService.java index 51eec857..bd7cb63a 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/ISysGatewayRouteService.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/ISysGatewayRouteService.java @@ -2,7 +2,7 @@ package org.jeecg.modules.system.service; import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.extension.service.IService; -import org.jeecg.modules.system.entity.SysGatewayRoute; +import org.jeecg.modules.base.entity.postgre.SysGatewayRoute; /** * @Description: gateway路由管理 diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/ISysLogService.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/ISysLogService.java index 2d7238db..f421b8b5 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/ISysLogService.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/ISysLogService.java @@ -4,7 +4,7 @@ import java.util.Date; import java.util.List; import java.util.Map; -import org.jeecg.modules.system.entity.SysLog; +import org.jeecg.modules.base.entity.postgre.SysLog; import com.baomidou.mybatisplus.extension.service.IService; diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/ISysPackPermissionService.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/ISysPackPermissionService.java index 18f74779..ee844706 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/ISysPackPermissionService.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/ISysPackPermissionService.java @@ -1,6 +1,6 @@ package org.jeecg.modules.system.service; -import org.jeecg.modules.system.entity.SysPackPermission; +import org.jeecg.modules.base.entity.postgre.SysPackPermission; import com.baomidou.mybatisplus.extension.service.IService; /** diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/ISysPermissionDataRuleService.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/ISysPermissionDataRuleService.java index 3e0a5d08..e2c1ca14 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/ISysPermissionDataRuleService.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/ISysPermissionDataRuleService.java @@ -2,7 +2,7 @@ package org.jeecg.modules.system.service; import java.util.List; -import org.jeecg.modules.system.entity.SysPermissionDataRule; +import org.jeecg.modules.base.entity.postgre.SysPermissionDataRule; import com.baomidou.mybatisplus.extension.service.IService; diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/ISysPermissionService.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/ISysPermissionService.java index ae8650a0..7729547e 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/ISysPermissionService.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/ISysPermissionService.java @@ -2,9 +2,8 @@ package org.jeecg.modules.system.service; import java.util.List; -import org.apache.ibatis.annotations.Param; import org.jeecg.common.exception.JeecgBootException; -import org.jeecg.modules.system.entity.SysPermission; +import org.jeecg.modules.base.entity.postgre.SysPermission; import org.jeecg.modules.system.model.TreeModel; import com.baomidou.mybatisplus.extension.service.IService; diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/ISysPositionService.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/ISysPositionService.java index 1421f464..47aa8b5a 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/ISysPositionService.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/ISysPositionService.java @@ -1,7 +1,7 @@ package org.jeecg.modules.system.service; import com.baomidou.mybatisplus.extension.service.IService; -import org.jeecg.modules.system.entity.SysPosition; +import org.jeecg.modules.base.entity.postgre.SysPosition; /** * @Description: 职务表 diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/ISysRoleIndexService.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/ISysRoleIndexService.java index 328f67c9..3b2fd053 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/ISysRoleIndexService.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/ISysRoleIndexService.java @@ -1,6 +1,6 @@ package org.jeecg.modules.system.service; -import org.jeecg.modules.system.entity.SysRoleIndex; +import org.jeecg.modules.base.entity.postgre.SysRoleIndex; import com.baomidou.mybatisplus.extension.service.IService; /** diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/ISysRolePermissionService.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/ISysRolePermissionService.java index 80d91a0d..0f376aad 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/ISysRolePermissionService.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/ISysRolePermissionService.java @@ -1,6 +1,6 @@ package org.jeecg.modules.system.service; -import org.jeecg.modules.system.entity.SysRolePermission; +import org.jeecg.modules.base.entity.postgre.SysRolePermission; import com.baomidou.mybatisplus.extension.service.IService; /** diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/ISysRoleService.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/ISysRoleService.java index e89f21ca..9f413d99 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/ISysRoleService.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/ISysRoleService.java @@ -2,7 +2,7 @@ package org.jeecg.modules.system.service; import com.baomidou.mybatisplus.extension.service.IService; import org.jeecg.common.api.vo.Result; -import org.jeecg.modules.system.entity.SysRole; +import org.jeecg.modules.base.entity.postgre.SysRole; import org.jeecgframework.poi.excel.entity.ImportParams; import org.springframework.web.multipart.MultipartFile; diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/ISysTaskService.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/ISysTaskService.java index 597b57f1..f61e4d18 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/ISysTaskService.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/ISysTaskService.java @@ -2,16 +2,14 @@ package org.jeecg.modules.system.service; import com.baomidou.mybatisplus.extension.service.IService; import org.jeecg.common.api.vo.Result; -import org.jeecg.modules.system.entity.SysTask; +import org.jeecg.modules.base.entity.postgre.SysTask; import org.jeecg.modules.system.entity.vo.ImportViewVo; import org.jeecg.modules.system.entity.vo.SysTaskChangeVo; import org.jeecg.modules.system.entity.vo.SysTaskExportVo; import org.jeecg.modules.system.entity.vo.SysTaskVo; -import org.springframework.web.multipart.MultipartFile; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import java.time.LocalDate; import java.util.Date; import java.util.List; import java.util.Map; diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/ISysTaskStationService.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/ISysTaskStationService.java index 98bb915f..b7e296a5 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/ISysTaskStationService.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/ISysTaskStationService.java @@ -1,7 +1,7 @@ package org.jeecg.modules.system.service; import com.baomidou.mybatisplus.extension.service.IService; -import org.jeecg.modules.system.entity.SysTaskStation; +import org.jeecg.modules.base.entity.postgre.SysTaskStation; import java.util.List; diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/ISysTenantPackService.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/ISysTenantPackService.java index 54d7a4be..5dcef08c 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/ISysTenantPackService.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/ISysTenantPackService.java @@ -1,8 +1,8 @@ package org.jeecg.modules.system.service; import com.baomidou.mybatisplus.extension.service.IService; -import org.jeecg.modules.system.entity.SysTenantPack; -import org.jeecg.modules.system.entity.SysTenantPackUser; +import org.jeecg.modules.base.entity.postgre.SysTenantPack; +import org.jeecg.modules.base.entity.postgre.SysTenantPackUser; import java.util.List; diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/ISysTenantService.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/ISysTenantService.java index 0a858adf..804471b6 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/ISysTenantService.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/ISysTenantService.java @@ -4,8 +4,8 @@ import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.IService; import org.jeecg.common.api.vo.Result; -import org.jeecg.modules.system.entity.SysTenant; -import org.jeecg.modules.system.entity.SysTenantPackUser; +import org.jeecg.modules.base.entity.postgre.SysTenant; +import org.jeecg.modules.base.entity.postgre.SysTenantPackUser; import org.jeecg.modules.system.vo.tenant.TenantDepartAuthInfo; import org.jeecg.modules.system.vo.tenant.TenantPackModel; import org.jeecg.modules.system.vo.tenant.TenantPackUser; diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/ISysThirdAccountService.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/ISysThirdAccountService.java index 7d5c1731..7964ca90 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/ISysThirdAccountService.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/ISysThirdAccountService.java @@ -1,8 +1,8 @@ package org.jeecg.modules.system.service; import com.baomidou.mybatisplus.extension.service.IService; -import org.jeecg.modules.system.entity.SysThirdAccount; -import org.jeecg.modules.system.entity.SysUser; +import org.jeecg.modules.base.entity.postgre.SysThirdAccount; +import org.jeecg.modules.base.entity.postgre.SysUser; import org.jeecg.modules.system.model.ThirdLoginModel; import java.util.List; diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/ISysUserAgentService.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/ISysUserAgentService.java index 10e2e829..131b3fe0 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/ISysUserAgentService.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/ISysUserAgentService.java @@ -1,6 +1,6 @@ package org.jeecg.modules.system.service; -import org.jeecg.modules.system.entity.SysUserAgent; +import org.jeecg.modules.base.entity.postgre.SysUserAgent; import com.baomidou.mybatisplus.extension.service.IService; /** diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/ISysUserDepartService.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/ISysUserDepartService.java index 94fdc3d9..014548ba 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/ISysUserDepartService.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/ISysUserDepartService.java @@ -4,8 +4,8 @@ package org.jeecg.modules.system.service; import java.util.List; import com.baomidou.mybatisplus.core.metadata.IPage; -import org.jeecg.modules.system.entity.SysUser; -import org.jeecg.modules.system.entity.SysUserDepart; +import org.jeecg.modules.base.entity.postgre.SysUser; +import org.jeecg.modules.base.entity.postgre.SysUserDepart; import org.jeecg.modules.system.model.DepartIdModel; diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/ISysUserRoleService.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/ISysUserRoleService.java index e031449c..5aedf4e2 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/ISysUserRoleService.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/ISysUserRoleService.java @@ -1,8 +1,6 @@ package org.jeecg.modules.system.service; -import java.util.Map; - -import org.jeecg.modules.system.entity.SysUserRole; +import org.jeecg.modules.base.entity.postgre.SysUserRole; import com.baomidou.mybatisplus.extension.service.IService; diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/ISysUserService.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/ISysUserService.java index e591b35f..da4acbea 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/ISysUserService.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/ISysUserService.java @@ -2,15 +2,14 @@ package org.jeecg.modules.system.service; import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.IService; import org.jeecg.common.api.vo.Result; import org.jeecg.common.system.vo.LoginUser; import org.jeecg.common.system.vo.SysUserCacheInfo; -import org.jeecg.modules.system.entity.SysRoleIndex; -import org.jeecg.modules.system.entity.SysUser; +import org.jeecg.modules.base.entity.postgre.SysRoleIndex; +import org.jeecg.modules.base.entity.postgre.SysUser; import org.jeecg.modules.system.model.SysUserSysDepartModel; import org.jeecg.modules.system.vo.lowapp.DepartAndUserInfo; import org.jeecg.modules.system.vo.lowapp.UpdateDepartInfo; diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/ISysUserTenantService.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/ISysUserTenantService.java index 1a861f5b..59e79836 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/ISysUserTenantService.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/ISysUserTenantService.java @@ -2,8 +2,8 @@ package org.jeecg.modules.system.service; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import org.jeecg.modules.system.entity.SysUser; -import org.jeecg.modules.system.entity.SysUserTenant; +import org.jeecg.modules.base.entity.postgre.SysUser; +import org.jeecg.modules.base.entity.postgre.SysUserTenant; import com.baomidou.mybatisplus.extension.service.IService; import org.jeecg.modules.system.vo.SysUserTenantVo; diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/impl/GardsDetectorsServiceImpl.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/impl/GardsDetectorsServiceImpl.java index 4fc84417..4a9ec46f 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/impl/GardsDetectorsServiceImpl.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/impl/GardsDetectorsServiceImpl.java @@ -10,7 +10,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import org.jeecg.common.api.QueryRequest; import org.jeecg.common.api.vo.Result; import org.jeecg.common.util.RedisUtil; -import org.jeecg.modules.system.entity.GardsDetectors; +import org.jeecg.modules.base.entity.configuration.GardsDetectors; import org.jeecg.modules.system.mapper.GardsDetectorsMapper; import org.jeecg.modules.system.service.IGardsDetectorsService; import org.springframework.beans.factory.annotation.Autowired; @@ -18,7 +18,6 @@ import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Propagation; import org.springframework.transaction.annotation.Transactional; -import java.time.LocalDateTime; import java.util.*; import java.util.stream.Collectors; diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/impl/GardsNuclearfacilityServiceImpl.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/impl/GardsNuclearfacilityServiceImpl.java index eaf034cc..48f2b0ca 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/impl/GardsNuclearfacilityServiceImpl.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/impl/GardsNuclearfacilityServiceImpl.java @@ -3,14 +3,13 @@ package org.jeecg.modules.system.service.impl; import com.baomidou.dynamic.datasource.annotation.DS; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; -import com.baomidou.mybatisplus.core.toolkit.IdWorker; import com.baomidou.mybatisplus.core.toolkit.StringUtils; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import org.jeecg.common.api.QueryRequest; import org.jeecg.common.api.vo.Result; import org.jeecg.common.util.RedisUtil; -import org.jeecg.modules.system.entity.GardsNuclearfacility; +import org.jeecg.modules.base.entity.configuration.GardsNuclearfacility; import org.jeecg.modules.system.mapper.GardsNuclearfacilityMapper; import org.jeecg.modules.system.service.IGardsNuclearfacilityService; import org.springframework.beans.factory.annotation.Autowired; @@ -20,7 +19,6 @@ import org.springframework.transaction.annotation.Transactional; import java.util.HashMap; import java.util.List; import java.util.Objects; -import java.util.stream.Collectors; @Service("gardsNuclearfacilityService") @DS("ora") diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/impl/GardsSampleDataServiceImpl.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/impl/GardsSampleDataServiceImpl.java index 245b42c8..101b6338 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/impl/GardsSampleDataServiceImpl.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/impl/GardsSampleDataServiceImpl.java @@ -10,19 +10,14 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import org.jeecg.common.api.QueryRequest; import org.jeecg.common.api.vo.Result; import org.jeecg.common.util.RedisUtil; -import org.jeecg.modules.system.entity.GardsDetectors; -import org.jeecg.modules.base.entity.GardsSampleData; -import org.jeecg.modules.system.entity.GardsStations; +import org.jeecg.modules.base.entity.original.GardsSampleData; import org.jeecg.modules.system.mapper.GardsSampleDataMapper; -import org.jeecg.modules.system.service.IGardsDetectorsService; import org.jeecg.modules.system.service.IGardsSampleDataService; -import org.jeecg.modules.system.service.IGardsStationsService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import java.util.HashMap; -import java.util.List; import java.util.Objects; @Service("gardsSampleDataService") diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/impl/GardsStationsServiceImpl.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/impl/GardsStationsServiceImpl.java index e455c69a..fcbc1cff 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/impl/GardsStationsServiceImpl.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/impl/GardsStationsServiceImpl.java @@ -4,14 +4,13 @@ import com.baomidou.dynamic.datasource.annotation.DS; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.toolkit.CollectionUtils; -import com.baomidou.mybatisplus.core.toolkit.IdWorker; import com.baomidou.mybatisplus.core.toolkit.StringUtils; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import org.jeecg.common.api.QueryRequest; import org.jeecg.common.api.vo.Result; import org.jeecg.common.util.RedisUtil; -import org.jeecg.modules.system.entity.GardsStations; +import org.jeecg.modules.base.entity.configuration.GardsStations; import org.jeecg.modules.system.mapper.GardsStationsMapper; import org.jeecg.modules.system.service.IGardsStationsService; import org.springframework.beans.factory.annotation.Autowired; @@ -19,7 +18,6 @@ import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Propagation; import org.springframework.transaction.annotation.Transactional; -import java.time.LocalDateTime; import java.util.*; import java.util.stream.Collectors; diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysAnnouncementSendServiceImpl.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysAnnouncementSendServiceImpl.java index d07af817..8c610d70 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysAnnouncementSendServiceImpl.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysAnnouncementSendServiceImpl.java @@ -4,7 +4,7 @@ import java.util.List; import javax.annotation.Resource; -import org.jeecg.modules.system.entity.SysAnnouncementSend; +import org.jeecg.modules.base.entity.postgre.SysAnnouncementSend; import org.jeecg.modules.system.mapper.SysAnnouncementSendMapper; import org.jeecg.modules.system.model.AnnouncementSendModel; import org.jeecg.modules.system.service.ISysAnnouncementSendService; diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysAnnouncementServiceImpl.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysAnnouncementServiceImpl.java index 0934d2e0..424214cd 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysAnnouncementServiceImpl.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysAnnouncementServiceImpl.java @@ -8,8 +8,8 @@ import org.apache.shiro.SecurityUtils; import org.jeecg.common.constant.CommonConstant; import org.jeecg.common.system.vo.LoginUser; import org.jeecg.common.util.oConvertUtils; -import org.jeecg.modules.system.entity.SysAnnouncement; -import org.jeecg.modules.system.entity.SysAnnouncementSend; +import org.jeecg.modules.base.entity.postgre.SysAnnouncement; +import org.jeecg.modules.base.entity.postgre.SysAnnouncementSend; import org.jeecg.modules.system.mapper.SysAnnouncementMapper; import org.jeecg.modules.system.mapper.SysAnnouncementSendMapper; import org.jeecg.modules.system.service.ISysAnnouncementService; diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysBaseApiImpl.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysBaseApiImpl.java index 24e1a7d0..c6537918 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysBaseApiImpl.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysBaseApiImpl.java @@ -19,7 +19,6 @@ import org.jeecg.common.api.dto.OnlineAuthDTO; import org.jeecg.common.api.dto.message.*; import org.jeecg.common.aspect.UrlMatchEnum; import org.jeecg.common.constant.*; -import org.jeecg.common.constant.enums.MessageTypeEnum; import org.jeecg.common.desensitization.util.SensitiveInfoUtil; import org.jeecg.common.exception.JeecgBootException; import org.jeecg.common.system.api.ISysBaseAPI; @@ -27,11 +26,13 @@ import org.jeecg.common.system.query.QueryGenerator; import org.jeecg.common.system.vo.*; import org.jeecg.common.util.*; import org.jeecg.common.util.dynamic.db.FreemarkerParseFactory; +import org.jeecg.modules.base.entity.postgre.*; import org.jeecg.modules.message.entity.SysMessageTemplate; import org.jeecg.modules.message.handle.impl.*; import org.jeecg.modules.message.service.ISysMessageTemplateService; import org.jeecg.modules.message.websocket.WebSocket; -import org.jeecg.modules.system.entity.*; +import org.jeecg.modules.base.entity.postgre.SysRole; +import org.jeecg.modules.base.entity.postgre.SysUser; import org.jeecg.modules.system.mapper.*; import org.jeecg.modules.system.service.*; import org.jeecg.modules.system.util.SecurityUtil; diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysCategoryServiceImpl.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysCategoryServiceImpl.java index 437be4ef..3ef5a75b 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysCategoryServiceImpl.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysCategoryServiceImpl.java @@ -5,13 +5,12 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import org.jeecg.common.constant.CommonConstant; import org.jeecg.common.constant.FillRuleConstant; import org.jeecg.common.constant.SymbolConstant; import org.jeecg.common.exception.JeecgBootException; import org.jeecg.common.util.FillRuleUtil; import org.jeecg.common.util.oConvertUtils; -import org.jeecg.modules.system.entity.SysCategory; +import org.jeecg.modules.base.entity.postgre.SysCategory; import org.jeecg.modules.system.mapper.SysCategoryMapper; import org.jeecg.modules.system.model.TreeSelectModel; import org.jeecg.modules.system.service.ISysCategoryService; diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysCheckRuleServiceImpl.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysCheckRuleServiceImpl.java index 300a57f0..4bec40db 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysCheckRuleServiceImpl.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysCheckRuleServiceImpl.java @@ -6,7 +6,7 @@ import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import org.apache.commons.lang.StringUtils; -import org.jeecg.modules.system.entity.SysCheckRule; +import org.jeecg.modules.base.entity.postgre.SysCheckRule; import org.jeecg.modules.system.mapper.SysCheckRuleMapper; import org.jeecg.modules.system.service.ISysCheckRuleService; import org.springframework.stereotype.Service; diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysCommentServiceImpl.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysCommentServiceImpl.java index 9516c737..ec4e58f0 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysCommentServiceImpl.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysCommentServiceImpl.java @@ -13,9 +13,9 @@ import org.jeecg.common.system.api.ISysBaseAPI; import org.jeecg.common.util.CommonUtils; import org.jeecg.common.util.RedisUtil; import org.jeecg.common.util.oConvertUtils; -import org.jeecg.modules.system.entity.SysComment; -import org.jeecg.modules.system.entity.SysFiles; -import org.jeecg.modules.system.entity.SysFormFile; +import org.jeecg.modules.base.entity.postgre.SysComment; +import org.jeecg.modules.base.entity.postgre.SysFiles; +import org.jeecg.modules.base.entity.postgre.SysFormFile; import org.jeecg.modules.system.mapper.SysCommentMapper; import org.jeecg.modules.system.mapper.SysFilesMapper; import org.jeecg.modules.system.mapper.SysFormFileMapper; diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysDataLogServiceImpl.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysDataLogServiceImpl.java index 5f732376..0c1dd1c9 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysDataLogServiceImpl.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysDataLogServiceImpl.java @@ -1,6 +1,6 @@ package org.jeecg.modules.system.service.impl; -import org.jeecg.modules.system.entity.SysDataLog; +import org.jeecg.modules.base.entity.postgre.SysDataLog; import org.jeecg.modules.system.mapper.SysDataLogMapper; import org.jeecg.modules.system.service.ISysDataLogService; import org.springframework.beans.factory.annotation.Autowired; diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysDataSourceServiceImpl.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysDataSourceServiceImpl.java index f3052ec2..2e501a32 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysDataSourceServiceImpl.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysDataSourceServiceImpl.java @@ -8,7 +8,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import org.apache.commons.lang.StringUtils; import org.jeecg.common.api.vo.Result; import org.jeecg.common.util.dynamic.db.DataSourceCachePool; -import org.jeecg.modules.system.entity.SysDataSource; +import org.jeecg.modules.base.entity.postgre.SysDataSource; import org.jeecg.modules.system.mapper.SysDataSourceMapper; import org.jeecg.modules.system.service.ISysDataSourceService; import org.jeecg.modules.system.util.SecurityUtil; diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysDepartPermissionServiceImpl.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysDepartPermissionServiceImpl.java index 1c3afcca..210534e1 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysDepartPermissionServiceImpl.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysDepartPermissionServiceImpl.java @@ -3,10 +3,10 @@ package org.jeecg.modules.system.service.impl; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import org.jeecg.common.util.oConvertUtils; -import org.jeecg.modules.system.entity.SysDepartPermission; -import org.jeecg.modules.system.entity.SysDepartRole; -import org.jeecg.modules.system.entity.SysDepartRolePermission; -import org.jeecg.modules.system.entity.SysPermissionDataRule; +import org.jeecg.modules.base.entity.postgre.SysDepartPermission; +import org.jeecg.modules.base.entity.postgre.SysDepartRole; +import org.jeecg.modules.base.entity.postgre.SysDepartRolePermission; +import org.jeecg.modules.base.entity.postgre.SysPermissionDataRule; import org.jeecg.modules.system.mapper.SysDepartPermissionMapper; import org.jeecg.modules.system.mapper.SysDepartRoleMapper; import org.jeecg.modules.system.mapper.SysDepartRolePermissionMapper; diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysDepartRolePermissionServiceImpl.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysDepartRolePermissionServiceImpl.java index 10c19db2..f87afb89 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysDepartRolePermissionServiceImpl.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysDepartRolePermissionServiceImpl.java @@ -4,7 +4,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import org.jeecg.common.util.IpUtils; import org.jeecg.common.util.SpringContextUtils; import org.jeecg.common.util.oConvertUtils; -import org.jeecg.modules.system.entity.SysDepartRolePermission; +import org.jeecg.modules.base.entity.postgre.SysDepartRolePermission; import org.jeecg.modules.system.mapper.SysDepartRolePermissionMapper; import org.jeecg.modules.system.service.ISysDepartRolePermissionService; import org.springframework.stereotype.Service; diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysDepartRoleServiceImpl.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysDepartRoleServiceImpl.java index 73d969d6..6d4e8bd0 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysDepartRoleServiceImpl.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysDepartRoleServiceImpl.java @@ -1,6 +1,6 @@ package org.jeecg.modules.system.service.impl; -import org.jeecg.modules.system.entity.SysDepartRole; +import org.jeecg.modules.base.entity.postgre.SysDepartRole; import org.jeecg.modules.system.mapper.SysDepartRoleMapper; import org.jeecg.modules.system.service.ISysDepartRoleService; import org.springframework.stereotype.Service; diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysDepartRoleUserServiceImpl.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysDepartRoleUserServiceImpl.java index bf49e3aa..727c97b1 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysDepartRoleUserServiceImpl.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysDepartRoleUserServiceImpl.java @@ -2,8 +2,8 @@ package org.jeecg.modules.system.service.impl; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import org.jeecg.common.util.oConvertUtils; -import org.jeecg.modules.system.entity.SysDepartRole; -import org.jeecg.modules.system.entity.SysDepartRoleUser; +import org.jeecg.modules.base.entity.postgre.SysDepartRole; +import org.jeecg.modules.base.entity.postgre.SysDepartRoleUser; import org.jeecg.modules.system.mapper.SysDepartRoleMapper; import org.jeecg.modules.system.mapper.SysDepartRoleUserMapper; import org.jeecg.modules.system.service.ISysDepartRoleUserService; diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysDepartServiceImpl.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysDepartServiceImpl.java index cc378b9c..201e624a 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysDepartServiceImpl.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysDepartServiceImpl.java @@ -20,14 +20,13 @@ import org.jeecg.common.util.FillRuleUtil; import org.jeecg.common.util.YouBianCodeUtil; import org.jeecg.common.util.oConvertUtils; import org.jeecg.config.mybatis.MybatisPlusSaasConfig; -import org.jeecg.modules.system.entity.*; +import org.jeecg.modules.base.entity.postgre.*; import org.jeecg.modules.system.mapper.*; import org.jeecg.modules.system.model.DepartIdModel; import org.jeecg.modules.system.model.SysDepartTreeModel; import org.jeecg.modules.system.service.ISysDepartService; import org.jeecg.modules.system.util.FindsDepartsChildrenUtil; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.cache.annotation.Cacheable; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysDictItemServiceImpl.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysDictItemServiceImpl.java index 973d6fcc..f27f67f4 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysDictItemServiceImpl.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysDictItemServiceImpl.java @@ -2,7 +2,7 @@ package org.jeecg.modules.system.service.impl; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.toolkit.CollectionUtils; -import org.jeecg.modules.system.entity.SysDictItem; +import org.jeecg.modules.base.entity.postgre.SysDictItem; import org.jeecg.modules.system.mapper.SysDictItemMapper; import org.jeecg.modules.system.service.ISysDictItemService; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysDictServiceImpl.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysDictServiceImpl.java index 35578a47..41a77aaa 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysDictServiceImpl.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysDictServiceImpl.java @@ -15,7 +15,6 @@ import org.jeecg.common.constant.DataBaseConstant; import org.jeecg.common.constant.SymbolConstant; import org.jeecg.common.exception.JeecgBootException; import org.jeecg.common.system.query.QueryGenerator; -import org.jeecg.common.system.util.JwtUtil; import org.jeecg.common.system.util.ResourceUtil; import org.jeecg.common.system.vo.DictModel; import org.jeecg.common.system.vo.DictModelMany; @@ -24,9 +23,9 @@ import org.jeecg.common.util.RedisUtil; import org.jeecg.common.util.SqlInjectionUtil; import org.jeecg.common.util.oConvertUtils; import org.jeecg.config.mybatis.MybatisPlusSaasConfig; -import org.jeecg.modules.system.entity.GardsStations; -import org.jeecg.modules.system.entity.SysDict; -import org.jeecg.modules.system.entity.SysDictItem; +import org.jeecg.modules.base.entity.configuration.GardsStations; +import org.jeecg.modules.base.entity.postgre.SysDict; +import org.jeecg.modules.base.entity.postgre.SysDictItem; import org.jeecg.modules.system.mapper.SysDictItemMapper; import org.jeecg.modules.system.mapper.SysDictMapper; import org.jeecg.modules.system.model.TreeSelectModel; diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysFilesServiceImpl.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysFilesServiceImpl.java index 50f45589..b88d3766 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysFilesServiceImpl.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysFilesServiceImpl.java @@ -1,7 +1,7 @@ package org.jeecg.modules.system.service.impl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import org.jeecg.modules.system.entity.SysFiles; +import org.jeecg.modules.base.entity.postgre.SysFiles; import org.jeecg.modules.system.mapper.SysFilesMapper; import org.jeecg.modules.system.service.ISysFilesService; import org.springframework.stereotype.Service; diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysFillRuleServiceImpl.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysFillRuleServiceImpl.java index 406b056c..ff0aac24 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysFillRuleServiceImpl.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysFillRuleServiceImpl.java @@ -1,7 +1,7 @@ package org.jeecg.modules.system.service.impl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import org.jeecg.modules.system.entity.SysFillRule; +import org.jeecg.modules.base.entity.postgre.SysFillRule; import org.jeecg.modules.system.mapper.SysFillRuleMapper; import org.jeecg.modules.system.service.ISysFillRuleService; import org.springframework.stereotype.Service; diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysFormFileServiceImpl.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysFormFileServiceImpl.java index acc217b9..0cea9720 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysFormFileServiceImpl.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysFormFileServiceImpl.java @@ -1,7 +1,7 @@ package org.jeecg.modules.system.service.impl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import org.jeecg.modules.system.entity.SysFormFile; +import org.jeecg.modules.base.entity.postgre.SysFormFile; import org.jeecg.modules.system.mapper.SysFormFileMapper; import org.jeecg.modules.system.service.ISysFormFileService; import org.springframework.stereotype.Service; diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysGatewayRouteServiceImpl.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysGatewayRouteServiceImpl.java index 18531039..72554d53 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysGatewayRouteServiceImpl.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysGatewayRouteServiceImpl.java @@ -8,10 +8,9 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import lombok.extern.slf4j.Slf4j; import org.jeecg.common.base.BaseMap; import org.jeecg.common.constant.CacheConstant; -import org.jeecg.common.constant.CommonConstant; import org.jeecg.common.constant.GlobalConstants; import org.jeecg.common.util.oConvertUtils; -import org.jeecg.modules.system.entity.SysGatewayRoute; +import org.jeecg.modules.base.entity.postgre.SysGatewayRoute; import org.jeecg.modules.system.mapper.SysGatewayRouteMapper; import org.jeecg.modules.system.service.ISysGatewayRouteService; import org.springframework.beans.factory.annotation.Autowired; @@ -19,9 +18,7 @@ import org.springframework.data.redis.core.RedisTemplate; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; -import java.util.HashMap; import java.util.List; -import java.util.Map; /** * @Description: gateway路由管理 diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysLogServiceImpl.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysLogServiceImpl.java index e226c3cb..11159a4e 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysLogServiceImpl.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysLogServiceImpl.java @@ -1,6 +1,5 @@ package org.jeecg.modules.system.service.impl; -import java.sql.SQLException; import java.util.Date; import java.util.List; import java.util.Map; @@ -8,12 +7,10 @@ import java.util.Map; import javax.annotation.Resource; import com.baomidou.mybatisplus.annotation.DbType; -import org.jeecg.common.system.api.ISysBaseAPI; import org.jeecg.common.util.CommonUtils; -import org.jeecg.modules.system.entity.SysLog; +import org.jeecg.modules.base.entity.postgre.SysLog; import org.jeecg.modules.system.mapper.SysLogMapper; import org.jeecg.modules.system.service.ISysLogService; -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysPackPermissionServiceImpl.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysPackPermissionServiceImpl.java index e8f21694..7599526c 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysPackPermissionServiceImpl.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysPackPermissionServiceImpl.java @@ -1,6 +1,6 @@ package org.jeecg.modules.system.service.impl; -import org.jeecg.modules.system.entity.SysPackPermission; +import org.jeecg.modules.base.entity.postgre.SysPackPermission; import org.jeecg.modules.system.mapper.SysPackPermissionMapper; import org.jeecg.modules.system.service.ISysPackPermissionService; import org.springframework.stereotype.Service; diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysPermissionDataRuleImpl.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysPermissionDataRuleImpl.java index be7c3f78..a76f0b1c 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysPermissionDataRuleImpl.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysPermissionDataRuleImpl.java @@ -9,8 +9,8 @@ import javax.annotation.Resource; import org.jeecg.common.constant.CommonConstant; import org.jeecg.common.system.query.QueryGenerator; import org.jeecg.common.util.oConvertUtils; -import org.jeecg.modules.system.entity.SysPermission; -import org.jeecg.modules.system.entity.SysPermissionDataRule; +import org.jeecg.modules.base.entity.postgre.SysPermission; +import org.jeecg.modules.base.entity.postgre.SysPermissionDataRule; import org.jeecg.modules.system.mapper.SysPermissionDataRuleMapper; import org.jeecg.modules.system.mapper.SysPermissionMapper; import org.jeecg.modules.system.service.ISysPermissionDataRuleService; diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysPermissionServiceImpl.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysPermissionServiceImpl.java index 6c818a7b..250fba13 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysPermissionServiceImpl.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysPermissionServiceImpl.java @@ -11,8 +11,8 @@ import org.jeecg.common.constant.CacheConstant; import org.jeecg.common.constant.CommonConstant; import org.jeecg.common.exception.JeecgBootException; import org.jeecg.common.util.oConvertUtils; -import org.jeecg.modules.system.entity.SysPermission; -import org.jeecg.modules.system.entity.SysPermissionDataRule; +import org.jeecg.modules.base.entity.postgre.SysPermission; +import org.jeecg.modules.base.entity.postgre.SysPermissionDataRule; import org.jeecg.modules.system.mapper.SysDepartPermissionMapper; import org.jeecg.modules.system.mapper.SysDepartRolePermissionMapper; import org.jeecg.modules.system.mapper.SysPermissionMapper; diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysPositionServiceImpl.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysPositionServiceImpl.java index e88ccc1b..66e9175c 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysPositionServiceImpl.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysPositionServiceImpl.java @@ -2,7 +2,7 @@ package org.jeecg.modules.system.service.impl; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import org.jeecg.modules.system.entity.SysPosition; +import org.jeecg.modules.base.entity.postgre.SysPosition; import org.jeecg.modules.system.mapper.SysPositionMapper; import org.jeecg.modules.system.service.ISysPositionService; import org.springframework.stereotype.Service; diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysRoleIndexServiceImpl.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysRoleIndexServiceImpl.java index 60f63204..37ab5196 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysRoleIndexServiceImpl.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysRoleIndexServiceImpl.java @@ -1,6 +1,6 @@ package org.jeecg.modules.system.service.impl; -import org.jeecg.modules.system.entity.SysRoleIndex; +import org.jeecg.modules.base.entity.postgre.SysRoleIndex; import org.jeecg.modules.system.mapper.SysRoleIndexMapper; import org.jeecg.modules.system.service.ISysRoleIndexService; import org.springframework.stereotype.Service; diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysRolePermissionServiceImpl.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysRolePermissionServiceImpl.java index 6103c56a..23d1f175 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysRolePermissionServiceImpl.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysRolePermissionServiceImpl.java @@ -5,7 +5,7 @@ import java.util.*; import org.jeecg.common.util.IpUtils; import org.jeecg.common.util.SpringContextUtils; import org.jeecg.common.util.oConvertUtils; -import org.jeecg.modules.system.entity.SysRolePermission; +import org.jeecg.modules.base.entity.postgre.SysRolePermission; import org.jeecg.modules.system.mapper.SysRolePermissionMapper; import org.jeecg.modules.system.service.ISysRolePermissionService; diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysRoleServiceImpl.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysRoleServiceImpl.java index ed44954e..dd69c6cc 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysRoleServiceImpl.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysRoleServiceImpl.java @@ -8,7 +8,7 @@ import org.jeecg.common.constant.CommonConstant; import org.jeecg.common.util.ImportExcelUtil; import org.jeecg.common.util.PmsUtil; import org.jeecg.modules.quartz.service.IQuartzJobService; -import org.jeecg.modules.system.entity.SysRole; +import org.jeecg.modules.base.entity.postgre.SysRole; import org.jeecg.modules.system.mapper.SysRoleMapper; import org.jeecg.modules.system.mapper.SysUserMapper; import org.jeecg.modules.system.service.ISysRoleService; diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysTaskServiceImpl.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysTaskServiceImpl.java index 226810f3..57c1750c 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysTaskServiceImpl.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysTaskServiceImpl.java @@ -17,10 +17,10 @@ import org.jeecg.common.util.DateUtils; import org.jeecg.common.util.IpUtils; import org.jeecg.common.util.RedisUtil; import org.jeecg.common.util.SpringContextUtils; -import org.jeecg.modules.system.entity.GardsStations; -import org.jeecg.modules.system.entity.SysTask; -import org.jeecg.modules.system.entity.SysTaskStation; -import org.jeecg.modules.system.entity.SysUser; +import org.jeecg.modules.base.entity.configuration.GardsStations; +import org.jeecg.modules.base.entity.postgre.SysTask; +import org.jeecg.modules.base.entity.postgre.SysTaskStation; +import org.jeecg.modules.base.entity.postgre.SysUser; import org.jeecg.modules.system.entity.vo.*; import org.jeecg.modules.system.mapper.SysTaskMapper; import org.jeecg.modules.system.mapper.SysTaskStationMapper; @@ -29,7 +29,6 @@ import org.jeecg.modules.system.service.IGardsStationsService; import org.jeecg.modules.system.service.ISysTaskService; import org.jeecg.modules.system.service.ISysTaskStationService; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -39,7 +38,6 @@ import java.io.IOException; import java.lang.reflect.Field; import java.text.ParseException; import java.text.SimpleDateFormat; -import java.time.LocalDate; import java.util.*; import java.util.stream.Collectors; diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysTaskStationServiceImpl.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysTaskStationServiceImpl.java index 999fb755..47dd052b 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysTaskStationServiceImpl.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysTaskStationServiceImpl.java @@ -4,7 +4,7 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.toolkit.IdWorker; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import org.apache.commons.lang3.StringUtils; -import org.jeecg.modules.system.entity.SysTaskStation; +import org.jeecg.modules.base.entity.postgre.SysTaskStation; import org.jeecg.modules.system.mapper.SysTaskStationMapper; import org.jeecg.modules.system.service.ISysTaskStationService; import org.springframework.stereotype.Service; diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysTenantPackServiceImpl.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysTenantPackServiceImpl.java index c438fcac..b5f69369 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysTenantPackServiceImpl.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysTenantPackServiceImpl.java @@ -9,9 +9,9 @@ import org.jeecg.common.system.vo.LoginUser; import org.jeecg.common.util.SpringContextUtils; import org.jeecg.common.util.oConvertUtils; import org.jeecg.modules.aop.TenantLog; -import org.jeecg.modules.system.entity.SysPackPermission; -import org.jeecg.modules.system.entity.SysTenantPack; -import org.jeecg.modules.system.entity.SysTenantPackUser; +import org.jeecg.modules.base.entity.postgre.SysPackPermission; +import org.jeecg.modules.base.entity.postgre.SysTenantPack; +import org.jeecg.modules.base.entity.postgre.SysTenantPackUser; import org.jeecg.modules.system.mapper.SysPackPermissionMapper; import org.jeecg.modules.system.mapper.SysTenantPackMapper; import org.jeecg.modules.system.mapper.SysTenantPackUserMapper; diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysTenantServiceImpl.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysTenantServiceImpl.java index 330118a7..21bda9e3 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysTenantServiceImpl.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysTenantServiceImpl.java @@ -17,7 +17,7 @@ import org.jeecg.common.system.vo.LoginUser; import org.jeecg.common.util.SpringContextUtils; import org.jeecg.common.util.oConvertUtils; import org.jeecg.modules.aop.TenantLog; -import org.jeecg.modules.system.entity.*; +import org.jeecg.modules.base.entity.postgre.*; import org.jeecg.modules.system.mapper.SysTenantMapper; import org.jeecg.modules.system.mapper.SysTenantPackUserMapper; import org.jeecg.modules.system.mapper.SysUserTenantMapper; diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysThirdAccountServiceImpl.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysThirdAccountServiceImpl.java index 8d2345c0..ca93b9f6 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysThirdAccountServiceImpl.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysThirdAccountServiceImpl.java @@ -8,10 +8,10 @@ import org.jeecg.common.util.DateUtils; import org.jeecg.common.util.PasswordUtil; import org.jeecg.common.util.UUIDGenerator; import org.jeecg.common.util.oConvertUtils; -import org.jeecg.modules.system.entity.SysRole; -import org.jeecg.modules.system.entity.SysThirdAccount; -import org.jeecg.modules.system.entity.SysUser; -import org.jeecg.modules.system.entity.SysUserRole; +import org.jeecg.modules.base.entity.postgre.SysRole; +import org.jeecg.modules.base.entity.postgre.SysThirdAccount; +import org.jeecg.modules.base.entity.postgre.SysUser; +import org.jeecg.modules.base.entity.postgre.SysUserRole; import org.jeecg.modules.system.mapper.SysRoleMapper; import org.jeecg.modules.system.mapper.SysThirdAccountMapper; import org.jeecg.modules.system.mapper.SysUserMapper; diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysUserAgentServiceImpl.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysUserAgentServiceImpl.java index d46c057f..6b42df84 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysUserAgentServiceImpl.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysUserAgentServiceImpl.java @@ -1,6 +1,6 @@ package org.jeecg.modules.system.service.impl; -import org.jeecg.modules.system.entity.SysUserAgent; +import org.jeecg.modules.base.entity.postgre.SysUserAgent; import org.jeecg.modules.system.mapper.SysUserAgentMapper; import org.jeecg.modules.system.service.ISysUserAgentService; import org.springframework.stereotype.Service; diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysUserDepartServiceImpl.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysUserDepartServiceImpl.java index 86bf815d..6381970e 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysUserDepartServiceImpl.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysUserDepartServiceImpl.java @@ -8,13 +8,12 @@ import org.apache.commons.lang3.StringUtils; import org.apache.shiro.SecurityUtils; import org.jeecg.common.config.TenantContext; import org.jeecg.common.constant.CommonConstant; -import org.jeecg.common.constant.SymbolConstant; import org.jeecg.common.system.vo.LoginUser; import org.jeecg.common.util.oConvertUtils; import org.jeecg.config.mybatis.MybatisPlusSaasConfig; -import org.jeecg.modules.system.entity.SysDepart; -import org.jeecg.modules.system.entity.SysUser; -import org.jeecg.modules.system.entity.SysUserDepart; +import org.jeecg.modules.base.entity.postgre.SysDepart; +import org.jeecg.modules.base.entity.postgre.SysUser; +import org.jeecg.modules.base.entity.postgre.SysUserDepart; import org.jeecg.modules.system.mapper.SysUserDepartMapper; import org.jeecg.modules.system.mapper.SysUserMapper; import org.jeecg.modules.system.mapper.SysUserTenantMapper; diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysUserRoleServiceImpl.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysUserRoleServiceImpl.java index 9af6f772..78523612 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysUserRoleServiceImpl.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysUserRoleServiceImpl.java @@ -1,17 +1,8 @@ package org.jeecg.modules.system.service.impl; -import java.util.IdentityHashMap; -import java.util.List; -import java.util.Map; - -import org.jeecg.modules.system.entity.SysRole; -import org.jeecg.modules.system.entity.SysUser; -import org.jeecg.modules.system.entity.SysUserRole; +import org.jeecg.modules.base.entity.postgre.SysUserRole; import org.jeecg.modules.system.mapper.SysUserRoleMapper; -import org.jeecg.modules.system.service.ISysRoleService; import org.jeecg.modules.system.service.ISysUserRoleService; -import org.jeecg.modules.system.service.ISysUserService; -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysUserServiceImpl.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysUserServiceImpl.java index b3911180..3653b0ae 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysUserServiceImpl.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysUserServiceImpl.java @@ -1,7 +1,6 @@ package org.jeecg.modules.system.service.impl; import cn.hutool.core.collection.CollUtil; -import cn.hutool.core.collection.CollectionUtil; import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; @@ -29,8 +28,10 @@ import org.jeecg.common.system.vo.LoginUser; import org.jeecg.common.system.vo.SysUserCacheInfo; import org.jeecg.common.util.*; import org.jeecg.config.mybatis.MybatisPlusSaasConfig; +import org.jeecg.modules.base.entity.postgre.*; import org.jeecg.modules.base.service.BaseCommonService; -import org.jeecg.modules.system.entity.*; +import org.jeecg.modules.base.entity.postgre.SysRole; +import org.jeecg.modules.base.entity.postgre.SysUser; import org.jeecg.modules.system.mapper.*; import org.jeecg.modules.system.model.SysUserSysDepartModel; import org.jeecg.modules.system.service.ISysUserService; @@ -40,12 +41,10 @@ import org.jeecg.modules.system.vo.lowapp.DepartAndUserInfo; import org.jeecg.modules.system.vo.lowapp.DepartInfo; import org.jeecg.modules.system.vo.lowapp.UpdateDepartInfo; import org.springframework.beans.BeanUtils; -import org.springframework.beans.factory.NoSuchBeanDefinitionException; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; import org.springframework.cache.annotation.CacheEvict; import org.springframework.cache.annotation.Cacheable; -import org.springframework.context.annotation.Lazy; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -344,7 +343,7 @@ public class SysUserServiceImpl extends ServiceImpl impl * @return */ @Override - public SysRoleIndex getDynamicIndexByUserRole(String username,String version) { + public SysRoleIndex getDynamicIndexByUserRole(String username, String version) { List roles = sysUserRoleMapper.getRoleByUserName(username); String componentUrl = RoleIndexConfigEnum.getIndexByRoles(roles); SysRoleIndex roleIndex = new SysRoleIndex(componentUrl); diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysUserTenantServiceImpl.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysUserTenantServiceImpl.java index 40e7a679..8791b493 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysUserTenantServiceImpl.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysUserTenantServiceImpl.java @@ -5,12 +5,11 @@ import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import org.apache.commons.lang.StringUtils; import org.jeecg.common.constant.CacheConstant; -import org.jeecg.common.constant.CommonConstant; import org.jeecg.common.constant.SymbolConstant; import org.jeecg.common.exception.JeecgBootException; import org.jeecg.common.util.oConvertUtils; -import org.jeecg.modules.system.entity.SysUser; -import org.jeecg.modules.system.entity.SysUserTenant; +import org.jeecg.modules.base.entity.postgre.SysUser; +import org.jeecg.modules.base.entity.postgre.SysUserTenant; import org.jeecg.modules.system.mapper.SysUserMapper; import org.jeecg.modules.system.mapper.SysUserTenantMapper; import org.jeecg.modules.system.service.ISysUserTenantService; diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/impl/ThirdAppDingtalkServiceImpl.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/impl/ThirdAppDingtalkServiceImpl.java index a7be87d5..d919c30e 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/impl/ThirdAppDingtalkServiceImpl.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/impl/ThirdAppDingtalkServiceImpl.java @@ -32,7 +32,7 @@ import org.jeecg.common.util.oConvertUtils; import org.jeecg.config.JeecgBaseConfig; import org.jeecg.config.thirdapp.ThirdAppConfig; import org.jeecg.config.thirdapp.ThirdAppTypeItemVo; -import org.jeecg.modules.system.entity.*; +import org.jeecg.modules.base.entity.postgre.*; import org.jeecg.modules.system.mapper.SysAnnouncementSendMapper; import org.jeecg.modules.system.mapper.SysUserMapper; import org.jeecg.modules.system.model.SysDepartTreeModel; diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/impl/ThirdAppWechatEnterpriseServiceImpl.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/impl/ThirdAppWechatEnterpriseServiceImpl.java index 4eab9290..cf2dfaa6 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/impl/ThirdAppWechatEnterpriseServiceImpl.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/impl/ThirdAppWechatEnterpriseServiceImpl.java @@ -23,7 +23,7 @@ import org.jeecg.common.util.SpringContextUtils; import org.jeecg.common.util.oConvertUtils; import org.jeecg.config.JeecgBaseConfig; import org.jeecg.config.thirdapp.ThirdAppConfig; -import org.jeecg.modules.system.entity.*; +import org.jeecg.modules.base.entity.postgre.*; import org.jeecg.modules.system.mapper.SysAnnouncementSendMapper; import org.jeecg.modules.system.mapper.SysUserMapper; import org.jeecg.modules.system.model.SysDepartTreeModel; diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/util/FindsDepartsChildrenUtil.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/util/FindsDepartsChildrenUtil.java index 4bf73bfc..e082d8a0 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/util/FindsDepartsChildrenUtil.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/util/FindsDepartsChildrenUtil.java @@ -1,12 +1,9 @@ package org.jeecg.modules.system.util; -import org.jeecg.common.constant.CommonConstant; -import org.jeecg.common.util.RedisUtil; import org.jeecg.common.util.oConvertUtils; -import org.jeecg.modules.system.entity.SysDepart; +import org.jeecg.modules.base.entity.postgre.SysDepart; import org.jeecg.modules.system.model.DepartIdModel; import org.jeecg.modules.system.model.SysDepartTreeModel; -import org.springframework.beans.factory.annotation.Autowired; import java.util.ArrayList; import java.util.List; diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/util/PermissionDataUtil.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/util/PermissionDataUtil.java index 211740af..1109f244 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/util/PermissionDataUtil.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/util/PermissionDataUtil.java @@ -5,7 +5,7 @@ import java.util.List; import org.jeecg.common.constant.CommonConstant; import org.jeecg.common.constant.SymbolConstant; import org.jeecg.common.util.oConvertUtils; -import org.jeecg.modules.system.entity.SysPermission; +import org.jeecg.modules.base.entity.postgre.SysPermission; /** * @Author: scott diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/vo/SysDictPage.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/vo/SysDictPage.java index 2bd82a82..fc87b7ff 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/vo/SysDictPage.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/vo/SysDictPage.java @@ -1,7 +1,7 @@ package org.jeecg.modules.system.vo; import lombok.Data; -import org.jeecg.modules.system.entity.SysDictItem; +import org.jeecg.modules.base.entity.postgre.SysDictItem; import org.jeecgframework.poi.excel.annotation.Excel; import org.jeecgframework.poi.excel.annotation.ExcelCollection; diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/vo/UserAvatar.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/vo/UserAvatar.java index d8c55f80..5fab8561 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/vo/UserAvatar.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/vo/UserAvatar.java @@ -1,7 +1,7 @@ package org.jeecg.modules.system.vo; import lombok.Data; -import org.jeecg.modules.system.entity.SysUser; +import org.jeecg.modules.base.entity.postgre.SysUser; /** * 用户名和头像信息 diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/vo/lowapp/SysDictVo.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/vo/lowapp/SysDictVo.java index b2b48dd7..b048c795 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/vo/lowapp/SysDictVo.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/vo/lowapp/SysDictVo.java @@ -3,7 +3,7 @@ package org.jeecg.modules.system.vo.lowapp; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; import lombok.Data; -import org.jeecg.modules.system.entity.SysDictItem; +import org.jeecg.modules.base.entity.postgre.SysDictItem; import java.util.List; diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/vo/lowapp/UpdateDepartInfo.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/vo/lowapp/UpdateDepartInfo.java index 7f483429..570cfe02 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/vo/lowapp/UpdateDepartInfo.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/vo/lowapp/UpdateDepartInfo.java @@ -1,7 +1,7 @@ package org.jeecg.modules.system.vo.lowapp; import lombok.Data; -import org.jeecg.modules.system.entity.SysDepart; +import org.jeecg.modules.base.entity.postgre.SysDepart; import java.util.List; diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/vo/tenant/TenantDepartAuthInfo.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/vo/tenant/TenantDepartAuthInfo.java index 70349ab4..cd835f93 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/vo/tenant/TenantDepartAuthInfo.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/vo/tenant/TenantDepartAuthInfo.java @@ -1,7 +1,7 @@ package org.jeecg.modules.system.vo.tenant; import lombok.Data; -import org.jeecg.modules.system.entity.SysTenant; +import org.jeecg.modules.base.entity.postgre.SysTenant; import java.util.List;