From d75b9f52a8ba63b370a68807241033ea8c835dec Mon Sep 17 00:00:00 2001 From: zhujj Date: Fri, 30 Nov 2018 14:48:16 +0800 Subject: [PATCH] =?UTF-8?q?=E9=87=8D=E6=9E=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ruoyi-admin/pom.xml | 7 +- .../monitor/SysLogininforController.java | 1 - .../monitor/SysOperlogController.java | 1 - .../monitor/SysUserOnlineController.java | 1 - .../system/SysConfigController.java | 1 - .../system/SysDictDataController.java | 1 - .../system/SysDictTypeController.java | 1 - .../system/SysNoticeController.java | 1 - .../controller/system/SysPostController.java | 1 - .../controller/system/SysRoleController.java | 2 +- .../controller/system/SysUserController.java | 2 +- ruoyi-common/pom.xml | 10 +- .../com/ruoyi/common/base/BaseEntity.java | 1 - ruoyi-framework/pom.xml | 25 +- .../shiro/web/filter/LogoutFilter.java | 3 +- .../com/ruoyi/framework/util/EntityUtils.java | 75 ++++ .../web/base/AbstractBaseService.java | 56 +++ .../web/base/AbstractBaseServiceImpl.java | 127 ++++++ .../framework/web/base/BaseController.java | 19 +- .../com/ruoyi/system/domain/SysConfig.java | 102 +++++ .../java/com/ruoyi/system/domain/SysDept.java | 178 +++++++++ .../com/ruoyi/system/domain/SysDictData.java | 161 ++++++++ .../com/ruoyi/system/domain/SysDictType.java | 87 ++++ .../ruoyi/system/domain/SysLogininfor.java | 158 ++++++++ .../java/com/ruoyi/system/domain/SysMenu.java | 180 +++++++++ .../com/ruoyi/system/domain/SysNotice.java | 96 +++++ .../com/ruoyi/system/domain/SysOperLog.java | 233 +++++++++++ .../java/com/ruoyi/system/domain/SysPost.java | 115 ++++++ .../java/com/ruoyi/system/domain/SysRole.java | 170 ++++++++ .../com/ruoyi/system/domain/SysRoleDept.java | 46 +++ .../com/ruoyi/system/domain/SysRoleMenu.java | 46 +++ .../java/com/ruoyi/system/domain/SysUser.java | 308 ++++++++++++++ .../ruoyi/system/domain/SysUserOnline.java | 177 +++++++++ .../com/ruoyi/system/domain/SysUserPost.java | 46 +++ .../com/ruoyi/system/domain/SysUserRole.java | 46 +++ .../ruoyi/system/mapper/SysConfigMapper.java | 61 +++ .../ruoyi/system/mapper/SysDeptMapper.java | 97 +++++ .../system/mapper/SysDictDataMapper.java | 98 +++++ .../system/mapper/SysDictTypeMapper.java | 77 ++++ .../system/mapper/SysLogininforMapper.java | 41 ++ .../ruoyi/system/mapper/SysMenuMapper.java | 109 +++++ .../ruoyi/system/mapper/SysNoticeMapper.java | 53 +++ .../ruoyi/system/mapper/SysOperLogMapper.java | 49 +++ .../ruoyi/system/mapper/SysPostMapper.java | 84 ++++ .../system/mapper/SysRoleDeptMapper.java | 45 +++ .../ruoyi/system/mapper/SysRoleMapper.java | 85 ++++ .../system/mapper/SysRoleMenuMapper.java | 45 +++ .../ruoyi/system/mapper/SysUserMapper.java | 109 +++++ .../system/mapper/SysUserOnlineMapper.java | 53 +++ .../system/mapper/SysUserPostMapper.java | 45 +++ .../system/mapper/SysUserRoleMapper.java | 45 +++ .../system/service/ISysConfigService.java | 70 ++++ .../ruoyi/system/service/ISysDeptService.java | 96 +++++ .../system/service/ISysDictDataService.java | 80 ++++ .../system/service/ISysDictTypeService.java | 78 ++++ .../system/service/ISysLogininforService.java | 42 ++ .../ruoyi/system/service/ISysMenuService.java | 127 ++++++ .../system/service/ISysNoticeService.java | 54 +++ .../system/service/ISysOperLogService.java | 50 +++ .../ruoyi/system/service/ISysPostService.java | 94 +++++ .../ruoyi/system/service/ISysRoleService.java | 119 ++++++ .../system/service/ISysUserOnlineService.java | 69 ++++ .../ruoyi/system/service/ISysUserService.java | 143 +++++++ .../service/impl/SysConfigServiceImpl.java | 120 ++++++ .../service/impl/SysDeptServiceImpl.java | 239 +++++++++++ .../service/impl/SysDictDataServiceImpl.java | 123 ++++++ .../service/impl/SysDictTypeServiceImpl.java | 144 +++++++ .../impl/SysLogininforServiceImpl.java | 71 ++++ .../service/impl/SysMenuServiceImpl.java | 376 ++++++++++++++++++ .../service/impl/SysNoticeServiceImpl.java | 87 ++++ .../service/impl/SysOperLogServiceImpl.java | 82 ++++ .../service/impl/SysPostServiceImpl.java | 184 +++++++++ .../service/impl/SysRoleServiceImpl.java | 301 ++++++++++++++ .../impl/SysUserOnlineServiceImpl.java | 120 ++++++ .../service/impl/SysUserServiceImpl.java | 342 ++++++++++++++++ .../main/resources/mapper/mybatis-config.xml | 15 + .../mapper/system/SysConfigMapper.xml | 108 +++++ .../resources/mapper/system/SysDeptMapper.xml | 139 +++++++ .../mapper/system/SysDictDataMapper.xml | 123 ++++++ .../mapper/system/SysDictTypeMapper.xml | 100 +++++ .../mapper/system/SysLogininforMapper.xml | 56 +++ .../resources/mapper/system/SysMenuMapper.xml | 147 +++++++ .../mapper/system/SysNoticeMapper.xml | 85 ++++ .../mapper/system/SysOperLogMapper.xml | 71 ++++ .../resources/mapper/system/SysPostMapper.xml | 110 +++++ .../mapper/system/SysRoleDeptMapper.xml | 34 ++ .../resources/mapper/system/SysRoleMapper.xml | 131 ++++++ .../mapper/system/SysRoleMenuMapper.xml | 34 ++ .../resources/mapper/system/SysUserMapper.xml | 181 +++++++++ .../mapper/system/SysUserOnlineMapper.xml | 57 +++ .../mapper/system/SysUserPostMapper.xml | 34 ++ .../mapper/system/SysUserRoleMapper.xml | 34 ++ .../controller/GenTableColumnController.java | 1 - .../agile/controller/GenTableController.java | 181 ++++----- .../java/com/ruoyi/agile/domain/GenTable.java | 16 +- .../controller}/BuildController.java | 52 +-- .../generator/controller}/GenController.java | 174 ++++---- .../com/ruoyi/generator/mapper/GenMapper.java | 3 +- .../ruoyi/generator/service/IGenService.java | 4 +- .../service/impl/GenServiceImpl.java | 19 +- .../resources/mapper/agile/GenTableMapper.xml | 25 +- .../templates/agile/genTable/genTable.html | 147 +------ .../resources/templates/tool/build/build.html | 350 ++++++++-------- .../resources/templates/tool/gen/gen.html | 232 +++++------ ruoyi-quartz/pom.xml | 7 +- .../quartz/controller}/SysJobController.java | 323 ++++++++------- .../controller}/SysJobLogController.java | 179 +++++---- .../ruoyi/quartz/mapper/SysJobLogMapper.java | 5 +- .../com/ruoyi/quartz/mapper/SysJobMapper.java | 4 +- .../quartz/service/ISysJobLogService.java | 5 +- .../ruoyi/quartz/service/ISysJobService.java | 5 +- .../service/impl/SysJobLogServiceImpl.java | 7 +- .../service/impl/SysJobServiceImpl.java | 7 +- ruoyi-system/pom.xml | 6 + .../ruoyi/system/mapper/SysConfigMapper.java | 5 +- .../ruoyi/system/mapper/SysDeptMapper.java | 5 +- .../system/mapper/SysDictDataMapper.java | 5 +- .../system/mapper/SysDictTypeMapper.java | 2 +- .../system/mapper/SysLogininforMapper.java | 3 +- .../ruoyi/system/mapper/SysMenuMapper.java | 3 +- .../ruoyi/system/mapper/SysNoticeMapper.java | 3 +- .../ruoyi/system/mapper/SysOperLogMapper.java | 3 +- .../ruoyi/system/mapper/SysPostMapper.java | 3 +- .../system/mapper/SysRoleDeptMapper.java | 3 +- .../ruoyi/system/mapper/SysRoleMapper.java | 3 +- .../system/mapper/SysRoleMenuMapper.java | 3 +- .../ruoyi/system/mapper/SysUserMapper.java | 3 +- .../system/mapper/SysUserOnlineMapper.java | 3 +- .../system/mapper/SysUserPostMapper.java | 3 +- .../system/mapper/SysUserRoleMapper.java | 3 +- .../system/service/ISysConfigService.java | 4 +- .../ruoyi/system/service/ISysDeptService.java | 5 +- .../system/service/ISysDictDataService.java | 5 +- .../system/service/ISysDictTypeService.java | 4 +- .../system/service/ISysLogininforService.java | 4 +- .../ruoyi/system/service/ISysMenuService.java | 4 +- .../system/service/ISysNoticeService.java | 4 +- .../system/service/ISysOperLogService.java | 4 +- .../ruoyi/system/service/ISysPostService.java | 4 +- .../ruoyi/system/service/ISysRoleService.java | 4 +- .../system/service/ISysUserOnlineService.java | 4 +- .../ruoyi/system/service/ISysUserService.java | 4 +- .../service/impl/SysConfigServiceImpl.java | 5 +- .../service/impl/SysDeptServiceImpl.java | 8 +- .../service/impl/SysDictDataServiceImpl.java | 6 +- .../service/impl/SysDictTypeServiceImpl.java | 5 +- .../impl/SysLogininforServiceImpl.java | 6 +- .../service/impl/SysMenuServiceImpl.java | 6 +- .../service/impl/SysNoticeServiceImpl.java | 6 +- .../service/impl/SysOperLogServiceImpl.java | 6 +- .../service/impl/SysPostServiceImpl.java | 7 +- .../service/impl/SysRoleServiceImpl.java | 11 +- .../impl/SysUserOnlineServiceImpl.java | 6 +- .../service/impl/SysUserServiceImpl.java | 17 +- 154 files changed, 9162 insertions(+), 1032 deletions(-) create mode 100644 ruoyi-framework/src/main/java/com/ruoyi/framework/util/EntityUtils.java create mode 100644 ruoyi-framework/src/main/java/com/ruoyi/framework/web/base/AbstractBaseService.java create mode 100644 ruoyi-framework/src/main/java/com/ruoyi/framework/web/base/AbstractBaseServiceImpl.java create mode 100644 ruoyi-framework/src/main/java/com/ruoyi/system/domain/SysConfig.java create mode 100644 ruoyi-framework/src/main/java/com/ruoyi/system/domain/SysDept.java create mode 100644 ruoyi-framework/src/main/java/com/ruoyi/system/domain/SysDictData.java create mode 100644 ruoyi-framework/src/main/java/com/ruoyi/system/domain/SysDictType.java create mode 100644 ruoyi-framework/src/main/java/com/ruoyi/system/domain/SysLogininfor.java create mode 100644 ruoyi-framework/src/main/java/com/ruoyi/system/domain/SysMenu.java create mode 100644 ruoyi-framework/src/main/java/com/ruoyi/system/domain/SysNotice.java create mode 100644 ruoyi-framework/src/main/java/com/ruoyi/system/domain/SysOperLog.java create mode 100644 ruoyi-framework/src/main/java/com/ruoyi/system/domain/SysPost.java create mode 100644 ruoyi-framework/src/main/java/com/ruoyi/system/domain/SysRole.java create mode 100644 ruoyi-framework/src/main/java/com/ruoyi/system/domain/SysRoleDept.java create mode 100644 ruoyi-framework/src/main/java/com/ruoyi/system/domain/SysRoleMenu.java create mode 100644 ruoyi-framework/src/main/java/com/ruoyi/system/domain/SysUser.java create mode 100644 ruoyi-framework/src/main/java/com/ruoyi/system/domain/SysUserOnline.java create mode 100644 ruoyi-framework/src/main/java/com/ruoyi/system/domain/SysUserPost.java create mode 100644 ruoyi-framework/src/main/java/com/ruoyi/system/domain/SysUserRole.java create mode 100644 ruoyi-framework/src/main/java/com/ruoyi/system/mapper/SysConfigMapper.java create mode 100644 ruoyi-framework/src/main/java/com/ruoyi/system/mapper/SysDeptMapper.java create mode 100644 ruoyi-framework/src/main/java/com/ruoyi/system/mapper/SysDictDataMapper.java create mode 100644 ruoyi-framework/src/main/java/com/ruoyi/system/mapper/SysDictTypeMapper.java create mode 100644 ruoyi-framework/src/main/java/com/ruoyi/system/mapper/SysLogininforMapper.java create mode 100644 ruoyi-framework/src/main/java/com/ruoyi/system/mapper/SysMenuMapper.java create mode 100644 ruoyi-framework/src/main/java/com/ruoyi/system/mapper/SysNoticeMapper.java create mode 100644 ruoyi-framework/src/main/java/com/ruoyi/system/mapper/SysOperLogMapper.java create mode 100644 ruoyi-framework/src/main/java/com/ruoyi/system/mapper/SysPostMapper.java create mode 100644 ruoyi-framework/src/main/java/com/ruoyi/system/mapper/SysRoleDeptMapper.java create mode 100644 ruoyi-framework/src/main/java/com/ruoyi/system/mapper/SysRoleMapper.java create mode 100644 ruoyi-framework/src/main/java/com/ruoyi/system/mapper/SysRoleMenuMapper.java create mode 100644 ruoyi-framework/src/main/java/com/ruoyi/system/mapper/SysUserMapper.java create mode 100644 ruoyi-framework/src/main/java/com/ruoyi/system/mapper/SysUserOnlineMapper.java create mode 100644 ruoyi-framework/src/main/java/com/ruoyi/system/mapper/SysUserPostMapper.java create mode 100644 ruoyi-framework/src/main/java/com/ruoyi/system/mapper/SysUserRoleMapper.java create mode 100644 ruoyi-framework/src/main/java/com/ruoyi/system/service/ISysConfigService.java create mode 100644 ruoyi-framework/src/main/java/com/ruoyi/system/service/ISysDeptService.java create mode 100644 ruoyi-framework/src/main/java/com/ruoyi/system/service/ISysDictDataService.java create mode 100644 ruoyi-framework/src/main/java/com/ruoyi/system/service/ISysDictTypeService.java create mode 100644 ruoyi-framework/src/main/java/com/ruoyi/system/service/ISysLogininforService.java create mode 100644 ruoyi-framework/src/main/java/com/ruoyi/system/service/ISysMenuService.java create mode 100644 ruoyi-framework/src/main/java/com/ruoyi/system/service/ISysNoticeService.java create mode 100644 ruoyi-framework/src/main/java/com/ruoyi/system/service/ISysOperLogService.java create mode 100644 ruoyi-framework/src/main/java/com/ruoyi/system/service/ISysPostService.java create mode 100644 ruoyi-framework/src/main/java/com/ruoyi/system/service/ISysRoleService.java create mode 100644 ruoyi-framework/src/main/java/com/ruoyi/system/service/ISysUserOnlineService.java create mode 100644 ruoyi-framework/src/main/java/com/ruoyi/system/service/ISysUserService.java create mode 100644 ruoyi-framework/src/main/java/com/ruoyi/system/service/impl/SysConfigServiceImpl.java create mode 100644 ruoyi-framework/src/main/java/com/ruoyi/system/service/impl/SysDeptServiceImpl.java create mode 100644 ruoyi-framework/src/main/java/com/ruoyi/system/service/impl/SysDictDataServiceImpl.java create mode 100644 ruoyi-framework/src/main/java/com/ruoyi/system/service/impl/SysDictTypeServiceImpl.java create mode 100644 ruoyi-framework/src/main/java/com/ruoyi/system/service/impl/SysLogininforServiceImpl.java create mode 100644 ruoyi-framework/src/main/java/com/ruoyi/system/service/impl/SysMenuServiceImpl.java create mode 100644 ruoyi-framework/src/main/java/com/ruoyi/system/service/impl/SysNoticeServiceImpl.java create mode 100644 ruoyi-framework/src/main/java/com/ruoyi/system/service/impl/SysOperLogServiceImpl.java create mode 100644 ruoyi-framework/src/main/java/com/ruoyi/system/service/impl/SysPostServiceImpl.java create mode 100644 ruoyi-framework/src/main/java/com/ruoyi/system/service/impl/SysRoleServiceImpl.java create mode 100644 ruoyi-framework/src/main/java/com/ruoyi/system/service/impl/SysUserOnlineServiceImpl.java create mode 100644 ruoyi-framework/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java create mode 100644 ruoyi-framework/src/main/resources/mapper/mybatis-config.xml create mode 100644 ruoyi-framework/src/main/resources/mapper/system/SysConfigMapper.xml create mode 100644 ruoyi-framework/src/main/resources/mapper/system/SysDeptMapper.xml create mode 100644 ruoyi-framework/src/main/resources/mapper/system/SysDictDataMapper.xml create mode 100644 ruoyi-framework/src/main/resources/mapper/system/SysDictTypeMapper.xml create mode 100644 ruoyi-framework/src/main/resources/mapper/system/SysLogininforMapper.xml create mode 100644 ruoyi-framework/src/main/resources/mapper/system/SysMenuMapper.xml create mode 100644 ruoyi-framework/src/main/resources/mapper/system/SysNoticeMapper.xml create mode 100644 ruoyi-framework/src/main/resources/mapper/system/SysOperLogMapper.xml create mode 100644 ruoyi-framework/src/main/resources/mapper/system/SysPostMapper.xml create mode 100644 ruoyi-framework/src/main/resources/mapper/system/SysRoleDeptMapper.xml create mode 100644 ruoyi-framework/src/main/resources/mapper/system/SysRoleMapper.xml create mode 100644 ruoyi-framework/src/main/resources/mapper/system/SysRoleMenuMapper.xml create mode 100644 ruoyi-framework/src/main/resources/mapper/system/SysUserMapper.xml create mode 100644 ruoyi-framework/src/main/resources/mapper/system/SysUserOnlineMapper.xml create mode 100644 ruoyi-framework/src/main/resources/mapper/system/SysUserPostMapper.xml create mode 100644 ruoyi-framework/src/main/resources/mapper/system/SysUserRoleMapper.xml rename {ruoyi-admin/src/main/java/com/ruoyi/web/controller/tool => ruoyi-generator/src/main/java/com/ruoyi/generator/controller}/BuildController.java (90%) rename {ruoyi-admin/src/main/java/com/ruoyi/web/controller/tool => ruoyi-generator/src/main/java/com/ruoyi/generator/controller}/GenController.java (85%) rename {ruoyi-admin => ruoyi-generator}/src/main/resources/templates/tool/build/build.html (98%) rename {ruoyi-admin => ruoyi-generator}/src/main/resources/templates/tool/gen/gen.html (97%) rename {ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitor => ruoyi-quartz/src/main/java/com/ruoyi/quartz/controller}/SysJobController.java (95%) rename {ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitor => ruoyi-quartz/src/main/java/com/ruoyi/quartz/controller}/SysJobLogController.java (94%) diff --git a/ruoyi-admin/pom.xml b/ruoyi-admin/pom.xml index 72e54ec37..0be310016 100644 --- a/ruoyi-admin/pom.xml +++ b/ruoyi-admin/pom.xml @@ -46,7 +46,6 @@ ${ruoyi.version} - com.ruoyi @@ -54,6 +53,12 @@ ${ruoyi.version} + diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitor/SysLogininforController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitor/SysLogininforController.java index 656e05bfc..7e7b977e2 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitor/SysLogininforController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitor/SysLogininforController.java @@ -43,7 +43,6 @@ public class SysLogininforController extends BaseController @ResponseBody public TableDataInfo list(SysLogininfor logininfor) { - startPage(); List list = logininforService.selectLogininforList(logininfor); return getDataTable(list); } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitor/SysOperlogController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitor/SysOperlogController.java index a4945211f..c441aa88c 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitor/SysOperlogController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitor/SysOperlogController.java @@ -45,7 +45,6 @@ public class SysOperlogController extends BaseController @ResponseBody public TableDataInfo list(SysOperLog operLog) { - startPage(); List list = operLogService.selectOperLogList(operLog); return getDataTable(list); } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitor/SysUserOnlineController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitor/SysUserOnlineController.java index cb8f944ac..69c355dd1 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitor/SysUserOnlineController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitor/SysUserOnlineController.java @@ -50,7 +50,6 @@ public class SysUserOnlineController extends BaseController @ResponseBody public TableDataInfo list(SysUserOnline userOnline) { - startPage(); List list = userOnlineService.selectUserOnlineList(userOnline); return getDataTable(list); } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysConfigController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysConfigController.java index 31c670e8b..08da5deb9 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysConfigController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysConfigController.java @@ -49,7 +49,6 @@ public class SysConfigController extends BaseController @ResponseBody public TableDataInfo list(SysConfig config) { - startPage(); List list = configService.selectConfigList(config); return getDataTable(list); } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysDictDataController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysDictDataController.java index 29f8d8715..e92361500 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysDictDataController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysDictDataController.java @@ -46,7 +46,6 @@ public class SysDictDataController extends BaseController @ResponseBody public TableDataInfo list(SysDictData dictData) { - startPage(); List list = dictDataService.selectDictDataList(dictData); return getDataTable(list); } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysDictTypeController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysDictTypeController.java index 0d17fde61..f76a8f728 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysDictTypeController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysDictTypeController.java @@ -46,7 +46,6 @@ public class SysDictTypeController extends BaseController @ResponseBody public TableDataInfo list(SysDictType dictType) { - startPage(); List list = dictTypeService.selectDictTypeList(dictType); return getDataTable(list); } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysNoticeController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysNoticeController.java index b2ca9e439..b73473191 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysNoticeController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysNoticeController.java @@ -48,7 +48,6 @@ public class SysNoticeController extends BaseController @ResponseBody public TableDataInfo list(SysNotice notice) { - startPage(); List list = noticeService.selectNoticeList(notice); return getDataTable(list); } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysPostController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysPostController.java index b6d7267a7..068fc97b1 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysPostController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysPostController.java @@ -46,7 +46,6 @@ public class SysPostController extends BaseController @ResponseBody public TableDataInfo list(SysPost post) { - startPage(); List list = postService.selectPostList(post); return getDataTable(list); } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysRoleController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysRoleController.java index 0ea0f386d..e5970d39c 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysRoleController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysRoleController.java @@ -47,7 +47,7 @@ public class SysRoleController extends BaseController @ResponseBody public TableDataInfo list(SysRole role) { - startPage(); + List list = roleService.selectRoleList(role); return getDataTable(list); } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysUserController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysUserController.java index c00f7439b..c0fe2e03f 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysUserController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysUserController.java @@ -60,7 +60,7 @@ public class SysUserController extends BaseController @ResponseBody public TableDataInfo list(SysUser user) { - startPage(); + List list = userService.selectUserList(user); return getDataTable(list); } diff --git a/ruoyi-common/pom.xml b/ruoyi-common/pom.xml index 32552e111..b4f93f892 100644 --- a/ruoyi-common/pom.xml +++ b/ruoyi-common/pom.xml @@ -69,7 +69,13 @@ org.yaml snakeyaml - - + + + tk.mybatis + mapper-spring-boot-starter + 2.1.0 + + + \ No newline at end of file diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/base/BaseEntity.java b/ruoyi-common/src/main/java/com/ruoyi/common/base/BaseEntity.java index a3a9c4bb4..e881c4865 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/base/BaseEntity.java +++ b/ruoyi-common/src/main/java/com/ruoyi/common/base/BaseEntity.java @@ -67,7 +67,6 @@ public class BaseEntity implements Serializable { this.createTime = createTime; } - public String getUpdateBy() { return updateBy; diff --git a/ruoyi-framework/pom.xml b/ruoyi-framework/pom.xml index 8815cc5f7..b94d18a75 100644 --- a/ruoyi-framework/pom.xml +++ b/ruoyi-framework/pom.xml @@ -90,20 +90,19 @@ ${bitwalker.version} - - - com.ruoyi - ruoyi-system - ${ruoyi.version} - - - - - com.ruoyi - ruoyi-quartz - ${ruoyi.version} - + + + com.ruoyi + ruoyi-common + ${ruoyi.version} + + + + tk.mybatis + mapper-spring-boot-starter + 2.1.0 + diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/shiro/web/filter/LogoutFilter.java b/ruoyi-framework/src/main/java/com/ruoyi/framework/shiro/web/filter/LogoutFilter.java index bf70f17cd..c371c2746 100644 --- a/ruoyi-framework/src/main/java/com/ruoyi/framework/shiro/web/filter/LogoutFilter.java +++ b/ruoyi-framework/src/main/java/com/ruoyi/framework/shiro/web/filter/LogoutFilter.java @@ -2,6 +2,8 @@ package com.ruoyi.framework.shiro.web.filter; import javax.servlet.ServletRequest; import javax.servlet.ServletResponse; + +import com.ruoyi.system.domain.SysUser; import org.apache.shiro.session.SessionException; import org.apache.shiro.subject.Subject; import org.slf4j.Logger; @@ -12,7 +14,6 @@ import com.ruoyi.framework.manager.AsyncManager; import com.ruoyi.framework.manager.factory.AsyncFactory; import com.ruoyi.framework.util.MessageUtils; import com.ruoyi.framework.util.ShiroUtils; -import com.ruoyi.system.domain.SysUser; /** * 退出过滤器 diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/util/EntityUtils.java b/ruoyi-framework/src/main/java/com/ruoyi/framework/util/EntityUtils.java new file mode 100644 index 000000000..6be47cfbc --- /dev/null +++ b/ruoyi-framework/src/main/java/com/ruoyi/framework/util/EntityUtils.java @@ -0,0 +1,75 @@ +package com.ruoyi.framework.util; + +import org.springframework.util.ReflectionUtils; +import org.springframework.web.context.request.RequestContextHolder; +import org.springframework.web.context.request.ServletRequestAttributes; + +import javax.servlet.http.HttpServletRequest; +import java.lang.reflect.Field; +import java.lang.reflect.Method; +import java.net.URLDecoder; +import java.util.Date; + + +/** + * 实体类相关工具类 + * 解决问题： 1、快速对实体的常驻字段，如：createUser、updateUser等值快速注入 + * + * @author Ace + * @version 1.0 + * @date 2016年4月18日 + * @since 1.7 + */ +public class EntityUtils { + /** + * 快速将bean的crtUser、crtHost、crtTime、updUser、updHost、updTime附上相关值 + * + * @param entity 实体bean + * @author 王浩彬 + */ + public static void setCreatAndUpdatInfo(T entity) { + setCreateInfo(entity); + setUpdatedInfo(entity); + } + + /** + * 快速将bean的crtUser、crtHost、crtTime附上相关值 + * + * @param entity 实体bean + * @author 王浩彬 + */ + public static void setCreateInfo(T entity){ + try { + Method[] methods = entity.getClass().getMethods(); + for(Method m : methods){ + if(m.getName().equals("setCreateBy")){ + m.invoke(entity, ShiroUtils.getUserId()); + } + } + } catch (Exception e) { + e.printStackTrace(); + } + } + + /** + * 快速将bean的updUser、updHost、updTime附上相关值 + * + * @param entity 实体bean + * @author 王浩彬 + */ + public static void setUpdatedInfo(T entity){ + try { + Method[] methods = entity.getClass().getMethods(); + for(Method m : methods){ + if(m.getName().equals("setCreateBy")){ + m.invoke(entity, ShiroUtils.getUserId()); + }else if(m.getName().equals("setUpdateBy")){ + m.invoke(entity, ShiroUtils.getUserId()); + } + } + } catch (Exception e) { + e.printStackTrace(); + } + } + +} diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/web/base/AbstractBaseService.java b/ruoyi-framework/src/main/java/com/ruoyi/framework/web/base/AbstractBaseService.java new file mode 100644 index 000000000..b67c58336 --- /dev/null +++ b/ruoyi-framework/src/main/java/com/ruoyi/framework/web/base/AbstractBaseService.java @@ -0,0 +1,56 @@ +package com.ruoyi.framework.web.base; + +import java.util.List; + +/** + * @Author agile + * Date: 17/1/13 + * Time: 15:13 + * Version 1.0.0 + */ +public abstract interface AbstractBaseService { + + public T selectOne(T entity); + + + public T selectById(Object id); + + + public List selectList(T entity) ; + + + public List selectListAll(); + + + public Long selectCount(T entity); + + + public void insert(T entity); + + + public void insertSelective(T entity); + + + public void delete(T entity) ; + + + public void deleteById(Object id); + + + public void updateById(T entity) ; + + + public void updateSelectiveById(T entity); + + public List selectByExample(Object example); + + public int selectCountByExample(Object example); + + + + public List selectByQuery(T entity) ; + /** + * 设置请求分页数据 + */ + public void startPage(); +} diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/web/base/AbstractBaseServiceImpl.java b/ruoyi-framework/src/main/java/com/ruoyi/framework/web/base/AbstractBaseServiceImpl.java new file mode 100644 index 000000000..32d254a7f --- /dev/null +++ b/ruoyi-framework/src/main/java/com/ruoyi/framework/web/base/AbstractBaseServiceImpl.java @@ -0,0 +1,127 @@ +package com.ruoyi.framework.web.base; + +import com.github.pagehelper.PageHelper; +import com.ruoyi.common.utils.StringUtils; +import com.ruoyi.framework.util.EntityUtils; +import com.ruoyi.framework.web.page.PageDomain; +import com.ruoyi.framework.web.page.TableSupport; +import org.springframework.beans.factory.annotation.Autowired; +import tk.mybatis.mapper.common.Mapper; + +import java.util.List; + +/** + * @Author agile + * Date: 17/1/13 + * Time: 15:13 + * Version 1.0.0 + */ +public abstract class AbstractBaseServiceImpl, T> implements AbstractBaseService{ + @Autowired + protected M mapper; + public void setMapper(M mapper) { + this.mapper = mapper; + } + @Override + public T selectOne(T entity) { + return mapper.selectOne(entity); + } + + + @Override + public T selectById(Object id) { + return mapper.selectByPrimaryKey(id); + } + + + @Override + public List selectList(T entity) { + return mapper.select(entity); + } + + + @Override + public List selectListAll() { + return mapper.selectAll(); + } + + + @Override + public Long selectCount(T entity) { + return new Long(mapper.selectCount(entity)); + } + + + @Override + public void insert(T entity) { + EntityUtils.setCreatAndUpdatInfo(entity); + mapper.insert(entity); + } + + + @Override + public void insertSelective(T entity) { + EntityUtils.setCreatAndUpdatInfo(entity); + mapper.insertSelective(entity); + } + + + @Override + public void delete(T entity) { + mapper.delete(entity); + } + + + @Override + public void deleteById(Object id) { + mapper.deleteByPrimaryKey(id); + } + + + @Override + public void updateById(T entity) { + EntityUtils.setUpdatedInfo(entity); + mapper.updateByPrimaryKey(entity); + } + + + @Override + public void updateSelectiveById(T entity) { + EntityUtils.setUpdatedInfo(entity); + mapper.updateByPrimaryKeySelective(entity); + + } + + @Override + public List selectByExample(Object example) { + return mapper.selectByExample(example); + } + + @Override + public int selectCountByExample(Object example) { + return mapper.selectCountByExample(example); + } + + + + @Override + public List selectByQuery(T entity) { + startPage(); + return mapper.select(entity); + } + /** + * 设置请求分页数据 + */ + @Override + public void startPage() + { + PageDomain pageDomain = TableSupport.buildPageRequest(); + Integer pageNum = pageDomain.getPageNum(); + Integer pageSize = pageDomain.getPageSize(); + if (StringUtils.isNotNull(pageNum) && StringUtils.isNotNull(pageSize)) + { + String orderBy = pageDomain.getOrderBy(); + PageHelper.startPage(pageNum, pageSize, orderBy); + } + } +} diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/web/base/BaseController.java b/ruoyi-framework/src/main/java/com/ruoyi/framework/web/base/BaseController.java index 2d9e62573..f8f956009 100644 --- a/ruoyi-framework/src/main/java/com/ruoyi/framework/web/base/BaseController.java +++ b/ruoyi-framework/src/main/java/com/ruoyi/framework/web/base/BaseController.java @@ -3,6 +3,8 @@ package com.ruoyi.framework.web.base; import java.beans.PropertyEditorSupport; import java.util.Date; import java.util.List; + +import com.ruoyi.system.domain.SysUser; import org.springframework.web.bind.WebDataBinder; import org.springframework.web.bind.annotation.InitBinder; import com.github.pagehelper.PageHelper; @@ -14,7 +16,6 @@ import com.ruoyi.framework.util.ShiroUtils; import com.ruoyi.framework.web.page.PageDomain; import com.ruoyi.framework.web.page.TableDataInfo; import com.ruoyi.framework.web.page.TableSupport; -import com.ruoyi.system.domain.SysUser; /** * web层通用数据处理 @@ -40,20 +41,6 @@ public class BaseController }); } - /** - * 设置请求分页数据 - */ - protected void startPage() - { - PageDomain pageDomain = TableSupport.buildPageRequest(); - Integer pageNum = pageDomain.getPageNum(); - Integer pageSize = pageDomain.getPageSize(); - if (StringUtils.isNotNull(pageNum) && StringUtils.isNotNull(pageSize)) - { - String orderBy = pageDomain.getOrderBy(); - PageHelper.startPage(pageNum, pageSize, orderBy); - } - } /** * 响应请求分页数据 @@ -70,7 +57,7 @@ public class BaseController /** * 响应返回结果 - * + * * @param rows 影响行数 * @return 操作结果 */ diff --git a/ruoyi-framework/src/main/java/com/ruoyi/system/domain/SysConfig.java b/ruoyi-framework/src/main/java/com/ruoyi/system/domain/SysConfig.java new file mode 100644 index 000000000..d1209a0b5 --- /dev/null +++ b/ruoyi-framework/src/main/java/com/ruoyi/system/domain/SysConfig.java @@ -0,0 +1,102 @@ +package com.ruoyi.system.domain; + +import org.apache.commons.lang3.builder.ToStringBuilder; +import org.apache.commons.lang3.builder.ToStringStyle; +import com.ruoyi.common.annotation.Excel; +import com.ruoyi.common.base.BaseEntity; + +/** + * 参数配置表 sys_config + * + * @author ruoyi + */ +public class SysConfig extends BaseEntity +{ + private static final long serialVersionUID = 1L; + + /** 参数主键 */ + @Excel(name = "参数主键") + private Long configId; + + /** 参数名称 */ + @Excel(name = "参数名称") + private String configName; + + /** 参数键名 */ + @Excel(name = "参数键名") + private String configKey; + + /** 参数键值 */ + @Excel(name = "参数键值") + private String configValue; + + /** 系统内置（Y是 N否） */ + @Excel(name = "系统内置", readConverterExp = "Y=是,N=否") + private String configType; + + public Long getConfigId() + { + return configId; + } + + public void setConfigId(Long configId) + { + this.configId = configId; + } + + public String getConfigName() + { + return configName; + } + + public void setConfigName(String configName) + { + this.configName = configName; + } + + public String getConfigKey() + { + return configKey; + } + + public void setConfigKey(String configKey) + { + this.configKey = configKey; + } + + public String getConfigValue() + { + return configValue; + } + + public void setConfigValue(String configValue) + { + this.configValue = configValue; + } + + public String getConfigType() + { + return configType; + } + + public void setConfigType(String configType) + { + this.configType = configType; + } + + @Override + public String toString() { + return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) + .append("configId", getConfigId()) + .append("configName", getConfigName()) + .append("configKey", getConfigKey()) + .append("configValue", getConfigValue()) + .append("configType", getConfigType()) + .append("createBy", getCreateBy()) + .append("createTime", getCreateTime()) + .append("updateBy", getUpdateBy()) + .append("updateTime", getUpdateTime()) + .append("remark", getRemark()) + .toString(); + } +} diff --git a/ruoyi-framework/src/main/java/com/ruoyi/system/domain/SysDept.java b/ruoyi-framework/src/main/java/com/ruoyi/system/domain/SysDept.java new file mode 100644 index 000000000..e3bd54906 --- /dev/null +++ b/ruoyi-framework/src/main/java/com/ruoyi/system/domain/SysDept.java @@ -0,0 +1,178 @@ +package com.ruoyi.system.domain; + +import org.apache.commons.lang3.builder.ToStringBuilder; +import org.apache.commons.lang3.builder.ToStringStyle; +import com.ruoyi.common.base.BaseEntity; + +/** + * 部门表 sys_dept + * + * @author ruoyi + */ +public class SysDept extends BaseEntity +{ + private static final long serialVersionUID = 1L; + + /** 部门ID */ + private Long deptId; + + /** 父部门ID */ + private Long parentId; + + /** 祖级列表 */ + private String ancestors; + + /** 部门名称 */ + private String deptName; + + /** 显示顺序 */ + private String orderNum; + + /** 负责人 */ + private String leader; + + /** 联系电话 */ + private String phone; + + /** 邮箱 */ + private String email; + + /** 部门状态:0正常,1停用 */ + private String status; + + /** 删除标志（0代表存在 2代表删除） */ + private String delFlag; + + /** 父部门名称 */ + private String parentName; + + public Long getDeptId() + { + return deptId; + } + + public void setDeptId(Long deptId) + { + this.deptId = deptId; + } + + public Long getParentId() + { + return parentId; + } + + public void setParentId(Long parentId) + { + this.parentId = parentId; + } + + public String getAncestors() + { + return ancestors; + } + + public void setAncestors(String ancestors) + { + this.ancestors = ancestors; + } + + public String getDeptName() + { + return deptName; + } + + public void setDeptName(String deptName) + { + this.deptName = deptName; + } + + public String getOrderNum() + { + return orderNum; + } + + public void setOrderNum(String orderNum) + { + this.orderNum = orderNum; + } + + public String getLeader() + { + return leader; + } + + public void setLeader(String leader) + { + this.leader = leader; + } + + public String getPhone() + { + return phone; + } + + public void setPhone(String phone) + { + this.phone = phone; + } + + public String getEmail() + { + return email; + } + + public void setEmail(String email) + { + this.email = email; + } + + public String getStatus() + { + return status; + } + + public void setStatus(String status) + { + this.status = status; + } + + public String getDelFlag() + { + return delFlag; + } + + public void setDelFlag(String delFlag) + { + this.delFlag = delFlag; + } + + public String getParentName() + { + return parentName; + } + + public void setParentName(String parentName) + { + this.parentName = parentName; + } + + @Override + public String toString() { + return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) + .append("deptId", getDeptId()) + .append("parentId", getParentId()) + .append("ancestors", getAncestors()) + .append("deptName", getDeptName()) + .append("orderNum", getOrderNum()) + .append("leader", getLeader()) + .append("phone", getPhone()) + .append("email", getEmail()) + .append("status", getStatus()) + .append("delFlag", getDelFlag()) + .append("createBy", getCreateBy()) + .append("createTime", getCreateTime()) + .append("updateBy", getUpdateBy()) + .append("updateTime", getUpdateTime()) + .toString(); + } +} diff --git a/ruoyi-framework/src/main/java/com/ruoyi/system/domain/SysDictData.java b/ruoyi-framework/src/main/java/com/ruoyi/system/domain/SysDictData.java new file mode 100644 index 000000000..dcfd57dc3 --- /dev/null +++ b/ruoyi-framework/src/main/java/com/ruoyi/system/domain/SysDictData.java @@ -0,0 +1,161 @@ +package com.ruoyi.system.domain; + +import org.apache.commons.lang3.builder.ToStringBuilder; +import org.apache.commons.lang3.builder.ToStringStyle; +import com.ruoyi.common.annotation.Excel; +import com.ruoyi.common.base.BaseEntity; + +/** + * 字典数据表 sys_dict_data + * + * @author ruoyi + */ +public class SysDictData extends BaseEntity +{ + private static final long serialVersionUID = 1L; + + /** 字典编码 */ + @Excel(name = "字典编码") + private Long dictCode; + + /** 字典排序 */ + @Excel(name = "字典排序") + private Long dictSort; + + /** 字典标签 */ + @Excel(name = "字典标签") + private String dictLabel; + + /** 字典键值 */ + @Excel(name = "字典键值") + private String dictValue; + + /** 字典类型 */ + @Excel(name = "字典类型") + private String dictType; + + /** 样式属性（其他样式扩展） */ + @Excel(name = "字典样式") + private String cssClass; + + /** 表格字典样式 */ + private String listClass; + + /** 是否默认（Y是 N否） */ + @Excel(name = "是否默认", readConverterExp = "Y=是,N=否") + private String isDefault; + + /** 状态（0正常 1停用） */ + @Excel(name = "状态", readConverterExp = "0=正常,1=停用") + private String status; + + public Long getDictCode() + { + return dictCode; + } + + public void setDictCode(Long dictCode) + { + this.dictCode = dictCode; + } + + public Long getDictSort() + { + return dictSort; + } + + public void setDictSort(Long dictSort) + { + this.dictSort = dictSort; + } + + public String getDictLabel() + { + return dictLabel; + } + + public void setDictLabel(String dictLabel) + { + this.dictLabel = dictLabel; + } + + public String getDictValue() + { + return dictValue; + } + + public void setDictValue(String dictValue) + { + this.dictValue = dictValue; + } + + public String getDictType() + { + return dictType; + } + + public void setDictType(String dictType) + { + this.dictType = dictType; + } + + public String getCssClass() + { + return cssClass; + } + + public void setCssClass(String cssClass) + { + this.cssClass = cssClass; + } + + public String getListClass() + { + return listClass; + } + + public void setListClass(String listClass) + { + this.listClass = listClass; + } + + public String getIsDefault() + { + return isDefault; + } + + public void setIsDefault(String isDefault) + { + this.isDefault = isDefault; + } + + public String getStatus() + { + return status; + } + + public void setStatus(String status) + { + this.status = status; + } + + @Override + public String toString() { + return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) + .append("dictCode", getDictCode()) + .append("dictSort", getDictSort()) + .append("dictLabel", getDictLabel()) + .append("dictValue", getDictValue()) + .append("dictType", getDictType()) + .append("cssClass", getCssClass()) + .append("listClass", getListClass()) + .append("isDefault", getIsDefault()) + .append("status", getStatus()) + .append("createBy", getCreateBy()) + .append("createTime", getCreateTime()) + .append("updateBy", getUpdateBy()) + .append("updateTime", getUpdateTime()) + .append("remark", getRemark()) + .toString(); + } +} diff --git a/ruoyi-framework/src/main/java/com/ruoyi/system/domain/SysDictType.java b/ruoyi-framework/src/main/java/com/ruoyi/system/domain/SysDictType.java new file mode 100644 index 000000000..f7b04b1f5 --- /dev/null +++ b/ruoyi-framework/src/main/java/com/ruoyi/system/domain/SysDictType.java @@ -0,0 +1,87 @@ +package com.ruoyi.system.domain; + +import org.apache.commons.lang3.builder.ToStringBuilder; +import org.apache.commons.lang3.builder.ToStringStyle; +import com.ruoyi.common.annotation.Excel; +import com.ruoyi.common.base.BaseEntity; + +/** + * 字典类型表 sys_dict_type + * + * @author ruoyi + */ +public class SysDictType extends BaseEntity +{ + private static final long serialVersionUID = 1L; + + /** 字典主键 */ + @Excel(name = "字典主键") + private Long dictId; + + /** 字典名称 */ + @Excel(name = "字典名称") + private String dictName; + + /** 字典类型 */ + @Excel(name = "字典类型 ") + private String dictType; + + /** 状态（0正常 1停用） */ + @Excel(name = "状态", readConverterExp = "0=正常,1=停用") + private String status; + + public Long getDictId() + { + return dictId; + } + + public void setDictId(Long dictId) + { + this.dictId = dictId; + } + + public String getDictName() + { + return dictName; + } + + public void setDictName(String dictName) + { + this.dictName = dictName; + } + + public String getDictType() + { + return dictType; + } + + public void setDictType(String dictType) + { + this.dictType = dictType; + } + + public String getStatus() + { + return status; + } + + public void setStatus(String status) + { + this.status = status; + } + + @Override + public String toString() { + return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) + .append("dictId", getDictId()) + .append("dictName", getDictName()) + .append("dictType", getDictType()) + .append("status", getStatus()) + .append("createBy", getCreateBy()) + .append("createTime", getCreateTime()) + .append("updateBy", getUpdateBy()) + .append("updateTime", getUpdateTime()) + .append("remark", getRemark()) + .toString(); + } +} diff --git a/ruoyi-framework/src/main/java/com/ruoyi/system/domain/SysLogininfor.java b/ruoyi-framework/src/main/java/com/ruoyi/system/domain/SysLogininfor.java new file mode 100644 index 000000000..2f112516b --- /dev/null +++ b/ruoyi-framework/src/main/java/com/ruoyi/system/domain/SysLogininfor.java @@ -0,0 +1,158 @@ +package com.ruoyi.system.domain; + +import org.apache.commons.lang3.builder.ToStringBuilder; +import org.apache.commons.lang3.builder.ToStringStyle; +import java.util.Date; +import com.ruoyi.common.annotation.Excel; +import com.ruoyi.common.base.BaseEntity; + +/** + * 系统访问记录表 sys_logininfor + * + * @author ruoyi + */ +public class SysLogininfor extends BaseEntity +{ + private static final long serialVersionUID = 1L; + + /** ID */ + @Excel(name = "序号") + private Long infoId; + + /** 用户账号 */ + @Excel(name = "用户账号") + private String loginName; + + /** 登录状态 0成功 1失败 */ + @Excel(name = "登录状态", readConverterExp = "0=成功,1=失败") + private String status; + + /** 登录IP地址 */ + @Excel(name = "登录地址") + private String ipaddr; + + /** 登录地点 */ + @Excel(name = "登录地点") + private String loginLocation; + + /** 浏览器类型 */ + @Excel(name = "浏览器") + private String browser; + + /** 操作系统 */ + @Excel(name = "操作系统 ") + private String os; + + /** 提示消息 */ + @Excel(name = "提示消息") + private String msg; + + /** 访问时间 */ + @Excel(name = "访问时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss") + private Date loginTime; + + public Long getInfoId() + { + return infoId; + } + + public void setInfoId(Long infoId) + { + this.infoId = infoId; + } + + public String getLoginName() + { + return loginName; + } + + public void setLoginName(String loginName) + { + this.loginName = loginName; + } + + public String getStatus() + { + return status; + } + + public void setStatus(String status) + { + this.status = status; + } + + public String getIpaddr() + { + return ipaddr; + } + + public void setIpaddr(String ipaddr) + { + this.ipaddr = ipaddr; + } + + public String getLoginLocation() + { + return loginLocation; + } + + public void setLoginLocation(String loginLocation) + { + this.loginLocation = loginLocation; + } + + public String getBrowser() + { + return browser; + } + + public void setBrowser(String browser) + { + this.browser = browser; + } + + public String getOs() + { + return os; + } + + public void setOs(String os) + { + this.os = os; + } + + public String getMsg() + { + return msg; + } + + public void setMsg(String msg) + { + this.msg = msg; + } + + public Date getLoginTime() + { + return loginTime; + } + + public void setLoginTime(Date loginTime) + { + this.loginTime = loginTime; + } + + @Override + public String toString() { + return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) + .append("infoId", getInfoId()) + .append("loginName", getLoginName()) + .append("ipaddr", getIpaddr()) + .append("loginLocation", getLoginLocation()) + .append("browser", getBrowser()) + .append("os", getOs()) + .append("status", getStatus()) + .append("msg", getMsg()) + .append("loginTime", getLoginTime()) + .toString(); + } +} \ No newline at end of file diff --git a/ruoyi-framework/src/main/java/com/ruoyi/system/domain/SysMenu.java b/ruoyi-framework/src/main/java/com/ruoyi/system/domain/SysMenu.java new file mode 100644 index 000000000..69e9bcf8a --- /dev/null +++ b/ruoyi-framework/src/main/java/com/ruoyi/system/domain/SysMenu.java @@ -0,0 +1,180 @@ +package com.ruoyi.system.domain; + +import org.apache.commons.lang3.builder.ToStringBuilder; +import org.apache.commons.lang3.builder.ToStringStyle; +import java.util.ArrayList; +import java.util.List; +import com.ruoyi.common.base.BaseEntity; + +/** + * 菜单权限表 sys_menu + * + * @author ruoyi + */ +public class SysMenu extends BaseEntity +{ + private static final long serialVersionUID = 1L; + + /** 菜单ID */ + private Long menuId; + + /** 菜单名称 */ + private String menuName; + + /** 父菜单名称 */ + private String parentName; + + /** 父菜单ID */ + private Long parentId; + + /** 显示顺序 */ + private String orderNum; + + /** 菜单URL */ + private String url; + + /** 类型:0目录,1菜单,2按钮 */ + private String menuType; + + /** 菜单状态:0显示,1隐藏 */ + private String visible; + + /** 权限字符串 */ + private String perms; + + /** 菜单图标 */ + private String icon; + + /** 子菜单 */ + private List children = new ArrayList(); + + public Long getMenuId() + { + return menuId; + } + + public void setMenuId(Long menuId) + { + this.menuId = menuId; + } + + public String getMenuName() + { + return menuName; + } + + public void setMenuName(String menuName) + { + this.menuName = menuName; + } + + public String getParentName() + { + return parentName; + } + + public void setParentName(String parentName) + { + this.parentName = parentName; + } + + public Long getParentId() + { + return parentId; + } + + public void setParentId(Long parentId) + { + this.parentId = parentId; + } + + public String getOrderNum() + { + return orderNum; + } + + public void setOrderNum(String orderNum) + { + this.orderNum = orderNum; + } + + public String getUrl() + { + return url; + } + + public void setUrl(String url) + { + this.url = url; + } + + public String getMenuType() + { + return menuType; + } + + public void setMenuType(String menuType) + { + this.menuType = menuType; + } + + public String getVisible() + { + return visible; + } + + public void setVisible(String visible) + { + this.visible = visible; + } + + public String getPerms() + { + return perms; + } + + public void setPerms(String perms) + { + this.perms = perms; + } + + public String getIcon() + { + return icon; + } + + public void setIcon(String icon) + { + this.icon = icon; + } + + public List getChildren() + { + return children; + } + + public void setChildren(List children) + { + this.children = children; + } + + @Override + public String toString() { + return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) + .append("menuId", getMenuId()) + .append("menuName", getMenuName()) + .append("parentId", getParentId()) + .append("orderNum", getOrderNum()) + .append("url", getUrl()) + .append("menuType", getMenuType()) + .append("visible", getVisible()) + .append("perms", getPerms()) + .append("icon", getIcon()) + .append("createBy", getCreateBy()) + .append("createTime", getCreateTime()) + .append("updateBy", getUpdateBy()) + .append("updateTime", getUpdateTime()) + .append("remark", getRemark()) + .toString(); + } +} diff --git a/ruoyi-framework/src/main/java/com/ruoyi/system/domain/SysNotice.java b/ruoyi-framework/src/main/java/com/ruoyi/system/domain/SysNotice.java new file mode 100644 index 000000000..d43e88df5 --- /dev/null +++ b/ruoyi-framework/src/main/java/com/ruoyi/system/domain/SysNotice.java @@ -0,0 +1,96 @@ +package com.ruoyi.system.domain; + +import org.apache.commons.lang3.builder.ToStringBuilder; +import org.apache.commons.lang3.builder.ToStringStyle; +import com.ruoyi.common.base.BaseEntity; + +/** + * 通知公告表 sys_notice + * + * @author ruoyi + */ +public class SysNotice extends BaseEntity +{ + private static final long serialVersionUID = 1L; + + /** 公告ID */ + private Long noticeId; + + /** 公告标题 */ + private String noticeTitle; + + /** 公告类型（1通知 2公告） */ + private String noticeType; + + /** 公告内容 */ + private String noticeContent; + + /** 公告状态（0正常 1关闭） */ + private String status; + + public Long getNoticeId() + { + return noticeId; + } + + public void setNoticeId(Long noticeId) + { + this.noticeId = noticeId; + } + + public void setNoticeTitle(String noticeTitle) + { + this.noticeTitle = noticeTitle; + } + + public String getNoticeTitle() + { + return noticeTitle; + } + + public void setNoticeType(String noticeType) + { + this.noticeType = noticeType; + } + + public String getNoticeType() + { + return noticeType; + } + + public void setNoticeContent(String noticeContent) + { + this.noticeContent = noticeContent; + } + + public String getNoticeContent() + { + return noticeContent; + } + + public void setStatus(String status) + { + this.status = status; + } + + public String getStatus() + { + return status; + } + + @Override + public String toString() { + return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) + .append("noticeId", getNoticeId()) + .append("noticeTitle", getNoticeTitle()) + .append("noticeType", getNoticeType()) + .append("noticeContent", getNoticeContent()) + .append("status", getStatus()) + .append("createBy", getCreateBy()) + .append("createTime", getCreateTime()) + .append("updateBy", getUpdateBy()) + .append("updateTime", getUpdateTime()) + .append("remark", getRemark()) + .toString(); + } +} diff --git a/ruoyi-framework/src/main/java/com/ruoyi/system/domain/SysOperLog.java b/ruoyi-framework/src/main/java/com/ruoyi/system/domain/SysOperLog.java new file mode 100644 index 000000000..3c32fb3b8 --- /dev/null +++ b/ruoyi-framework/src/main/java/com/ruoyi/system/domain/SysOperLog.java @@ -0,0 +1,233 @@ +package com.ruoyi.system.domain; + +import org.apache.commons.lang3.builder.ToStringBuilder; +import org.apache.commons.lang3.builder.ToStringStyle; +import java.util.Date; +import com.ruoyi.common.annotation.Excel; +import com.ruoyi.common.base.BaseEntity; + +/** + * 操作日志记录表 oper_log + * + * @author ruoyi + */ +public class SysOperLog extends BaseEntity +{ + private static final long serialVersionUID = 1L; + + /** 日志主键 */ + @Excel(name = "操作序号") + private Long operId; + + /** 操作模块 */ + @Excel(name = "操作模块") + private String title; + + /** 业务类型（0其它 1新增 2修改 3删除） */ + @Excel(name = "业务类型", readConverterExp = "0=其它,1=新增,2=修改,3=删除,4=授权,5=导出,6=导入,7=强退,8=生成代码,9=清空数据") + private Integer businessType; + + /** 请求方法 */ + @Excel(name = "请求方法") + private String method; + + /** 操作类别（0其它 1后台用户 2手机端用户） */ + @Excel(name = "操作类别", readConverterExp = "0=其它,1=后台用户,2=手机端用户") + private Integer operatorType; + + /** 操作人员 */ + @Excel(name = "操作人员") + private String operName; + + /** 部门名称 */ + @Excel(name = "部门名称") + private String deptName; + + /** 请求url */ + @Excel(name = "请求地址") + private String operUrl; + + /** 操作地址 */ + @Excel(name = "操作地址") + private String operIp; + + /** 操作地点 */ + @Excel(name = "操作地点") + private String operLocation; + + /** 请求参数 */ + @Excel(name = "请求参数") + private String operParam; + + /** 操作状态（0正常 1异常） */ + @Excel(name = "状态", readConverterExp = "0=正常,1=异常") + private Integer status; + + /** 错误消息 */ + @Excel(name = "错误消息") + private String errorMsg; + + /** 操作时间 */ + @Excel(name = "操作时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss") + private Date operTime; + + public Long getOperId() + { + return operId; + } + + public void setOperId(Long operId) + { + this.operId = operId; + } + + public String getTitle() + { + return title; + } + + public void setTitle(String title) + { + this.title = title; + } + + public Integer getBusinessType() + { + return businessType; + } + + public void setBusinessType(Integer businessType) + { + this.businessType = businessType; + } + + public String getMethod() + { + return method; + } + + public void setMethod(String method) + { + this.method = method; + } + + public Integer getOperatorType() + { + return operatorType; + } + + public void setOperatorType(Integer operatorType) + { + this.operatorType = operatorType; + } + + public String getOperName() + { + return operName; + } + + public void setOperName(String operName) + { + this.operName = operName; + } + + public String getDeptName() + { + return deptName; + } + + public void setDeptName(String deptName) + { + this.deptName = deptName; + } + + public String getOperUrl() + { + return operUrl; + } + + public void setOperUrl(String operUrl) + { + this.operUrl = operUrl; + } + + public String getOperIp() + { + return operIp; + } + + public void setOperIp(String operIp) + { + this.operIp = operIp; + } + + public String getOperLocation() + { + return operLocation; + } + + public void setOperLocation(String operLocation) + { + this.operLocation = operLocation; + } + + public String getOperParam() + { + return operParam; + } + + public void setOperParam(String operParam) + { + this.operParam = operParam; + } + + public Integer getStatus() + { + return status; + } + + public void setStatus(Integer status) + { + this.status = status; + } + + public String getErrorMsg() + { + return errorMsg; + } + + public void setErrorMsg(String errorMsg) + { + this.errorMsg = errorMsg; + } + + public Date getOperTime() + { + return operTime; + } + + public void setOperTime(Date operTime) + { + this.operTime = operTime; + } + + @Override + public String toString() { + return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) + .append("operId", getOperId()) + .append("title", getTitle()) + .append("businessType", getBusinessType()) + .append("method", getMethod()) + .append("operatorType", getOperatorType()) + .append("operName", getOperName()) + .append("deptName", getDeptName()) + .append("operUrl", getOperUrl()) + .append("operIp", getOperIp()) + .append("operLocation", getOperLocation()) + .append("operParam", getOperParam()) + .append("status", getStatus()) + .append("errorMsg", getErrorMsg()) + .append("operTime", getOperTime()) + .toString(); + } +} diff --git a/ruoyi-framework/src/main/java/com/ruoyi/system/domain/SysPost.java b/ruoyi-framework/src/main/java/com/ruoyi/system/domain/SysPost.java new file mode 100644 index 000000000..8c36405b6 --- /dev/null +++ b/ruoyi-framework/src/main/java/com/ruoyi/system/domain/SysPost.java @@ -0,0 +1,115 @@ +package com.ruoyi.system.domain; + +import org.apache.commons.lang3.builder.ToStringBuilder; +import org.apache.commons.lang3.builder.ToStringStyle; +import com.ruoyi.common.annotation.Excel; +import com.ruoyi.common.base.BaseEntity; + +/** + * 岗位表 sys_post + * + * @author ruoyi + */ +public class SysPost extends BaseEntity +{ + private static final long serialVersionUID = 1L; + + /** 岗位序号 */ + @Excel(name = "岗位序号") + private Long postId; + + /** 岗位编码 */ + @Excel(name = "岗位编码") + private String postCode; + + /** 岗位名称 */ + @Excel(name = "岗位名称") + private String postName; + + /** 岗位排序 */ + @Excel(name = "岗位排序") + private String postSort; + + /** 状态（0正常 1停用） */ + @Excel(name = "状态", readConverterExp = "0=正常,1=停用") + private String status; + + /** 用户是否存在此岗位标识 默认不存在 */ + private boolean flag = false; + + public Long getPostId() + { + return postId; + } + + public void setPostId(Long postId) + { + this.postId = postId; + } + + public String getPostCode() + { + return postCode; + } + + public void setPostCode(String postCode) + { + this.postCode = postCode; + } + + public String getPostName() + { + return postName; + } + + public void setPostName(String postName) + { + this.postName = postName; + } + + public String getPostSort() + { + return postSort; + } + + public void setPostSort(String postSort) + { + this.postSort = postSort; + } + + public String getStatus() + { + return status; + } + + public void setStatus(String status) + { + this.status = status; + } + + public boolean isFlag() + { + return flag; + } + + public void setFlag(boolean flag) + { + this.flag = flag; + } + + @Override + public String toString() { + return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) + .append("postId", getPostId()) + .append("postCode", getPostCode()) + .append("postName", getPostName()) + .append("postSort", getPostSort()) + .append("status", getStatus()) + .append("createBy", getCreateBy()) + .append("createTime", getCreateTime()) + .append("updateBy", getUpdateBy()) + .append("updateTime", getUpdateTime()) + .append("remark", getRemark()) + .toString(); + } +} diff --git a/ruoyi-framework/src/main/java/com/ruoyi/system/domain/SysRole.java b/ruoyi-framework/src/main/java/com/ruoyi/system/domain/SysRole.java new file mode 100644 index 000000000..1927ed6d8 --- /dev/null +++ b/ruoyi-framework/src/main/java/com/ruoyi/system/domain/SysRole.java @@ -0,0 +1,170 @@ +package com.ruoyi.system.domain; + +import org.apache.commons.lang3.builder.ToStringBuilder; +import org.apache.commons.lang3.builder.ToStringStyle; +import com.ruoyi.common.annotation.Excel; +import com.ruoyi.common.base.BaseEntity; + +/** + * 角色表 sys_role + * + * @author ruoyi + */ +public class SysRole extends BaseEntity +{ + private static final long serialVersionUID = 1L; + + /** 角色ID */ + @Excel(name = "角色序号") + private Long roleId; + + /** 角色名称 */ + @Excel(name = "角色名称") + private String roleName; + + /** 角色权限 */ + @Excel(name = "角色权限") + private String roleKey; + + /** 角色排序 */ + @Excel(name = "角色排序") + private String roleSort; + + /** 数据范围（1：所有数据权限；2：自定数据权限） */ + @Excel(name = "数据范围", readConverterExp = "1=所有数据权限,2=自定义数据权限") + private String dataScope; + + /** 角色状态（0正常 1停用） */ + @Excel(name = "角色状态", readConverterExp = "0=正常,1=停用") + private String status; + + /** 删除标志（0代表存在 2代表删除） */ + private String delFlag; + + /** 用户是否存在此角色标识 默认不存在 */ + private boolean flag = false; + + /** 菜单组 */ + private Long[] menuIds; + + /** 部门组（数据权限） */ + private Long[] deptIds; + + public Long getRoleId() + { + return roleId; + } + + public void setRoleId(Long roleId) + { + this.roleId = roleId; + } + + public String getDataScope() + { + return dataScope; + } + + public void setDataScope(String dataScope) + { + this.dataScope = dataScope; + } + + public String getRoleName() + { + return roleName; + } + + public void setRoleName(String roleName) + { + this.roleName = roleName; + } + + public String getRoleKey() + { + return roleKey; + } + + public void setRoleKey(String roleKey) + { + this.roleKey = roleKey; + } + + public String getRoleSort() + { + return roleSort; + } + + public void setRoleSort(String roleSort) + { + this.roleSort = roleSort; + } + + public String getStatus() + { + return status; + } + + public String getDelFlag() + { + return delFlag; + } + + public void setDelFlag(String delFlag) + { + this.delFlag = delFlag; + } + + public void setStatus(String status) + { + this.status = status; + } + + public boolean isFlag() + { + return flag; + } + + public void setFlag(boolean flag) + { + this.flag = flag; + } + + public Long[] getMenuIds() + { + return menuIds; + } + + public void setMenuIds(Long[] menuIds) + { + this.menuIds = menuIds; + } + + public Long[] getDeptIds() + { + return deptIds; + } + + public void setDeptIds(Long[] deptIds) + { + this.deptIds = deptIds; + } + + @Override + public String toString() { + return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) + .append("roleId", getRoleId()) + .append("roleName", getRoleName()) + .append("roleKey", getRoleKey()) + .append("roleSort", getRoleSort()) + .append("dataScope", getDataScope()) + .append("status", getStatus()) + .append("delFlag", getDelFlag()) + .append("createBy", getCreateBy()) + .append("createTime", getCreateTime()) + .append("updateBy", getUpdateBy()) + .append("updateTime", getUpdateTime()) + .append("remark", getRemark()) + .toString(); + } +} diff --git a/ruoyi-framework/src/main/java/com/ruoyi/system/domain/SysRoleDept.java b/ruoyi-framework/src/main/java/com/ruoyi/system/domain/SysRoleDept.java new file mode 100644 index 000000000..47b21bf79 --- /dev/null +++ b/ruoyi-framework/src/main/java/com/ruoyi/system/domain/SysRoleDept.java @@ -0,0 +1,46 @@ +package com.ruoyi.system.domain; + +import org.apache.commons.lang3.builder.ToStringBuilder; +import org.apache.commons.lang3.builder.ToStringStyle; + +/** + * 角色和部门关联 sys_role_dept + * + * @author ruoyi + */ +public class SysRoleDept +{ + /** 角色ID */ + private Long roleId; + + /** 部门ID */ + private Long deptId; + + public Long getRoleId() + { + return roleId; + } + + public void setRoleId(Long roleId) + { + this.roleId = roleId; + } + + public Long getDeptId() + { + return deptId; + } + + public void setDeptId(Long deptId) + { + this.deptId = deptId; + } + + @Override + public String toString() { + return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) + .append("roleId", getRoleId()) + .append("deptId", getDeptId()) + .toString(); + } +} diff --git a/ruoyi-framework/src/main/java/com/ruoyi/system/domain/SysRoleMenu.java b/ruoyi-framework/src/main/java/com/ruoyi/system/domain/SysRoleMenu.java new file mode 100644 index 000000000..de10a7470 --- /dev/null +++ b/ruoyi-framework/src/main/java/com/ruoyi/system/domain/SysRoleMenu.java @@ -0,0 +1,46 @@ +package com.ruoyi.system.domain; + +import org.apache.commons.lang3.builder.ToStringBuilder; +import org.apache.commons.lang3.builder.ToStringStyle; + +/** + * 角色和菜单关联 sys_role_menu + * + * @author ruoyi + */ +public class SysRoleMenu +{ + /** 角色ID */ + private Long roleId; + + /** 菜单ID */ + private Long menuId; + + public Long getRoleId() + { + return roleId; + } + + public void setRoleId(Long roleId) + { + this.roleId = roleId; + } + + public Long getMenuId() + { + return menuId; + } + + public void setMenuId(Long menuId) + { + this.menuId = menuId; + } + + @Override + public String toString() { + return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) + .append("roleId", getRoleId()) + .append("menuId", getMenuId()) + .toString(); + } +} diff --git a/ruoyi-framework/src/main/java/com/ruoyi/system/domain/SysUser.java b/ruoyi-framework/src/main/java/com/ruoyi/system/domain/SysUser.java new file mode 100644 index 000000000..3a6dcd951 --- /dev/null +++ b/ruoyi-framework/src/main/java/com/ruoyi/system/domain/SysUser.java @@ -0,0 +1,308 @@ +package com.ruoyi.system.domain; + +import org.apache.commons.lang3.builder.ToStringBuilder; +import org.apache.commons.lang3.builder.ToStringStyle; +import java.util.Date; +import java.util.List; +import com.ruoyi.common.annotation.Excel; +import com.ruoyi.common.base.BaseEntity; + +/** + * 用户对象 sys_user + * + * @author ruoyi + */ +public class SysUser extends BaseEntity +{ + private static final long serialVersionUID = 1L; + + /** 用户ID */ + @Excel(name = "用户序号") + private Long userId; + + /** 部门ID */ + private Long deptId; + + /** 部门父ID */ + private Long parentId; + + /** 登录名称 */ + @Excel(name = "登录名称") + private String loginName; + + /** 用户名称 */ + @Excel(name = "用户名称") + private String userName; + + /** 用户邮箱 */ + @Excel(name = "用户邮箱") + private String email; + + /** 手机号码 */ + @Excel(name = "手机号码") + private String phonenumber; + + /** 用户性别 */ + @Excel(name = "用户性别", readConverterExp = "0=男,1=女,2=未知") + private String sex; + + /** 用户头像 */ + private String avatar; + + /** 密码 */ + private String password; + + /** 盐加密 */ + private String salt; + + /** 帐号状态（0正常 1停用） */ + @Excel(name = "帐号状态", readConverterExp = "0=正常,1=停用") + private String status; + + /** 删除标志（0代表存在 2代表删除） */ + private String delFlag; + + /** 最后登陆IP */ + @Excel(name = "最后登陆IP") + private String loginIp; + + /** 最后登陆时间 */ + @Excel(name = "最后登陆时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss") + private Date loginDate; + + /** 部门对象 */ + private SysDept dept; + + private List roles; + + /** 角色组 */ + private Long[] roleIds; + + /** 岗位组 */ + private Long[] postIds; + + public Long getUserId() + { + return userId; + } + + public void setUserId(Long userId) + { + this.userId = userId; + } + + public boolean isAdmin() + { + return isAdmin(this.userId); + } + + public static boolean isAdmin(Long userId) + { + return userId != null && 1L == userId; + } + + public Long getDeptId() + { + return deptId; + } + + public void setDeptId(Long deptId) + { + this.deptId = deptId; + } + + public Long getParentId() + { + return parentId; + } + + public void setParentId(Long parentId) + { + this.parentId = parentId; + } + + public String getLoginName() + { + return loginName; + } + + public void setLoginName(String loginName) + { + this.loginName = loginName; + } + + public String getUserName() + { + return userName; + } + + public void setUserName(String userName) + { + this.userName = userName; + } + + public String getEmail() + { + return email; + } + + public void setEmail(String email) + { + this.email = email; + } + + public String getPhonenumber() + { + return phonenumber; + } + + public void setPhonenumber(String phonenumber) + { + this.phonenumber = phonenumber; + } + + public String getSex() + { + return sex; + } + + public void setSex(String sex) + { + this.sex = sex; + } + + public String getAvatar() + { + return avatar; + } + + public void setAvatar(String avatar) + { + this.avatar = avatar; + } + + public String getPassword() + { + return password; + } + + public void setPassword(String password) + { + this.password = password; + } + + public String getSalt() + { + return salt; + } + + public void setSalt(String salt) + { + this.salt = salt; + } + + public String getStatus() + { + return status; + } + + public void setStatus(String status) + { + this.status = status; + } + + public String getDelFlag() + { + return delFlag; + } + + public void setDelFlag(String delFlag) + { + this.delFlag = delFlag; + } + + public String getLoginIp() + { + return loginIp; + } + + public void setLoginIp(String loginIp) + { + this.loginIp = loginIp; + } + + public Date getLoginDate() + { + return loginDate; + } + + public void setLoginDate(Date loginDate) + { + this.loginDate = loginDate; + } + + public SysDept getDept() + { + return dept; + } + + public void setDept(SysDept dept) + { + this.dept = dept; + } + + public List getRoles() + { + return roles; + } + + public void setRoles(List roles) + { + this.roles = roles; + } + + public Long[] getRoleIds() + { + return roleIds; + } + + public void setRoleIds(Long[] roleIds) + { + this.roleIds = roleIds; + } + + public Long[] getPostIds() + { + return postIds; + } + + public void setPostIds(Long[] postIds) + { + this.postIds = postIds; + } + + @Override + public String toString() { + return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) + .append("userId", getUserId()) + .append("deptId", getDeptId()) + .append("loginName", getLoginName()) + .append("userName", getUserName()) + .append("email", getEmail()) + .append("phonenumber", getPhonenumber()) + .append("sex", getSex()) + .append("avatar", getAvatar()) + .append("password", getPassword()) + .append("salt", getSalt()) + .append("status", getStatus()) + .append("delFlag", getDelFlag()) + .append("loginIp", getLoginIp()) + .append("loginDate", getLoginDate()) + .append("createBy", getCreateBy()) + .append("createTime", getCreateTime()) + .append("updateBy", getUpdateBy()) + .append("updateTime", getUpdateTime()) + .append("remark", getRemark()) + .toString(); + } +} diff --git a/ruoyi-framework/src/main/java/com/ruoyi/system/domain/SysUserOnline.java b/ruoyi-framework/src/main/java/com/ruoyi/system/domain/SysUserOnline.java new file mode 100644 index 000000000..5f01feb21 --- /dev/null +++ b/ruoyi-framework/src/main/java/com/ruoyi/system/domain/SysUserOnline.java @@ -0,0 +1,177 @@ +package com.ruoyi.system.domain; + +import java.util.Date; +import org.apache.commons.lang3.builder.ToStringBuilder; +import org.apache.commons.lang3.builder.ToStringStyle; +import com.ruoyi.common.base.BaseEntity; +import com.ruoyi.common.enums.OnlineStatus; + +/** + * 当前在线会话 sys_user_online + * + * @author ruoyi + */ +public class SysUserOnline extends BaseEntity +{ + private static final long serialVersionUID = 1L; + + /** 用户会话id */ + private String sessionId; + + /** 部门名称 */ + private String deptName; + + /** 登录名称 */ + private String loginName; + + /** 登录IP地址 */ + private String ipaddr; + + /** 登录地址 */ + private String loginLocation; + + /** 浏览器类型 */ + private String browser; + + /** 操作系统 */ + private String os; + + /** session创建时间 */ + private Date startTimestamp; + + /** session最后访问时间 */ + private Date lastAccessTime; + + /** 超时时间，单位为分钟 */ + private Long expireTime; + + /** 在线状态 */ + private OnlineStatus status = OnlineStatus.on_line; + + public String getSessionId() + { + return sessionId; + } + + public void setSessionId(String sessionId) + { + this.sessionId = sessionId; + } + + public String getDeptName() + { + return deptName; + } + + public void setDeptName(String deptName) + { + this.deptName = deptName; + } + + public String getLoginName() + { + return loginName; + } + + public void setLoginName(String loginName) + { + this.loginName = loginName; + } + + public String getIpaddr() + { + return ipaddr; + } + + public void setIpaddr(String ipaddr) + { + this.ipaddr = ipaddr; + } + + public String getLoginLocation() + { + return loginLocation; + } + + public void setLoginLocation(String loginLocation) + { + this.loginLocation = loginLocation; + } + + public String getBrowser() + { + return browser; + } + + public void setBrowser(String browser) + { + this.browser = browser; + } + + public String getOs() + { + return os; + } + + public void setOs(String os) + { + this.os = os; + } + + public Date getStartTimestamp() + { + return startTimestamp; + } + + public void setStartTimestamp(Date startTimestamp) + { + this.startTimestamp = startTimestamp; + } + + public Date getLastAccessTime() + { + return lastAccessTime; + } + + public void setLastAccessTime(Date lastAccessTime) + { + this.lastAccessTime = lastAccessTime; + } + + public Long getExpireTime() + { + return expireTime; + } + + public void setExpireTime(Long expireTime) + { + this.expireTime = expireTime; + } + + public OnlineStatus getStatus() + { + return status; + } + + public void setStatus(OnlineStatus status) + { + this.status = status; + } + + @Override + public String toString() { + return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) + .append("sessionId", getSessionId()) + .append("loginName", getLoginName()) + .append("deptName", getDeptName()) + .append("ipaddr", getIpaddr()) + .append("loginLocation", getLoginLocation()) + .append("browser", getBrowser()) + .append("os", getOs()) + .append("status", getStatus()) + .append("startTimestamp", getStartTimestamp()) + .append("lastAccessTime", getLastAccessTime()) + .append("expireTime", getExpireTime()) + .toString(); + } +} diff --git a/ruoyi-framework/src/main/java/com/ruoyi/system/domain/SysUserPost.java b/ruoyi-framework/src/main/java/com/ruoyi/system/domain/SysUserPost.java new file mode 100644 index 000000000..6e8c416f2 --- /dev/null +++ b/ruoyi-framework/src/main/java/com/ruoyi/system/domain/SysUserPost.java @@ -0,0 +1,46 @@ +package com.ruoyi.system.domain; + +import org.apache.commons.lang3.builder.ToStringBuilder; +import org.apache.commons.lang3.builder.ToStringStyle; + +/** + * 用户和岗位关联 sys_user_post + * + * @author ruoyi + */ +public class SysUserPost +{ + /** 用户ID */ + private Long userId; + + /** 岗位ID */ + private Long postId; + + public Long getUserId() + { + return userId; + } + + public void setUserId(Long userId) + { + this.userId = userId; + } + + public Long getPostId() + { + return postId; + } + + public void setPostId(Long postId) + { + this.postId = postId; + } + + @Override + public String toString() { + return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) + .append("userId", getUserId()) + .append("postId", getPostId()) + .toString(); + } +} diff --git a/ruoyi-framework/src/main/java/com/ruoyi/system/domain/SysUserRole.java b/ruoyi-framework/src/main/java/com/ruoyi/system/domain/SysUserRole.java new file mode 100644 index 000000000..4d1581014 --- /dev/null +++ b/ruoyi-framework/src/main/java/com/ruoyi/system/domain/SysUserRole.java @@ -0,0 +1,46 @@ +package com.ruoyi.system.domain; + +import org.apache.commons.lang3.builder.ToStringBuilder; +import org.apache.commons.lang3.builder.ToStringStyle; + +/** + * 用户和角色关联 sys_user_role + * + * @author ruoyi + */ +public class SysUserRole +{ + /** 用户ID */ + private Long userId; + + /** 角色ID */ + private Long roleId; + + public Long getUserId() + { + return userId; + } + + public void setUserId(Long userId) + { + this.userId = userId; + } + + public Long getRoleId() + { + return roleId; + } + + public void setRoleId(Long roleId) + { + this.roleId = roleId; + } + + @Override + public String toString() { + return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) + .append("userId", getUserId()) + .append("roleId", getRoleId()) + .toString(); + } +} diff --git a/ruoyi-framework/src/main/java/com/ruoyi/system/mapper/SysConfigMapper.java b/ruoyi-framework/src/main/java/com/ruoyi/system/mapper/SysConfigMapper.java new file mode 100644 index 000000000..3d1847d04 --- /dev/null +++ b/ruoyi-framework/src/main/java/com/ruoyi/system/mapper/SysConfigMapper.java @@ -0,0 +1,61 @@ +package com.ruoyi.system.mapper; + +import java.util.List; +import com.ruoyi.system.domain.SysConfig; +import tk.mybatis.mapper.common.Mapper; + +/** + * 参数配置 数据层 + * + * @author ruoyi + */ +public interface SysConfigMapper extends Mapper +{ + /** + * 查询参数配置信息 + * + * @param config 参数配置信息 + * @return 参数配置信息 + */ + public SysConfig selectConfig(SysConfig config); + + /** + * 查询参数配置列表 + * + * @param config 参数配置信息 + * @return 参数配置集合 + */ + public List selectConfigList(SysConfig config); + + /** + * 根据键名查询参数配置信息 + * + * @param configKey 参数键名 + * @return 参数配置信息 + */ + public SysConfig checkConfigKeyUnique(String configKey); + + /** + * 新增参数配置 + * + * @param config 参数配置信息 + * @return 结果 + */ + public int insertConfig(SysConfig config); + + /** + * 修改参数配置 + * + * @param config 参数配置信息 + * @return 结果 + */ + public int updateConfig(SysConfig config); + + /** + * 批量删除参数配置 + * + * @param configIds 需要删除的数据ID + * @return 结果 + */ + public int deleteConfigByIds(String[] configIds); +} \ No newline at end of file diff --git a/ruoyi-framework/src/main/java/com/ruoyi/system/mapper/SysDeptMapper.java b/ruoyi-framework/src/main/java/com/ruoyi/system/mapper/SysDeptMapper.java new file mode 100644 index 000000000..b365bb61d --- /dev/null +++ b/ruoyi-framework/src/main/java/com/ruoyi/system/mapper/SysDeptMapper.java @@ -0,0 +1,97 @@ +package com.ruoyi.system.mapper; + +import java.util.List; + +import com.ruoyi.system.domain.SysConfig; +import org.apache.ibatis.annotations.Param; +import com.ruoyi.system.domain.SysDept; +import tk.mybatis.mapper.common.Mapper; + +/** + * 部门管理 数据层 + * + * @author ruoyi + */ +public interface SysDeptMapper extends Mapper +{ + /** + * 查询部门人数 + * + * @param dept 部门信息 + * @return 结果 + */ + public int selectDeptCount(SysDept dept); + + /** + * 查询部门是否存在用户 + * + * @param deptId 部门ID + * @return 结果 + */ + public int checkDeptExistUser(Long deptId); + + /** + * 查询部门管理数据 + * + * @param dept 部门信息 + * @return 部门信息集合 + */ + public List selectDeptList(SysDept dept); + + /** + * 删除部门管理信息 + * + * @param deptId 部门ID + * @return 结果 + */ + public int deleteDeptById(Long deptId); + + /** + * 新增部门信息 + * + * @param dept 部门信息 + * @return 结果 + */ + public int insertDept(SysDept dept); + + /** + * 修改部门信息 + * + * @param dept 部门信息 + * @return 结果 + */ + public int updateDept(SysDept dept); + + /** + * 修改子元素关系 + * + * @param depts 子元素 + * @return 结果 + */ + public int updateDeptChildren(@Param("depts") List depts); + + /** + * 根据部门ID查询信息 + * + * @param deptId 部门ID + * @return 部门信息 + */ + public SysDept selectDeptById(Long deptId); + + /** + * 校验部门名称是否唯一 + * + * @param deptName 部门名称 + * @param parentId 父部门ID + * @return 结果 + */ + public SysDept checkDeptNameUnique(@Param("deptName") String deptName, @Param("parentId") Long parentId); + + /** + * 根据角色ID查询部门 + * + * @param roleId 角色ID + * @return 部门列表 + */ + public List selectRoleDeptTree(Long roleId); +} diff --git a/ruoyi-framework/src/main/java/com/ruoyi/system/mapper/SysDictDataMapper.java b/ruoyi-framework/src/main/java/com/ruoyi/system/mapper/SysDictDataMapper.java new file mode 100644 index 000000000..d0ae3db67 --- /dev/null +++ b/ruoyi-framework/src/main/java/com/ruoyi/system/mapper/SysDictDataMapper.java @@ -0,0 +1,98 @@ +package com.ruoyi.system.mapper; + +import java.util.List; + +import com.ruoyi.system.domain.SysDept; +import org.apache.ibatis.annotations.Param; +import com.ruoyi.system.domain.SysDictData; +import tk.mybatis.mapper.common.Mapper; + +/** + * 字典表 数据层 + * + * @author ruoyi + */ +public interface SysDictDataMapper extends Mapper +{ + /** + * 根据条件分页查询字典数据 + * + * @param dictData 字典数据信息 + * @return 字典数据集合信息 + */ + public List selectDictDataList(SysDictData dictData); + + /** + * 根据字典类型查询字典数据 + * + * @param dictType 字典类型 + * @return 字典数据集合信息 + */ + public List selectDictDataByType(String dictType); + + /** + * 根据字典类型和字典键值查询字典数据信息 + * + * @param dictType 字典类型 + * @param dictValue 字典键值 + * @return 字典标签 + */ + public String selectDictLabel(@Param("dictType") String dictType, @Param("dictValue") String dictValue); + + /** + * 根据字典数据ID查询信息 + * + * @param dictCode 字典数据ID + * @return 字典数据 + */ + public SysDictData selectDictDataById(Long dictCode); + + /** + * 查询字典数据 + * + * @param dictType 字典类型 + * @return 字典数据 + */ + public int countDictDataByType(String dictType); + + /** + * 通过字典ID删除字典数据信息 + * + * @param dictCode 字典数据ID + * @return 结果 + */ + public int deleteDictDataById(Long dictCode); + + /** + * 批量删除字典数据 + * + * @param ids 需要删除的数据 + * @return 结果 + */ + public int deleteDictDataByIds(String[] ids); + + /** + * 新增字典数据信息 + * + * @param dictData 字典数据信息 + * @return 结果 + */ + public int insertDictData(SysDictData dictData); + + /** + * 修改字典数据信息 + * + * @param dictData 字典数据信息 + * @return 结果 + */ + public int updateDictData(SysDictData dictData); + + /** + * 同步修改字典类型 + * + * @param oldDictType 旧字典类型 + * @param newDictType 新旧字典类型 + * @return 结果 + */ + public int updateDictDataType(@Param("oldDictType") String oldDictType, @Param("newDictType") String newDictType); +} diff --git a/ruoyi-framework/src/main/java/com/ruoyi/system/mapper/SysDictTypeMapper.java b/ruoyi-framework/src/main/java/com/ruoyi/system/mapper/SysDictTypeMapper.java new file mode 100644 index 000000000..6a9ef71b5 --- /dev/null +++ b/ruoyi-framework/src/main/java/com/ruoyi/system/mapper/SysDictTypeMapper.java @@ -0,0 +1,77 @@ +package com.ruoyi.system.mapper; + +import java.util.List; +import org.apache.ibatis.annotations.Mapper; +import com.ruoyi.system.domain.SysDictType; + +/** + * 字典表 数据层 + * + * @author ruoyi + */ +@Mapper +public interface SysDictTypeMapper extends tk.mybatis.mapper.common.Mapper +{ + /** + * 根据条件分页查询字典类型 + * + * @param dictType 字典类型信息 + * @return 字典类型集合信息 + */ + public List selectDictTypeList(SysDictType dictType); + + /** + * 根据所有字典类型 + * + * @return 字典类型集合信息 + */ + public List selectDictTypeAll(); + + /** + * 根据字典类型ID查询信息 + * + * @param dictId 字典类型ID + * @return 字典类型 + */ + public SysDictType selectDictTypeById(Long dictId); + + /** + * 通过字典ID删除字典信息 + * + * @param dictId 字典ID + * @return 结果 + */ + public int deleteDictTypeById(Long dictId); + + /** + * 批量删除字典类型 + * + * @param ids 需要删除的数据 + * @return 结果 + */ + public int deleteDictTypeByIds(Long[] ids); + + /** + * 新增字典类型信息 + * + * @param dictType 字典类型信息 + * @return 结果 + */ + public int insertDictType(SysDictType dictType); + + /** + * 修改字典类型信息 + * + * @param dictType 字典类型信息 + * @return 结果 + */ + public int updateDictType(SysDictType dictType); + + /** + * 校验字典类型称是否唯一 + * + * @param dictType 字典类型 + * @return 结果 + */ + public SysDictType checkDictTypeUnique(String dictType); +} diff --git a/ruoyi-framework/src/main/java/com/ruoyi/system/mapper/SysLogininforMapper.java b/ruoyi-framework/src/main/java/com/ruoyi/system/mapper/SysLogininforMapper.java new file mode 100644 index 000000000..fc70b92ab --- /dev/null +++ b/ruoyi-framework/src/main/java/com/ruoyi/system/mapper/SysLogininforMapper.java @@ -0,0 +1,41 @@ +package com.ruoyi.system.mapper; + +import java.util.List; +import com.ruoyi.system.domain.SysLogininfor; +import tk.mybatis.mapper.common.Mapper; + +/** + * 系统访问日志情况信息 数据层 + * + * @author ruoyi + */ +public interface SysLogininforMapper extends Mapper +{ + /** + * 新增系统登录日志 + * + * @param logininfor 访问日志对象 + */ + public void insertLogininfor(SysLogininfor logininfor); + + /** + * 查询系统登录日志集合 + * + * @param logininfor 访问日志对象 + * @return 登录记录集合 + */ + public List selectLogininforList(SysLogininfor logininfor); + + /** + * 批量删除系统登录日志 + * + * @param ids 需要删除的数据 + * @return + */ + public int deleteLogininforByIds(String[] ids); + + /** + * 清空系统登录日志 + */ + public int cleanLogininfor(); +} diff --git a/ruoyi-framework/src/main/java/com/ruoyi/system/mapper/SysMenuMapper.java b/ruoyi-framework/src/main/java/com/ruoyi/system/mapper/SysMenuMapper.java new file mode 100644 index 000000000..98163d966 --- /dev/null +++ b/ruoyi-framework/src/main/java/com/ruoyi/system/mapper/SysMenuMapper.java @@ -0,0 +1,109 @@ +package com.ruoyi.system.mapper; + +import java.util.List; +import org.apache.ibatis.annotations.Param; +import com.ruoyi.system.domain.SysMenu; +import tk.mybatis.mapper.common.Mapper; + +/** + * 菜单表 数据层 + * + * @author ruoyi + */ +public interface SysMenuMapper extends Mapper +{ + /** + * 查询系统所有菜单（含按钮） + * + * @return 菜单列表 + */ + public List selectMenuAll(); + + /** + * 查询系统正常显示菜单（不含按钮） + * + * @return 菜单列表 + */ + public List selectMenuNormalAll(); + + /** + * 根据用户ID查询菜单 + * + * @param userId 用户ID + * @return 菜单列表 + */ + public List selectMenusByUserId(Long userId); + + /** + * 根据用户ID查询权限 + * + * @param userId 用户ID + * @return 权限列表 + */ + public List selectPermsByUserId(Long userId); + + /** + * 根据角色ID查询菜单 + * + * @param roleId 角色ID + * @return 菜单列表 + */ + public List selectMenuTree(Long roleId); + + /** + * 查询系统菜单列表 + * + * @param menu 菜单信息 + * @return 菜单列表 + */ + public List selectMenuList(SysMenu menu); + + /** + * 删除菜单管理信息 + * + * @param menuId 菜单ID + * @return 结果 + */ + public int deleteMenuById(Long menuId); + + /** + * 根据菜单ID查询信息 + * + * @param menuId 菜单ID + * @return 菜单信息 + */ + public SysMenu selectMenuById(Long menuId); + + /** + * 查询菜单数量 + * + * @param parentId 菜单父ID + * @return 结果 + */ + public int selectCountMenuByParentId(Long parentId); + + /** + * 新增菜单信息 + * + * @param menu 菜单信息 + * @return 结果 + */ + public int insertMenu(SysMenu menu); + + /** + * 修改菜单信息 + * + * @param menu 菜单信息 + * @return 结果 + */ + public int updateMenu(SysMenu menu); + + /** + * 校验菜单名称是否唯一 + * + * @param menuName 菜单名称 + * @param parentId 父菜单ID + * @return 结果 + */ + public SysMenu checkMenuNameUnique(@Param("menuName") String menuName, @Param("parentId") Long parentId); +} diff --git a/ruoyi-framework/src/main/java/com/ruoyi/system/mapper/SysNoticeMapper.java b/ruoyi-framework/src/main/java/com/ruoyi/system/mapper/SysNoticeMapper.java new file mode 100644 index 000000000..28c20bbe3 --- /dev/null +++ b/ruoyi-framework/src/main/java/com/ruoyi/system/mapper/SysNoticeMapper.java @@ -0,0 +1,53 @@ +package com.ruoyi.system.mapper; + +import java.util.List; +import com.ruoyi.system.domain.SysNotice; +import tk.mybatis.mapper.common.Mapper; + +/** + * 公告 数据层 + * + * @author ruoyi + */ +public interface SysNoticeMapper extends Mapper +{ + /** + * 查询公告信息 + * + * @param noticeId 公告ID + * @return 公告信息 + */ + public SysNotice selectNoticeById(Long noticeId); + + /** + * 查询公告列表 + * + * @param notice 公告信息 + * @return 公告集合 + */ + public List selectNoticeList(SysNotice notice); + + /** + * 新增公告 + * + * @param notice 公告信息 + * @return 结果 + */ + public int insertNotice(SysNotice notice); + + /** + * 修改公告 + * + * @param notice 公告信息 + * @return 结果 + */ + public int updateNotice(SysNotice notice); + + /** + * 批量删除公告 + * + * @param noticeIds 需要删除的数据ID + * @return 结果 + */ + public int deleteNoticeByIds(String[] noticeIds); +} \ No newline at end of file diff --git a/ruoyi-framework/src/main/java/com/ruoyi/system/mapper/SysOperLogMapper.java b/ruoyi-framework/src/main/java/com/ruoyi/system/mapper/SysOperLogMapper.java new file mode 100644 index 000000000..c808c5199 --- /dev/null +++ b/ruoyi-framework/src/main/java/com/ruoyi/system/mapper/SysOperLogMapper.java @@ -0,0 +1,49 @@ +package com.ruoyi.system.mapper; + +import java.util.List; +import com.ruoyi.system.domain.SysOperLog; +import tk.mybatis.mapper.common.Mapper; + +/** + * 操作日志 数据层 + * + * @author ruoyi + */ +public interface SysOperLogMapper extends Mapper +{ + /** + * 新增操作日志 + * + * @param operLog 操作日志对象 + */ + public void insertOperlog(SysOperLog operLog); + + /** + * 查询系统操作日志集合 + * + * @param operLog 操作日志对象 + * @return 操作日志集合 + */ + public List selectOperLogList(SysOperLog operLog); + + /** + * 批量删除系统操作日志 + * + * @param ids 需要删除的数据 + * @return 结果 + */ + public int deleteOperLogByIds(String[] ids); + + /** + * 查询操作日志详细 + * + * @param operId 操作ID + * @return 操作日志对象 + */ + public SysOperLog selectOperLogById(Long operId); + + /** + * 清空操作日志 + */ + public void cleanOperLog(); +} diff --git a/ruoyi-framework/src/main/java/com/ruoyi/system/mapper/SysPostMapper.java b/ruoyi-framework/src/main/java/com/ruoyi/system/mapper/SysPostMapper.java new file mode 100644 index 000000000..226e8a501 --- /dev/null +++ b/ruoyi-framework/src/main/java/com/ruoyi/system/mapper/SysPostMapper.java @@ -0,0 +1,84 @@ +package com.ruoyi.system.mapper; + +import java.util.List; +import com.ruoyi.system.domain.SysPost; +import tk.mybatis.mapper.common.Mapper; + +/** + * 岗位信息 数据层 + * + * @author ruoyi + */ +public interface SysPostMapper extends Mapper +{ + /** + * 查询岗位数据集合 + * + * @param post 岗位信息 + * @return 岗位数据集合 + */ + public List selectPostList(SysPost post); + + /** + * 查询所有岗位 + * + * @return 岗位列表 + */ + public List selectPostAll(); + + /** + * 根据用户ID查询岗位 + * + * @param userId 用户ID + * @return 岗位列表 + */ + public List selectPostsByUserId(Long userId); + + /** + * 通过岗位ID查询岗位信息 + * + * @param postId 岗位ID + * @return 角色对象信息 + */ + public SysPost selectPostById(Long postId); + + /** + * 批量删除岗位信息 + * + * @param ids 需要删除的数据ID + * @return 结果 + */ + public int deletePostByIds(Long[] ids); + + /** + * 修改岗位信息 + * + * @param post 岗位信息 + * @return 结果 + */ + public int updatePost(SysPost post); + + /** + * 新增岗位信息 + * + * @param post 岗位信息 + * @return 结果 + */ + public int insertPost(SysPost post); + + /** + * 校验岗位名称 + * + * @param postName 岗位名称 + * @return 结果 + */ + public SysPost checkPostNameUnique(String postName); + + /** + * 校验岗位编码 + * + * @param postCode 岗位编码 + * @return 结果 + */ + public SysPost checkPostCodeUnique(String postCode); +} diff --git a/ruoyi-framework/src/main/java/com/ruoyi/system/mapper/SysRoleDeptMapper.java b/ruoyi-framework/src/main/java/com/ruoyi/system/mapper/SysRoleDeptMapper.java new file mode 100644 index 000000000..a3199831a --- /dev/null +++ b/ruoyi-framework/src/main/java/com/ruoyi/system/mapper/SysRoleDeptMapper.java @@ -0,0 +1,45 @@ +package com.ruoyi.system.mapper; + +import java.util.List; +import com.ruoyi.system.domain.SysRoleDept; +import tk.mybatis.mapper.common.Mapper; + +/** + * 角色与部门关联表 数据层 + * + * @author ruoyi + */ +public interface SysRoleDeptMapper extends Mapper +{ + /** + * 通过角色ID删除角色和部门关联 + * + * @param roleId 角色ID + * @return 结果 + */ + public int deleteRoleDeptByRoleId(Long roleId); + + /** + * 批量删除角色部门关联信息 + * + * @param ids 需要删除的数据ID + * @return 结果 + */ + public int deleteRoleDept(Long[] ids); + + /** + * 查询部门使用数量 + * + * @param deptId 部门ID + * @return 结果 + */ + public int selectCountRoleDeptByDeptId(Long deptId); + + /** + * 批量新增角色部门信息 + * + * @param roleDeptList 角色部门列表 + * @return 结果 + */ + public int batchRoleDept(List roleDeptList); +} diff --git a/ruoyi-framework/src/main/java/com/ruoyi/system/mapper/SysRoleMapper.java b/ruoyi-framework/src/main/java/com/ruoyi/system/mapper/SysRoleMapper.java new file mode 100644 index 000000000..33fbc14d4 --- /dev/null +++ b/ruoyi-framework/src/main/java/com/ruoyi/system/mapper/SysRoleMapper.java @@ -0,0 +1,85 @@ +package com.ruoyi.system.mapper; + +import java.util.List; +import com.ruoyi.system.domain.SysRole; +import tk.mybatis.mapper.common.Mapper; + +/** + * 角色表 数据层 + * + * @author ruoyi + */ +public interface SysRoleMapper extends Mapper +{ + /** + * 根据条件分页查询角色数据 + * + * @param role 角色信息 + * @return 角色数据集合信息 + */ + public List selectRoleList(SysRole role); + + /** + * 根据用户ID查询角色 + * + * @param userId 用户ID + * @return 角色列表 + */ + public List selectRolesByUserId(Long userId); + + /** + * 通过角色ID查询角色 + * + * @param roleId 角色ID + * @return 角色对象信息 + */ + public SysRole selectRoleById(Long roleId); + + /** + * 通过角色ID删除角色 + * + * @param roleId 角色ID + * @return 结果 + */ + public int deleteRoleById(Long roleId); + + /** + * 批量角色用户信息 + * + * @param ids 需要删除的数据ID + * @return 结果 + */ + public int deleteRoleByIds(Long[] ids); + + /** + * 修改角色信息 + * + * @param role 角色信息 + * @return 结果 + */ + public int updateRole(SysRole role); + + /** + * 新增角色信息 + * + * @param role 角色信息 + * @return 结果 + */ + public int insertRole(SysRole role); + + /** + * 校验角色名称是否唯一 + * + * @param roleName 角色名称 + * @return 角色信息 + */ + public SysRole checkRoleNameUnique(String roleName); + + /** + * 校验角色权限是否唯一 + * + * @param roleKey 角色权限 + * @return 角色信息 + */ + public SysRole checkRoleKeyUnique(String roleKey); +} diff --git a/ruoyi-framework/src/main/java/com/ruoyi/system/mapper/SysRoleMenuMapper.java b/ruoyi-framework/src/main/java/com/ruoyi/system/mapper/SysRoleMenuMapper.java new file mode 100644 index 000000000..cbf392d75 --- /dev/null +++ b/ruoyi-framework/src/main/java/com/ruoyi/system/mapper/SysRoleMenuMapper.java @@ -0,0 +1,45 @@ +package com.ruoyi.system.mapper; + +import java.util.List; +import com.ruoyi.system.domain.SysRoleMenu; +import tk.mybatis.mapper.common.Mapper; + +/** + * 角色与菜单关联表 数据层 + * + * @author ruoyi + */ +public interface SysRoleMenuMapper extends Mapper +{ + /** + * 通过角色ID删除角色和菜单关联 + * + * @param roleId 角色ID + * @return 结果 + */ + public int deleteRoleMenuByRoleId(Long roleId); + + /** + * 批量删除角色菜单关联信息 + * + * @param ids 需要删除的数据ID + * @return 结果 + */ + public int deleteRoleMenu(Long[] ids); + + /** + * 查询菜单使用数量 + * + * @param menuId 菜单ID + * @return 结果 + */ + public int selectCountRoleMenuByMenuId(Long menuId); + + /** + * 批量新增角色菜单信息 + * + * @param roleMenuList 角色菜单列表 + * @return 结果 + */ + public int batchRoleMenu(List roleMenuList); +} diff --git a/ruoyi-framework/src/main/java/com/ruoyi/system/mapper/SysUserMapper.java b/ruoyi-framework/src/main/java/com/ruoyi/system/mapper/SysUserMapper.java new file mode 100644 index 000000000..cab38534e --- /dev/null +++ b/ruoyi-framework/src/main/java/com/ruoyi/system/mapper/SysUserMapper.java @@ -0,0 +1,109 @@ +package com.ruoyi.system.mapper; + +import java.util.List; +import com.ruoyi.system.domain.SysUser; +import tk.mybatis.mapper.common.Mapper; + +/** + * 用户表 数据层 + * + * @author ruoyi + */ +public interface SysUserMapper extends Mapper +{ + /** + * 根据条件分页查询用户对象 + * + * @param user 用户信息 + * @return 用户信息集合信息 + */ + public List selectUserList(SysUser sysUser); + + /** + * 通过用户名查询用户 + * + * @param userName 用户名 + * @return 用户对象信息 + */ + public SysUser selectUserByLoginName(String userName); + + /** + * 通过手机号码查询用户 + * + * @param phoneNumber 手机号码 + * @return 用户对象信息 + */ + public SysUser selectUserByPhoneNumber(String phoneNumber); + + /** + * 通过邮箱查询用户 + * + * @param email 邮箱 + * @return 用户对象信息 + */ + public SysUser selectUserByEmail(String email); + + /** + * 通过用户ID查询用户 + * + * @param userId 用户ID + * @return 用户对象信息 + */ + public SysUser selectUserById(Long userId); + + /** + * 通过用户ID删除用户 + * + * @param userId 用户ID + * @return 结果 + */ + public int deleteUserById(Long userId); + + /** + * 批量删除用户信息 + * + * @param ids 需要删除的数据ID + * @return 结果 + */ + public int deleteUserByIds(Long[] ids); + + /** + * 修改用户信息 + * + * @param user 用户信息 + * @return 结果 + */ + public int updateUser(SysUser user); + + /** + * 新增用户信息 + * + * @param user 用户信息 + * @return 结果 + */ + public int insertUser(SysUser user); + + /** + * 校验用户名称是否唯一 + * + * @param loginName 登录名称 + * @return 结果 + */ + public int checkLoginNameUnique(String loginName); + + /** + * 校验手机号码是否唯一 + * + * @param phonenumber 手机号码 + * @return 结果 + */ + public SysUser checkPhoneUnique(String phonenumber); + + /** + * 校验email是否唯一 + * + * @param email 用户邮箱 + * @return 结果 + */ + public SysUser checkEmailUnique(String email); +} diff --git a/ruoyi-framework/src/main/java/com/ruoyi/system/mapper/SysUserOnlineMapper.java b/ruoyi-framework/src/main/java/com/ruoyi/system/mapper/SysUserOnlineMapper.java new file mode 100644 index 000000000..43e8671c1 --- /dev/null +++ b/ruoyi-framework/src/main/java/com/ruoyi/system/mapper/SysUserOnlineMapper.java @@ -0,0 +1,53 @@ +package com.ruoyi.system.mapper; + +import java.util.List; +import com.ruoyi.system.domain.SysUserOnline; +import tk.mybatis.mapper.common.Mapper; + +/** + * 在线用户 数据层 + * + * @author ruoyi + */ +public interface SysUserOnlineMapper extends Mapper +{ + /** + * 通过会话序号查询信息 + * + * @param sessionId 会话ID + * @return 在线用户信息 + */ + public SysUserOnline selectOnlineById(String sessionId); + + /** + * 通过会话序号删除信息 + * + * @param sessionId 会话ID + * @return 在线用户信息 + */ + public int deleteOnlineById(String sessionId); + + /** + * 保存会话信息 + * + * @param online 会话信息 + * @return 结果 + */ + public int saveOnline(SysUserOnline online); + + /** + * 查询会话集合 + * + * @param userOnline 会话参数 + * @return 会话集合 + */ + public List selectUserOnlineList(SysUserOnline userOnline); + + /** + * 查询过期会话集合 + * + * @param lastAccessTime 过期时间 + * @return 会话集合 + */ + public List selectOnlineByExpired(String lastAccessTime); +} diff --git a/ruoyi-framework/src/main/java/com/ruoyi/system/mapper/SysUserPostMapper.java b/ruoyi-framework/src/main/java/com/ruoyi/system/mapper/SysUserPostMapper.java new file mode 100644 index 000000000..9de998901 --- /dev/null +++ b/ruoyi-framework/src/main/java/com/ruoyi/system/mapper/SysUserPostMapper.java @@ -0,0 +1,45 @@ +package com.ruoyi.system.mapper; + +import java.util.List; +import com.ruoyi.system.domain.SysUserPost; +import tk.mybatis.mapper.common.Mapper; + +/** + * 用户与岗位 表 数据层 + * + * @author ruoyi + */ +public interface SysUserPostMapper extends Mapper +{ + /** + * 通过用户ID删除用户和岗位关联 + * + * @param userId 用户ID + * @return 结果 + */ + public int deleteUserPostByUserId(Long userId); + + /** + * 通过岗位ID查询岗位使用数量 + * + * @param postId 岗位ID + * @return 结果 + */ + public int countUserPostById(Long postId); + + /** + * 批量删除用户和岗位关联 + * + * @param ids 需要删除的数据ID + * @return 结果 + */ + public int deleteUserPost(Long[] ids); + + /** + * 批量新增用户岗位信息 + * + * @param userPostList 用户角色列表 + * @return 结果 + */ + public int batchUserPost(List userPostList); +} diff --git a/ruoyi-framework/src/main/java/com/ruoyi/system/mapper/SysUserRoleMapper.java b/ruoyi-framework/src/main/java/com/ruoyi/system/mapper/SysUserRoleMapper.java new file mode 100644 index 000000000..72e64878b --- /dev/null +++ b/ruoyi-framework/src/main/java/com/ruoyi/system/mapper/SysUserRoleMapper.java @@ -0,0 +1,45 @@ +package com.ruoyi.system.mapper; + +import java.util.List; +import com.ruoyi.system.domain.SysUserRole; +import tk.mybatis.mapper.common.Mapper; + +/** + * 用户表 数据层 + * + * @author ruoyi + */ +public interface SysUserRoleMapper extends Mapper +{ + /** + * 通过用户ID删除用户和角色关联 + * + * @param userId 用户ID + * @return 结果 + */ + public int deleteUserRoleByUserId(Long userId); + + /** + * 批量删除用户和角色关联 + * + * @param ids 需要删除的数据ID + * @return 结果 + */ + public int deleteUserRole(Long[] ids); + + /** + * 通过角色ID查询角色使用数量 + * + * @param roleId 角色ID + * @return 结果 + */ + public int countUserRoleByRoleId(Long roleId); + + /** + * 批量新增用户角色信息 + * + * @param userRoleList 用户角色列表 + * @return 结果 + */ + public int batchUserRole(List userRoleList); +} diff --git a/ruoyi-framework/src/main/java/com/ruoyi/system/service/ISysConfigService.java b/ruoyi-framework/src/main/java/com/ruoyi/system/service/ISysConfigService.java new file mode 100644 index 000000000..59e887764 --- /dev/null +++ b/ruoyi-framework/src/main/java/com/ruoyi/system/service/ISysConfigService.java @@ -0,0 +1,70 @@ +package com.ruoyi.system.service; + +import java.util.List; + +import com.ruoyi.framework.web.base.AbstractBaseService; +import com.ruoyi.system.domain.SysConfig; + +/** + * 参数配置 服务层 + * + * @author ruoyi + */ +public interface ISysConfigService extends AbstractBaseService +{ + /** + * 查询参数配置信息 + * + * @param configId 参数配置ID + * @return 参数配置信息 + */ + public SysConfig selectConfigById(Long configId); + + /** + * 根据键名查询参数配置信息 + * + * @param configKey 参数键名 + * @return 参数键值 + */ + public String selectConfigByKey(String configKey); + + /** + * 查询参数配置列表 + * + * @param config 参数配置信息 + * @return 参数配置集合 + */ + public List selectConfigList(SysConfig config); + + /** + * 新增参数配置 + * + * @param config 参数配置信息 + * @return 结果 + */ + public int insertConfig(SysConfig config); + + /** + * 修改参数配置 + * + * @param config 参数配置信息 + * @return 结果 + */ + public int updateConfig(SysConfig config); + + /** + * 批量删除参数配置信息 + * + * @param ids 需要删除的数据ID + * @return 结果 + */ + public int deleteConfigByIds(String ids); + + /** + * 校验参数键名是否唯一 + * + * @param config 参数信息 + * @return 结果 + */ + public String checkConfigKeyUnique(SysConfig config); +} diff --git a/ruoyi-framework/src/main/java/com/ruoyi/system/service/ISysDeptService.java b/ruoyi-framework/src/main/java/com/ruoyi/system/service/ISysDeptService.java new file mode 100644 index 000000000..c1b543abc --- /dev/null +++ b/ruoyi-framework/src/main/java/com/ruoyi/system/service/ISysDeptService.java @@ -0,0 +1,96 @@ +package com.ruoyi.system.service; + +import java.util.List; +import java.util.Map; + +import com.ruoyi.framework.web.base.AbstractBaseService; +import com.ruoyi.system.domain.SysConfig; +import com.ruoyi.system.domain.SysDept; +import com.ruoyi.system.domain.SysRole; + +/** + * 部门管理 服务层 + * + * @author ruoyi + */ +public interface ISysDeptService extends AbstractBaseService +{ + /** + * 查询部门管理数据 + * + * @param dept 部门信息 + * @return 部门信息集合 + */ + public List selectDeptList(SysDept dept); + + /** + * 查询部门管理树 + * + * @return 所有部门信息 + */ + public List> selectDeptTree(); + + /** + * 根据角色ID查询菜单 + * + * @param role 角色对象 + * @return 菜单列表 + */ + public List> roleDeptTreeData(SysRole role); + + /** + * 查询部门人数 + * + * @param parentId 父部门ID + * @return 结果 + */ + public int selectDeptCount(Long parentId); + + /** + * 查询部门是否存在用户 + * + * @param deptId 部门ID + * @return 结果 true 存在 false 不存在 + */ + public boolean checkDeptExistUser(Long deptId); + + /** + * 删除部门管理信息 + * + * @param deptId 部门ID + * @return 结果 + */ + public int deleteDeptById(Long deptId); + + /** + * 新增保存部门信息 + * + * @param dept 部门信息 + * @return 结果 + */ + public int insertDept(SysDept dept); + + /** + * 修改保存部门信息 + * + * @param dept 部门信息 + * @return 结果 + */ + public int updateDept(SysDept dept); + + /** + * 根据部门ID查询信息 + * + * @param deptId 部门ID + * @return 部门信息 + */ + public SysDept selectDeptById(Long deptId); + + /** + * 校验部门名称是否唯一 + * + * @param dept 部门信息 + * @return 结果 + */ + public String checkDeptNameUnique(SysDept dept); +} diff --git a/ruoyi-framework/src/main/java/com/ruoyi/system/service/ISysDictDataService.java b/ruoyi-framework/src/main/java/com/ruoyi/system/service/ISysDictDataService.java new file mode 100644 index 000000000..e7bdb407a --- /dev/null +++ b/ruoyi-framework/src/main/java/com/ruoyi/system/service/ISysDictDataService.java @@ -0,0 +1,80 @@ +package com.ruoyi.system.service; + +import java.util.List; + +import com.ruoyi.framework.web.base.AbstractBaseService; +import com.ruoyi.system.domain.SysDept; +import com.ruoyi.system.domain.SysDictData; + +/** + * 字典 业务层 + * + * @author ruoyi + */ +public interface ISysDictDataService extends AbstractBaseService +{ + /** + * 根据条件分页查询字典数据 + * + * @param dictData 字典数据信息 + * @return 字典数据集合信息 + */ + public List selectDictDataList(SysDictData dictData); + + /** + * 根据字典类型查询字典数据 + * + * @param dictType 字典类型 + * @return 字典数据集合信息 + */ + public List selectDictDataByType(String dictType); + + /** + * 根据字典类型和字典键值查询字典数据信息 + * + * @param dictType 字典类型 + * @param dictValue 字典键值 + * @return 字典标签 + */ + public String selectDictLabel(String dictType, String dictValue); + + /** + * 根据字典数据ID查询信息 + * + * @param dictCode 字典数据ID + * @return 字典数据 + */ + public SysDictData selectDictDataById(Long dictCode); + + /** + * 通过字典ID删除字典数据信息 + * + * @param dictCode 字典数据ID + * @return 结果 + */ + public int deleteDictDataById(Long dictCode); + + /** + * 批量删除字典数据 + * + * @param ids 需要删除的数据 + * @return 结果 + */ + public int deleteDictDataByIds(String ids); + + /** + * 新增保存字典数据信息 + * + * @param dictData 字典数据信息 + * @return 结果 + */ + public int insertDictData(SysDictData dictData); + + /** + * 修改保存字典数据信息 + * + * @param dictData 字典数据信息 + * @return 结果 + */ + public int updateDictData(SysDictData dictData); +} diff --git a/ruoyi-framework/src/main/java/com/ruoyi/system/service/ISysDictTypeService.java b/ruoyi-framework/src/main/java/com/ruoyi/system/service/ISysDictTypeService.java new file mode 100644 index 000000000..460582ec1 --- /dev/null +++ b/ruoyi-framework/src/main/java/com/ruoyi/system/service/ISysDictTypeService.java @@ -0,0 +1,78 @@ +package com.ruoyi.system.service; + +import java.util.List; + +import com.ruoyi.framework.web.base.AbstractBaseService; +import com.ruoyi.system.domain.SysDictType; + +/** + * 字典 业务层 + * + * @author ruoyi + */ +public interface ISysDictTypeService extends AbstractBaseService +{ + /** + * 根据条件分页查询字典类型 + * + * @param dictType 字典类型信息 + * @return 字典类型集合信息 + */ + public List selectDictTypeList(SysDictType dictType); + + /** + * 根据所有字典类型 + * + * @return 字典类型集合信息 + */ + public List selectDictTypeAll(); + + /** + * 根据字典类型ID查询信息 + * + * @param dictId 字典类型ID + * @return 字典类型 + */ + public SysDictType selectDictTypeById(Long dictId); + + /** + * 通过字典ID删除字典信息 + * + * @param dictId 字典ID + * @return 结果 + */ + public int deleteDictTypeById(Long dictId); + + /** + * 批量删除字典类型 + * + * @param ids 需要删除的数据 + * @return 结果 + * @throws Exception 异常 + */ + public int deleteDictTypeByIds(String ids) throws Exception; + + /** + * 新增保存字典类型信息 + * + * @param dictType 字典类型信息 + * @return 结果 + */ + public int insertDictType(SysDictType dictType); + + /** + * 修改保存字典类型信息 + * + * @param dictType 字典类型信息 + * @return 结果 + */ + public int updateDictType(SysDictType dictType); + + /** + * 校验字典类型称是否唯一 + * + * @param dictType 字典类型 + * @return 结果 + */ + public String checkDictTypeUnique(SysDictType dictType); +} diff --git a/ruoyi-framework/src/main/java/com/ruoyi/system/service/ISysLogininforService.java b/ruoyi-framework/src/main/java/com/ruoyi/system/service/ISysLogininforService.java new file mode 100644 index 000000000..a1fd55a74 --- /dev/null +++ b/ruoyi-framework/src/main/java/com/ruoyi/system/service/ISysLogininforService.java @@ -0,0 +1,42 @@ +package com.ruoyi.system.service; + +import java.util.List; + +import com.ruoyi.framework.web.base.AbstractBaseService; +import com.ruoyi.system.domain.SysLogininfor; + +/** + * 系统访问日志情况信息 服务层 + * + * @author ruoyi + */ +public interface ISysLogininforService extends AbstractBaseService +{ + /** + * 新增系统登录日志 + * + * @param logininfor 访问日志对象 + */ + public void insertLogininfor(SysLogininfor logininfor); + + /** + * 查询系统登录日志集合 + * + * @param logininfor 访问日志对象 + * @return 登录记录集合 + */ + public List selectLogininforList(SysLogininfor logininfor); + + /** + * 批量删除系统登录日志 + * + * @param ids 需要删除的数据 + * @return + */ + public int deleteLogininforByIds(String ids); + + /** + * 清空系统登录日志 + */ + public void cleanLogininfor(); +} diff --git a/ruoyi-framework/src/main/java/com/ruoyi/system/service/ISysMenuService.java b/ruoyi-framework/src/main/java/com/ruoyi/system/service/ISysMenuService.java new file mode 100644 index 000000000..0e31c0b89 --- /dev/null +++ b/ruoyi-framework/src/main/java/com/ruoyi/system/service/ISysMenuService.java @@ -0,0 +1,127 @@ +package com.ruoyi.system.service; + +import java.util.List; +import java.util.Map; +import java.util.Set; + +import com.ruoyi.framework.web.base.AbstractBaseService; +import com.ruoyi.system.domain.SysMenu; +import com.ruoyi.system.domain.SysRole; +import com.ruoyi.system.domain.SysUser; + +/** + * 菜单 业务层 + * + * @author ruoyi + */ +public interface ISysMenuService extends AbstractBaseService +{ + /** + * 根据用户ID查询菜单 + * + * @param user 用户信息 + * @return 菜单列表 + */ + public List selectMenusByUser(SysUser user); + + /** + * 查询系统菜单列表 + * + * @param menu 菜单信息 + * @return 菜单列表 + */ + public List selectMenuList(SysMenu menu); + + /** + * 查询菜单集合 + * + * @return 所有菜单信息 + */ + public List selectMenuAll(); + + /** + * 根据用户ID查询权限 + * + * @param userId 用户ID + * @return 权限列表 + */ + public Set selectPermsByUserId(Long userId); + + /** + * 根据角色ID查询菜单 + * + * @param role 角色对象 + * @return 菜单列表 + */ + public List> roleMenuTreeData(SysRole role); + + /** + * 查询所有菜单信息 + * + * @return 菜单列表 + */ + public List> menuTreeData(); + + /** + * 查询系统所有权限 + * + * @return 权限列表 + */ + public Map selectPermsAll(); + + /** + * 删除菜单管理信息 + * + * @param menuId 菜单ID + * @return 结果 + */ + public int deleteMenuById(Long menuId); + + /** + * 根据菜单ID查询信息 + * + * @param menuId 菜单ID + * @return 菜单信息 + */ + public SysMenu selectMenuById(Long menuId); + + /** + * 查询菜单数量 + * + * @param parentId 菜单父ID + * @return 结果 + */ + public int selectCountMenuByParentId(Long parentId); + + /** + * 查询菜单使用数量 + * + * @param menuId 菜单ID + * @return 结果 + */ + public int selectCountRoleMenuByMenuId(Long menuId); + + /** + * 新增保存菜单信息 + * + * @param menu 菜单信息 + * @return 结果 + */ + public int insertMenu(SysMenu menu); + + /** + * 修改保存菜单信息 + * + * @param menu 菜单信息 + * @return 结果 + */ + public int updateMenu(SysMenu menu); + + /** + * 校验菜单名称是否唯一 + * + * @param menu 菜单信息 + * @return 结果 + */ + public String checkMenuNameUnique(SysMenu menu); +} diff --git a/ruoyi-framework/src/main/java/com/ruoyi/system/service/ISysNoticeService.java b/ruoyi-framework/src/main/java/com/ruoyi/system/service/ISysNoticeService.java new file mode 100644 index 000000000..4570bc750 --- /dev/null +++ b/ruoyi-framework/src/main/java/com/ruoyi/system/service/ISysNoticeService.java @@ -0,0 +1,54 @@ +package com.ruoyi.system.service; + +import java.util.List; + +import com.ruoyi.framework.web.base.AbstractBaseService; +import com.ruoyi.system.domain.SysNotice; + +/** + * 公告 服务层 + * + * @author ruoyi + */ +public interface ISysNoticeService extends AbstractBaseService +{ + /** + * 查询公告信息 + * + * @param noticeId 公告ID + * @return 公告信息 + */ + public SysNotice selectNoticeById(Long noticeId); + + /** + * 查询公告列表 + * + * @param notice 公告信息 + * @return 公告集合 + */ + public List selectNoticeList(SysNotice notice); + + /** + * 新增公告 + * + * @param notice 公告信息 + * @return 结果 + */ + public int insertNotice(SysNotice notice); + + /** + * 修改公告 + * + * @param notice 公告信息 + * @return 结果 + */ + public int updateNotice(SysNotice notice); + + /** + * 删除公告信息 + * + * @param ids 需要删除的数据ID + * @return 结果 + */ + public int deleteNoticeByIds(String ids); +} diff --git a/ruoyi-framework/src/main/java/com/ruoyi/system/service/ISysOperLogService.java b/ruoyi-framework/src/main/java/com/ruoyi/system/service/ISysOperLogService.java new file mode 100644 index 000000000..ea273dd5c --- /dev/null +++ b/ruoyi-framework/src/main/java/com/ruoyi/system/service/ISysOperLogService.java @@ -0,0 +1,50 @@ +package com.ruoyi.system.service; + +import java.util.List; + +import com.ruoyi.framework.web.base.AbstractBaseService; +import com.ruoyi.system.domain.SysOperLog; + +/** + * 操作日志 服务层 + * + * @author ruoyi + */ +public interface ISysOperLogService extends AbstractBaseService +{ + /** + * 新增操作日志 + * + * @param operLog 操作日志对象 + */ + public void insertOperlog(SysOperLog operLog); + + /** + * 查询系统操作日志集合 + * + * @param operLog 操作日志对象 + * @return 操作日志集合 + */ + public List selectOperLogList(SysOperLog operLog); + + /** + * 批量删除系统操作日志 + * + * @param ids 需要删除的数据 + * @return 结果 + */ + public int deleteOperLogByIds(String ids); + + /** + * 查询操作日志详细 + * + * @param operId 操作ID + * @return 操作日志对象 + */ + public SysOperLog selectOperLogById(Long operId); + + /** + * 清空操作日志 + */ + public void cleanOperLog(); +} diff --git a/ruoyi-framework/src/main/java/com/ruoyi/system/service/ISysPostService.java b/ruoyi-framework/src/main/java/com/ruoyi/system/service/ISysPostService.java new file mode 100644 index 000000000..76d4e024c --- /dev/null +++ b/ruoyi-framework/src/main/java/com/ruoyi/system/service/ISysPostService.java @@ -0,0 +1,94 @@ +package com.ruoyi.system.service; + +import java.util.List; + +import com.ruoyi.framework.web.base.AbstractBaseService; +import com.ruoyi.system.domain.SysPost; + +/** + * 岗位信息 服务层 + * + * @author ruoyi + */ +public interface ISysPostService extends AbstractBaseService +{ + /** + * 查询岗位信息集合 + * + * @param post 岗位信息 + * @return 岗位信息集合 + */ + public List selectPostList(SysPost post); + + /** + * 查询所有岗位 + * + * @return 岗位列表 + */ + public List selectPostAll(); + + /** + * 根据用户ID查询岗位 + * + * @param userId 用户ID + * @return 岗位列表 + */ + public List selectPostsByUserId(Long userId); + + /** + * 通过岗位ID查询岗位信息 + * + * @param postId 岗位ID + * @return 角色对象信息 + */ + public SysPost selectPostById(Long postId); + + /** + * 批量删除岗位信息 + * + * @param ids 需要删除的数据ID + * @return 结果 + * @throws Exception 异常 + */ + public int deletePostByIds(String ids) throws Exception; + + /** + * 新增保存岗位信息 + * + * @param post 岗位信息 + * @return 结果 + */ + public int insertPost(SysPost post); + + /** + * 修改保存岗位信息 + * + * @param post 岗位信息 + * @return 结果 + */ + public int updatePost(SysPost post); + + /** + * 通过岗位ID查询岗位使用数量 + * + * @param postId 岗位ID + * @return 结果 + */ + public int countUserPostById(Long postId); + + /** + * 校验岗位名称 + * + * @param post 岗位信息 + * @return 结果 + */ + public String checkPostNameUnique(SysPost post); + + /** + * 校验岗位编码 + * + * @param post 岗位信息 + * @return 结果 + */ + public String checkPostCodeUnique(SysPost post); +} diff --git a/ruoyi-framework/src/main/java/com/ruoyi/system/service/ISysRoleService.java b/ruoyi-framework/src/main/java/com/ruoyi/system/service/ISysRoleService.java new file mode 100644 index 000000000..a5ca0b54e --- /dev/null +++ b/ruoyi-framework/src/main/java/com/ruoyi/system/service/ISysRoleService.java @@ -0,0 +1,119 @@ +package com.ruoyi.system.service; + +import java.util.List; +import java.util.Set; + +import com.ruoyi.framework.web.base.AbstractBaseService; +import com.ruoyi.system.domain.SysRole; + +/** + * 角色业务层 + * + * @author ruoyi + */ +public interface ISysRoleService extends AbstractBaseService +{ + /** + * 根据条件分页查询角色数据 + * + * @param role 角色信息 + * @return 角色数据集合信息 + */ + public List selectRoleList(SysRole role); + + /** + * 根据用户ID查询角色 + * + * @param userId 用户ID + * @return 权限列表 + */ + public Set selectRoleKeys(Long userId); + + /** + * 根据用户ID查询角色 + * + * @param userId 用户ID + * @return 角色列表 + */ + public List selectRolesByUserId(Long userId); + + /** + * 查询所有角色 + * + * @return 角色列表 + */ + public List selectRoleAll(); + + /** + * 通过角色ID查询角色 + * + * @param roleId 角色ID + * @return 角色对象信息 + */ + public SysRole selectRoleById(Long roleId); + + /** + * 通过角色ID删除角色 + * + * @param roleId 角色ID + * @return 结果 + */ + public boolean deleteRoleById(Long roleId); + + /** + * 批量删除角色用户信息 + * + * @param ids 需要删除的数据ID + * @return 结果 + * @throws Exception 异常 + */ + public int deleteRoleByIds(String ids) throws Exception; + + /** + * 新增保存角色信息 + * + * @param role 角色信息 + * @return 结果 + */ + public int insertRole(SysRole role); + + /** + * 修改保存角色信息 + * + * @param role 角色信息 + * @return 结果 + */ + public int updateRole(SysRole role); + + /** + * 修改数据权限信息 + * + * @param role 角色信息 + * @return 结果 + */ + public int updateRule(SysRole role); + + /** + * 校验角色名称是否唯一 + * + * @param role 角色信息 + * @return 结果 + */ + public String checkRoleNameUnique(SysRole role); + + /** + * 校验角色权限是否唯一 + * + * @param role 角色信息 + * @return 结果 + */ + public String checkRoleKeyUnique(SysRole role); + + /** + * 通过角色ID查询角色使用数量 + * + * @param roleId 角色ID + * @return 结果 + */ + public int countUserRoleByRoleId(Long roleId); +} diff --git a/ruoyi-framework/src/main/java/com/ruoyi/system/service/ISysUserOnlineService.java b/ruoyi-framework/src/main/java/com/ruoyi/system/service/ISysUserOnlineService.java new file mode 100644 index 000000000..0f77a6dce --- /dev/null +++ b/ruoyi-framework/src/main/java/com/ruoyi/system/service/ISysUserOnlineService.java @@ -0,0 +1,69 @@ +package com.ruoyi.system.service; + +import java.util.Date; +import java.util.List; + +import com.ruoyi.framework.web.base.AbstractBaseService; +import com.ruoyi.system.domain.SysUserOnline; + +/** + * 在线用户 服务层 + * + * @author ruoyi + */ +public interface ISysUserOnlineService extends AbstractBaseService +{ + /** + * 通过会话序号查询信息 + * + * @param sessionId 会话ID + * @return 在线用户信息 + */ + public SysUserOnline selectOnlineById(String sessionId); + + /** + * 通过会话序号删除信息 + * + * @param sessionId 会话ID + * @return 在线用户信息 + */ + public void deleteOnlineById(String sessionId); + + /** + * 通过会话序号删除信息 + * + * @param sessions 会话ID集合 + * @return 在线用户信息 + */ + public void batchDeleteOnline(List sessions); + + /** + * 保存会话信息 + * + * @param online 会话信息 + */ + public void saveOnline(SysUserOnline online); + + /** + * 查询会话集合 + * + * @param userOnline 分页参数 + * @return 会话集合 + */ + public List selectUserOnlineList(SysUserOnline userOnline); + + /** + * 强退用户 + * + * @param sessionId 会话ID + */ + public void forceLogout(String sessionId); + + /** + * 查询会话集合 + * + * @param expiredDate 有效期 + * @return 会话集合 + */ + public List selectOnlineByExpired(Date expiredDate); +} diff --git a/ruoyi-framework/src/main/java/com/ruoyi/system/service/ISysUserService.java b/ruoyi-framework/src/main/java/com/ruoyi/system/service/ISysUserService.java new file mode 100644 index 000000000..d761c6d77 --- /dev/null +++ b/ruoyi-framework/src/main/java/com/ruoyi/system/service/ISysUserService.java @@ -0,0 +1,143 @@ +package com.ruoyi.system.service; + +import java.util.List; + +import com.ruoyi.framework.web.base.AbstractBaseService; +import com.ruoyi.system.domain.SysUser; + +/** + * 用户 业务层 + * + * @author ruoyi + */ +public interface ISysUserService extends AbstractBaseService +{ + /** + * 根据条件分页查询用户对象 + * + * @param user 用户信息 + * @return 用户信息集合信息 + */ + public List selectUserList(SysUser user); + + /** + * 通过用户名查询用户 + * + * @param userName 用户名 + * @return 用户对象信息 + */ + public SysUser selectUserByLoginName(String userName); + + /** + * 通过手机号码查询用户 + * + * @param phoneNumber 手机号码 + * @return 用户对象信息 + */ + public SysUser selectUserByPhoneNumber(String phoneNumber); + + /** + * 通过邮箱查询用户 + * + * @param email 邮箱 + * @return 用户对象信息 + */ + public SysUser selectUserByEmail(String email); + + /** + * 通过用户ID查询用户 + * + * @param userId 用户ID + * @return 用户对象信息 + */ + public SysUser selectUserById(Long userId); + + /** + * 通过用户ID删除用户 + * + * @param userId 用户ID + * @return 结果 + */ + public int deleteUserById(Long userId); + + /** + * 批量删除用户信息 + * + * @param ids 需要删除的数据ID + * @return 结果 + * @throws Exception 异常 + */ + public int deleteUserByIds(String ids) throws Exception; + + /** + * 保存用户信息 + * + * @param user 用户信息 + * @return 结果 + */ + public int insertUser(SysUser user); + + /** + * 保存用户信息 + * + * @param user 用户信息 + * @return 结果 + */ + public int updateUser(SysUser user); + + /** + * 修改用户详细信息 + * + * @param user 用户信息 + * @return 结果 + */ + public int updateUserInfo(SysUser user); + + /** + * 修改用户密码信息 + * + * @param user 用户信息 + * @return 结果 + */ + public int resetUserPwd(SysUser user); + + /** + * 校验用户名称是否唯一 + * + * @param loginName 登录名称 + * @return 结果 + */ + public String checkLoginNameUnique(String loginName); + + /** + * 校验手机号码是否唯一 + * + * @param user 用户信息 + * @return 结果 + */ + public String checkPhoneUnique(SysUser user); + + /** + * 校验email是否唯一 + * + * @param user 用户信息 + * @return 结果 + */ + public String checkEmailUnique(SysUser user); + + /** + * 根据用户ID查询用户所属角色组 + * + * @param userId 用户ID + * @return 结果 + */ + public String selectUserRoleGroup(Long userId); + + /** + * 根据用户ID查询用户所属岗位组 + * + * @param userId 用户ID + * @return 结果 + */ + public String selectUserPostGroup(Long userId); +} diff --git a/ruoyi-framework/src/main/java/com/ruoyi/system/service/impl/SysConfigServiceImpl.java b/ruoyi-framework/src/main/java/com/ruoyi/system/service/impl/SysConfigServiceImpl.java new file mode 100644 index 000000000..3afc4b43c --- /dev/null +++ b/ruoyi-framework/src/main/java/com/ruoyi/system/service/impl/SysConfigServiceImpl.java @@ -0,0 +1,120 @@ +package com.ruoyi.system.service.impl; + +import java.util.List; + +import com.ruoyi.framework.web.base.AbstractBaseServiceImpl; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import com.ruoyi.common.constant.UserConstants; +import com.ruoyi.common.support.Convert; +import com.ruoyi.common.utils.StringUtils; +import com.ruoyi.system.domain.SysConfig; +import com.ruoyi.system.mapper.SysConfigMapper; +import com.ruoyi.system.service.ISysConfigService; + +/** + * 参数配置 服务层实现 + * + * @author ruoyi + */ +@Service +public class SysConfigServiceImpl extends AbstractBaseServiceImpl implements ISysConfigService +{ + @Autowired + private SysConfigMapper configMapper; + + /** + * 查询参数配置信息 + * + * @param configId 参数配置ID + * @return 参数配置信息 + */ + @Override + public SysConfig selectConfigById(Long configId) + { + SysConfig config = new SysConfig(); + config.setConfigId(configId); + return configMapper.selectConfig(config); + } + + /** + * 根据键名查询参数配置信息 + * + * @param configKey 参数key + * @return 参数键值 + */ + @Override + public String selectConfigByKey(String configKey) + { + SysConfig config = new SysConfig(); + config.setConfigKey(configKey); + SysConfig retConfig = configMapper.selectConfig(config); + return StringUtils.isNotNull(retConfig) ? retConfig.getConfigValue() : ""; + } + + /** + * 查询参数配置列表 + * + * @param config 参数配置信息 + * @return 参数配置集合 + */ + @Override + public List selectConfigList(SysConfig config) + { + return configMapper.selectConfigList(config); + } + + /** + * 新增参数配置 + * + * @param config 参数配置信息 + * @return 结果 + */ + @Override + public int insertConfig(SysConfig config) + { + return configMapper.insertConfig(config); + } + + /** + * 修改参数配置 + * + * @param config 参数配置信息 + * @return 结果 + */ + @Override + public int updateConfig(SysConfig config) + { + return configMapper.updateConfig(config); + } + + /** + * 批量删除参数配置对象 + * + * @param ids 需要删除的数据ID + * @return 结果 + */ + @Override + public int deleteConfigByIds(String ids) + { + return configMapper.deleteConfigByIds(Convert.toStrArray(ids)); + } + + /** + * 校验参数键名是否唯一 + * + * @param config 参数配置信息 + * @return 结果 + */ + @Override + public String checkConfigKeyUnique(SysConfig config) + { + Long configId = StringUtils.isNull(config.getConfigId()) ? -1L : config.getConfigId(); + SysConfig info = configMapper.checkConfigKeyUnique(config.getConfigKey()); + if (StringUtils.isNotNull(info) && info.getConfigId().longValue() != configId.longValue()) + { + return UserConstants.CONFIG_KEY_NOT_UNIQUE; + } + return UserConstants.CONFIG_KEY_UNIQUE; + } +} diff --git a/ruoyi-framework/src/main/java/com/ruoyi/system/service/impl/SysDeptServiceImpl.java b/ruoyi-framework/src/main/java/com/ruoyi/system/service/impl/SysDeptServiceImpl.java new file mode 100644 index 000000000..c1dfa29a1 --- /dev/null +++ b/ruoyi-framework/src/main/java/com/ruoyi/system/service/impl/SysDeptServiceImpl.java @@ -0,0 +1,239 @@ +package com.ruoyi.system.service.impl; + +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +import com.ruoyi.framework.web.base.AbstractBaseServiceImpl; +import com.ruoyi.system.domain.SysConfig; +import com.ruoyi.system.mapper.SysConfigMapper; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import com.ruoyi.common.annotation.DataScope; +import com.ruoyi.common.constant.UserConstants; +import com.ruoyi.common.utils.StringUtils; +import com.ruoyi.system.domain.SysDept; +import com.ruoyi.system.domain.SysRole; +import com.ruoyi.system.mapper.SysDeptMapper; +import com.ruoyi.system.service.ISysDeptService; + +/** + * 部门管理 服务实现 + * + * @author ruoyi + */ +@Service +public class SysDeptServiceImpl extends AbstractBaseServiceImpl implements ISysDeptService +{ + @Autowired + private SysDeptMapper deptMapper; + + /** + * 查询部门管理数据 + * + * @return 部门信息集合 + */ + @Override + @DataScope(tableAlias = "d") + public List selectDeptList(SysDept dept) + { + return mapper.selectDeptList(dept); + } + + /** + * 查询部门管理树 + * + * @return 所有部门信息 + */ + @Override + public List> selectDeptTree() + { + List> trees = new ArrayList>(); + List deptList = selectDeptList(new SysDept()); + trees = getTrees(deptList, false, null); + return trees; + } + + /** + * 根据角色ID查询部门（数据权限） + * + * @param role 角色对象 + * @return 部门列表（数据权限） + */ + @Override + public List> roleDeptTreeData(SysRole role) + { + Long roleId = role.getRoleId(); + List> trees = new ArrayList>(); + List deptList = selectDeptList(new SysDept()); + if (StringUtils.isNotNull(roleId)) + { + List roleDeptList = deptMapper.selectRoleDeptTree(roleId); + trees = getTrees(deptList, true, roleDeptList); + } + else + { + trees = getTrees(deptList, false, null); + } + return trees; + } + + /** + * 对象转部门树 + * + * @param deptList 部门列表 + * @param isCheck 是否需要选中 + * @param roleDeptList 角色已存在菜单列表 + * @return + */ + public List> getTrees(List deptList, boolean isCheck, List roleDeptList) + { + + List> trees = new ArrayList>(); + for (SysDept dept : deptList) + { + if (UserConstants.DEPT_NORMAL.equals(dept.getStatus())) + { + Map deptMap = new HashMap(); + deptMap.put("id", dept.getDeptId()); + deptMap.put("pId", dept.getParentId()); + deptMap.put("name", dept.getDeptName()); + deptMap.put("title", dept.getDeptName()); + if (isCheck) + { + deptMap.put("checked", roleDeptList.contains(dept.getDeptId() + dept.getDeptName())); + } + else + { + deptMap.put("checked", false); + } + trees.add(deptMap); + } + } + return trees; + } + + /** + * 查询部门人数 + * + * @param parentId 部门ID + * @return 结果 + */ + @Override + public int selectDeptCount(Long parentId) + { + SysDept dept = new SysDept(); + dept.setParentId(parentId); + return deptMapper.selectDeptCount(dept); + } + + /** + * 查询部门是否存在用户 + * + * @param deptId 部门ID + * @return 结果 true 存在 false 不存在 + */ + @Override + public boolean checkDeptExistUser(Long deptId) + { + int result = deptMapper.checkDeptExistUser(deptId); + return result > 0 ? true : false; + } + + /** + * 删除部门管理信息 + * + * @param deptId 部门ID + * @return 结果 + */ + @Override + public int deleteDeptById(Long deptId) + { + return deptMapper.deleteDeptById(deptId); + } + + /** + * 新增保存部门信息 + * + * @param dept 部门信息 + * @return 结果 + */ + @Override + public int insertDept(SysDept dept) + { + SysDept info = deptMapper.selectDeptById(dept.getParentId()); + dept.setAncestors(info.getAncestors() + "," + dept.getParentId()); + return deptMapper.insertDept(dept); + } + + /** + * 修改保存部门信息 + * + * @param dept 部门信息 + * @return 结果 + */ + @Override + public int updateDept(SysDept dept) + { + SysDept info = deptMapper.selectDeptById(dept.getParentId()); + if (StringUtils.isNotNull(info)) + { + String ancestors = info.getAncestors() + "," + dept.getParentId(); + dept.setAncestors(ancestors); + updateDeptChildren(dept.getDeptId(), ancestors); + } + return deptMapper.updateDept(dept); + } + + /** + * 修改子元素关系 + * + * @param deptId 部门ID + * @param ancestors 元素列表 + */ + public void updateDeptChildren(Long deptId, String ancestors) + { + SysDept dept = new SysDept(); + dept.setParentId(deptId); + List childrens = deptMapper.selectDeptList(dept); + for (SysDept children : childrens) + { + children.setAncestors(ancestors + "," + dept.getParentId()); + } + if (childrens.size() > 0) + { + deptMapper.updateDeptChildren(childrens); + } + } + + /** + * 根据部门ID查询信息 + * + * @param deptId 部门ID + * @return 部门信息 + */ + @Override + public SysDept selectDeptById(Long deptId) + { + return deptMapper.selectDeptById(deptId); + } + + /** + * 校验部门名称是否唯一 + * + * @param dept 部门信息 + * @return 结果 + */ + @Override + public String checkDeptNameUnique(SysDept dept) + { + Long deptId = StringUtils.isNull(dept.getDeptId()) ? -1L : dept.getDeptId(); + SysDept info = deptMapper.checkDeptNameUnique(dept.getDeptName(), dept.getParentId()); + if (StringUtils.isNotNull(info) && info.getDeptId().longValue() != deptId.longValue()) + { + return UserConstants.DEPT_NAME_NOT_UNIQUE; + } + return UserConstants.DEPT_NAME_UNIQUE; + } +} diff --git a/ruoyi-framework/src/main/java/com/ruoyi/system/service/impl/SysDictDataServiceImpl.java b/ruoyi-framework/src/main/java/com/ruoyi/system/service/impl/SysDictDataServiceImpl.java new file mode 100644 index 000000000..c4de1188e --- /dev/null +++ b/ruoyi-framework/src/main/java/com/ruoyi/system/service/impl/SysDictDataServiceImpl.java @@ -0,0 +1,123 @@ +package com.ruoyi.system.service.impl; + +import java.util.List; + +import com.ruoyi.framework.web.base.AbstractBaseServiceImpl; +import com.ruoyi.system.domain.SysDept; +import com.ruoyi.system.mapper.SysDeptMapper; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import com.ruoyi.common.support.Convert; +import com.ruoyi.system.domain.SysDictData; +import com.ruoyi.system.mapper.SysDictDataMapper; +import com.ruoyi.system.service.ISysDictDataService; + +/** + * 字典 业务层处理 + * + * @author ruoyi + */ +@Service +public class SysDictDataServiceImpl extends AbstractBaseServiceImpl implements ISysDictDataService +{ + @Autowired + private SysDictDataMapper dictDataMapper; + + /** + * 根据条件分页查询字典数据 + * + * @param dictData 字典数据信息 + * @return 字典数据集合信息 + */ + @Override + public List selectDictDataList(SysDictData dictData) + { + startPage(); + return dictDataMapper.selectDictDataList(dictData); + } + + /** + * 根据字典类型查询字典数据 + * + * @param dictType 字典类型 + * @return 字典数据集合信息 + */ + @Override + public List selectDictDataByType(String dictType) + { + return dictDataMapper.selectDictDataByType(dictType); + } + + /** + * 根据字典类型和字典键值查询字典数据信息 + * + * @param dictType 字典类型 + * @param dictValue 字典键值 + * @return 字典标签 + */ + @Override + public String selectDictLabel(String dictType, String dictValue) + { + return dictDataMapper.selectDictLabel(dictType, dictValue); + } + + /** + * 根据字典数据ID查询信息 + * + * @param dictCode 字典数据ID + * @return 字典数据 + */ + @Override + public SysDictData selectDictDataById(Long dictCode) + { + return dictDataMapper.selectDictDataById(dictCode); + } + + /** + * 通过字典ID删除字典数据信息 + * + * @param dictCode 字典数据ID + * @return 结果 + */ + @Override + public int deleteDictDataById(Long dictCode) + { + return dictDataMapper.deleteDictDataById(dictCode); + } + + /** + * 批量删除字典数据 + * + * @param ids 需要删除的数据 + * @return 结果 + */ + @Override + public int deleteDictDataByIds(String ids) + { + return dictDataMapper.deleteDictDataByIds(Convert.toStrArray(ids)); + } + + /** + * 新增保存字典数据信息 + * + * @param dictData 字典数据信息 + * @return 结果 + */ + @Override + public int insertDictData(SysDictData dictData) + { + return dictDataMapper.insertDictData(dictData); + } + + /** + * 修改保存字典数据信息 + * + * @param dictData 字典数据信息 + * @return 结果 + */ + @Override + public int updateDictData(SysDictData dictData) + { + return dictDataMapper.updateDictData(dictData); + } +} diff --git a/ruoyi-framework/src/main/java/com/ruoyi/system/service/impl/SysDictTypeServiceImpl.java b/ruoyi-framework/src/main/java/com/ruoyi/system/service/impl/SysDictTypeServiceImpl.java new file mode 100644 index 000000000..7727b0361 --- /dev/null +++ b/ruoyi-framework/src/main/java/com/ruoyi/system/service/impl/SysDictTypeServiceImpl.java @@ -0,0 +1,144 @@ +package com.ruoyi.system.service.impl; + +import java.util.List; + +import com.ruoyi.framework.web.base.AbstractBaseServiceImpl; +import com.ruoyi.system.domain.SysDictData; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import com.ruoyi.common.constant.UserConstants; +import com.ruoyi.common.support.Convert; +import com.ruoyi.common.utils.StringUtils; +import com.ruoyi.system.domain.SysDictType; +import com.ruoyi.system.mapper.SysDictDataMapper; +import com.ruoyi.system.mapper.SysDictTypeMapper; +import com.ruoyi.system.service.ISysDictTypeService; + +/** + * 字典 业务层处理 + * + * @author ruoyi + */ +@Service +public class SysDictTypeServiceImpl extends AbstractBaseServiceImpl implements ISysDictTypeService +{ + @Autowired + private SysDictTypeMapper dictTypeMapper; + + @Autowired + private SysDictDataMapper dictDataMapper; + + /** + * 根据条件分页查询字典类型 + * + * @param dictType 字典类型信息 + * @return 字典类型集合信息 + */ + @Override + public List selectDictTypeList(SysDictType dictType) + { + startPage(); + return dictTypeMapper.selectDictTypeList(dictType); + } + + /** + * 根据所有字典类型 + * + * @return 字典类型集合信息 + */ + @Override + public List selectDictTypeAll() + { + return dictTypeMapper.selectDictTypeAll(); + } + + /** + * 根据字典类型ID查询信息 + * + * @param dictId 字典类型ID + * @return 字典类型 + */ + @Override + public SysDictType selectDictTypeById(Long dictId) + { + return dictTypeMapper.selectDictTypeById(dictId); + } + + /** + * 通过字典ID删除字典信息 + * + * @param dictId 字典ID + * @return 结果 + */ + @Override + public int deleteDictTypeById(Long dictId) + { + return dictTypeMapper.deleteDictTypeById(dictId); + } + + /** + * 批量删除字典类型 + * + * @param ids 需要删除的数据 + * @return 结果 + */ + @Override + public int deleteDictTypeByIds(String ids) throws Exception + { + Long[] dictIds = Convert.toLongArray(ids); + for (Long dictId : dictIds) + { + SysDictType dictType = selectDictTypeById(dictId); + if (dictDataMapper.countDictDataByType(dictType.getDictType()) > 0) + { + throw new Exception(String.format("%1$s已分配,不能删除", dictType.getDictName())); + } + } + + return dictTypeMapper.deleteDictTypeByIds(dictIds); + } + + /** + * 新增保存字典类型信息 + * + * @param dictType 字典类型信息 + * @return 结果 + */ + @Override + public int insertDictType(SysDictType dictType) + { + return dictTypeMapper.insertDictType(dictType); + } + + /** + * 修改保存字典类型信息 + * + * @param dictType 字典类型信息 + * @return 结果 + */ + @Override + public int updateDictType(SysDictType dictType) + { + SysDictType oldDict = dictTypeMapper.selectDictTypeById(dictType.getDictId()); + dictDataMapper.updateDictDataType(oldDict.getDictType(), dictType.getDictType()); + return dictTypeMapper.updateDictType(dictType); + } + + /** + * 校验字典类型称是否唯一 + * + * @param dict 字典类型 + * @return 结果 + */ + @Override + public String checkDictTypeUnique(SysDictType dict) + { + Long dictId = StringUtils.isNull(dict.getDictId()) ? -1L : dict.getDictId(); + SysDictType dictType = dictTypeMapper.checkDictTypeUnique(dict.getDictType()); + if (StringUtils.isNotNull(dictType) && dictType.getDictId().longValue() != dictId.longValue()) + { + return UserConstants.DICT_TYPE_NOT_UNIQUE; + } + return UserConstants.DICT_TYPE_UNIQUE; + } +} diff --git a/ruoyi-framework/src/main/java/com/ruoyi/system/service/impl/SysLogininforServiceImpl.java b/ruoyi-framework/src/main/java/com/ruoyi/system/service/impl/SysLogininforServiceImpl.java new file mode 100644 index 000000000..815709124 --- /dev/null +++ b/ruoyi-framework/src/main/java/com/ruoyi/system/service/impl/SysLogininforServiceImpl.java @@ -0,0 +1,71 @@ +package com.ruoyi.system.service.impl; + +import java.util.List; + +import com.ruoyi.framework.web.base.AbstractBaseServiceImpl; +import com.ruoyi.system.domain.SysDictType; +import com.ruoyi.system.mapper.SysDictTypeMapper; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import com.ruoyi.common.support.Convert; +import com.ruoyi.system.domain.SysLogininfor; +import com.ruoyi.system.mapper.SysLogininforMapper; +import com.ruoyi.system.service.ISysLogininforService; + +/** + * 系统访问日志情况信息 服务层处理 + * + * @author ruoyi + */ +@Service +public class SysLogininforServiceImpl extends AbstractBaseServiceImpl implements ISysLogininforService +{ + + @Autowired + private SysLogininforMapper logininforMapper; + + /** + * 新增系统登录日志 + * + * @param logininfor 访问日志对象 + */ + @Override + public void insertLogininfor(SysLogininfor logininfor) + { + logininforMapper.insertLogininfor(logininfor); + } + + /** + * 查询系统登录日志集合 + * + * @param logininfor 访问日志对象 + * @return 登录记录集合 + */ + @Override + public List selectLogininforList(SysLogininfor logininfor) + { + startPage(); + return logininforMapper.selectLogininforList(logininfor); + } + + /** + * 批量删除系统登录日志 + * + * @param ids 需要删除的数据 + * @return + */ + @Override + public int deleteLogininforByIds(String ids) + { + return logininforMapper.deleteLogininforByIds(Convert.toStrArray(ids)); + } + + /** + * 清空系统登录日志 + */ + @Override + public void cleanLogininfor() + { + logininforMapper.cleanLogininfor(); + } +} diff --git a/ruoyi-framework/src/main/java/com/ruoyi/system/service/impl/SysMenuServiceImpl.java b/ruoyi-framework/src/main/java/com/ruoyi/system/service/impl/SysMenuServiceImpl.java new file mode 100644 index 000000000..90e7541fc --- /dev/null +++ b/ruoyi-framework/src/main/java/com/ruoyi/system/service/impl/SysMenuServiceImpl.java @@ -0,0 +1,376 @@ +package com.ruoyi.system.service.impl; + +import java.text.MessageFormat; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.HashMap; +import java.util.HashSet; +import java.util.Iterator; +import java.util.LinkedHashMap; +import java.util.LinkedList; +import java.util.List; +import java.util.Map; +import java.util.Set; + +import com.ruoyi.framework.web.base.AbstractBaseServiceImpl; +import com.ruoyi.system.domain.SysLogininfor; +import com.ruoyi.system.mapper.SysLogininforMapper; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import com.ruoyi.common.constant.UserConstants; +import com.ruoyi.common.utils.StringUtils; +import com.ruoyi.system.domain.SysMenu; +import com.ruoyi.system.domain.SysRole; +import com.ruoyi.system.domain.SysUser; +import com.ruoyi.system.mapper.SysMenuMapper; +import com.ruoyi.system.mapper.SysRoleMenuMapper; +import com.ruoyi.system.service.ISysMenuService; + +/** + * 菜单 业务层处理 + * + * @author ruoyi + */ +@Service +public class SysMenuServiceImpl extends AbstractBaseServiceImpl implements ISysMenuService +{ + public static final String PREMISSION_STRING = "perms[\"{0}\"]"; + + @Autowired + private SysMenuMapper menuMapper; + + @Autowired + private SysRoleMenuMapper roleMenuMapper; + + /** + * 根据用户查询菜单 + * + * @param user 用户信息 + * @return 菜单列表 + */ + @Override + public List selectMenusByUser(SysUser user) + { + List menus = new LinkedList(); + // 管理员显示所有菜单信息 + if (user.isAdmin()) + { + menus = menuMapper.selectMenuNormalAll(); + } + else + { + menus = menuMapper.selectMenusByUserId(user.getUserId()); + } + return getChildPerms(menus, 0); + } + + /** + * 查询菜单集合 + * + * @return 所有菜单信息 + */ + @Override + public List selectMenuList(SysMenu menu) + { + return menuMapper.selectMenuList(menu); + } + + /** + * 查询菜单集合 + * + * @return 所有菜单信息 + */ + @Override + public List selectMenuAll() + { + return menuMapper.selectMenuAll(); + } + + /** + * 根据用户ID查询权限 + * + * @param userId 用户ID + * @return 权限列表 + */ + @Override + public Set selectPermsByUserId(Long userId) + { + List perms = menuMapper.selectPermsByUserId(userId); + Set permsSet = new HashSet<>(); + for (String perm : perms) + { + if (StringUtils.isNotEmpty(perm)) + { + permsSet.addAll(Arrays.asList(perm.trim().split(","))); + } + } + return permsSet; + } + + /** + * 根据角色ID查询菜单 + * + * @param role 角色对象 + * @return 菜单列表 + */ + @Override + public List> roleMenuTreeData(SysRole role) + { + Long roleId = role.getRoleId(); + List> trees = new ArrayList>(); + List menuList = menuMapper.selectMenuAll(); + if (StringUtils.isNotNull(roleId)) + { + List roleMenuList = menuMapper.selectMenuTree(roleId); + trees = getTrees(menuList, true, roleMenuList, true); + } + else + { + trees = getTrees(menuList, false, null, true); + } + return trees; + } + + /** + * 查询所有菜单 + * + * @return 菜单列表 + */ + @Override + public List> menuTreeData() + { + List> trees = new ArrayList>(); + List menuList = menuMapper.selectMenuAll(); + trees = getTrees(menuList, false, null, false); + return trees; + } + + /** + * 查询系统所有权限 + * + * @return 权限列表 + */ + @Override + public LinkedHashMap selectPermsAll() + { + LinkedHashMap section = new LinkedHashMap<>(); + List permissions = menuMapper.selectMenuAll(); + if (StringUtils.isNotEmpty(permissions)) + { + for (SysMenu menu : permissions) + { + section.put(menu.getUrl(), MessageFormat.format(PREMISSION_STRING, menu.getPerms())); + } + } + return section; + } + + /** + * 对象转菜单树 + * + * @param menuList 菜单列表 + * @param isCheck 是否需要选中 + * @param roleMenuList 角色已存在菜单列表 + * @param permsFlag 是否需要显示权限标识 + * @return + */ + public List> getTrees(List menuList, boolean isCheck, List roleMenuList, + boolean permsFlag) + { + List> trees = new ArrayList>(); + for (SysMenu menu : menuList) + { + Map deptMap = new HashMap(); + deptMap.put("id", menu.getMenuId()); + deptMap.put("pId", menu.getParentId()); + deptMap.put("name", transMenuName(menu, roleMenuList, permsFlag)); + deptMap.put("title", menu.getMenuName()); + if (isCheck) + { + deptMap.put("checked", roleMenuList.contains(menu.getMenuId() + menu.getPerms())); + } + else + { + deptMap.put("checked", false); + } + trees.add(deptMap); + } + return trees; + } + + public String transMenuName(SysMenu menu, List roleMenuList, boolean permsFlag) + { + StringBuffer sb = new StringBuffer(); + sb.append(menu.getMenuName()); + if (permsFlag) + { + sb.append("   " + menu.getPerms() + ""); + } + return sb.toString(); + } + + /** + * 删除菜单管理信息 + * + * @param menuId 菜单ID + * @return 结果 + */ + @Override + public int deleteMenuById(Long menuId) + { + return menuMapper.deleteMenuById(menuId); + } + + /** + * 根据菜单ID查询信息 + * + * @param menuId 菜单ID + * @return 菜单信息 + */ + @Override + public SysMenu selectMenuById(Long menuId) + { + return menuMapper.selectMenuById(menuId); + } + + /** + * 查询子菜单数量 + * + * @param parentId 父级菜单ID + * @return 结果 + */ + @Override + public int selectCountMenuByParentId(Long parentId) + { + return menuMapper.selectCountMenuByParentId(parentId); + } + + /** + * 查询菜单使用数量 + * + * @param menuId 菜单ID + * @return 结果 + */ + @Override + public int selectCountRoleMenuByMenuId(Long menuId) + { + return roleMenuMapper.selectCountRoleMenuByMenuId(menuId); + } + + /** + * 新增保存菜单信息 + * + * @param menu 菜单信息 + * @return 结果 + */ + @Override + public int insertMenu(SysMenu menu) + { + return menuMapper.insertMenu(menu); + } + + /** + * 修改保存菜单信息 + * + * @param menu 菜单信息 + * @return 结果 + */ + @Override + public int updateMenu(SysMenu menu) + { + return menuMapper.updateMenu(menu); + } + + /** + * 校验菜单名称是否唯一 + * + * @param menu 菜单信息 + * @return 结果 + */ + @Override + public String checkMenuNameUnique(SysMenu menu) + { + Long menuId = StringUtils.isNull(menu.getMenuId()) ? -1L : menu.getMenuId(); + SysMenu info = menuMapper.checkMenuNameUnique(menu.getMenuName(), menu.getParentId()); + if (StringUtils.isNotNull(info) && info.getMenuId().longValue() != menuId.longValue()) + { + return UserConstants.MENU_NAME_NOT_UNIQUE; + } + return UserConstants.MENU_NAME_UNIQUE; + } + + /** + * 根据父节点的ID获取所有子节点 + * + * @param list 分类表 + * @param parentId 传入的父节点ID + * @return String + */ + public List getChildPerms(List list, int parentId) + { + List returnList = new ArrayList(); + for (Iterator iterator = list.iterator(); iterator.hasNext();) + { + SysMenu t = (SysMenu) iterator.next(); + // 一、根据传入的某个父节点ID,遍历该父节点的所有子节点 + if (t.getParentId() == parentId) + { + recursionFn(list, t); + returnList.add(t); + } + } + return returnList; + } + + /** + * 递归列表 + * + * @param list + * @param t + */ + private void recursionFn(List list, SysMenu t) + { + // 得到子节点列表 + List childList = getChildList(list, t); + t.setChildren(childList); + for (SysMenu tChild : childList) + { + if (hasChild(list, tChild)) + { + // 判断是否有子节点 + Iterator it = childList.iterator(); + while (it.hasNext()) + { + SysMenu n = (SysMenu) it.next(); + recursionFn(list, n); + } + } + } + } + + /** + * 得到子节点列表 + */ + private List getChildList(List list, SysMenu t) + { + List tlist = new ArrayList(); + Iterator it = list.iterator(); + while (it.hasNext()) + { + SysMenu n = (SysMenu) it.next(); + if (n.getParentId().longValue() == t.getMenuId().longValue()) + { + tlist.add(n); + } + } + return tlist; + } + + /** + * 判断是否有子节点 + */ + private boolean hasChild(List list, SysMenu t) + { + return getChildList(list, t).size() > 0 ? true : false; + } +} diff --git a/ruoyi-framework/src/main/java/com/ruoyi/system/service/impl/SysNoticeServiceImpl.java b/ruoyi-framework/src/main/java/com/ruoyi/system/service/impl/SysNoticeServiceImpl.java new file mode 100644 index 000000000..c4403b1e6 --- /dev/null +++ b/ruoyi-framework/src/main/java/com/ruoyi/system/service/impl/SysNoticeServiceImpl.java @@ -0,0 +1,87 @@ +package com.ruoyi.system.service.impl; + +import java.util.List; + +import com.ruoyi.framework.web.base.AbstractBaseServiceImpl; +import com.ruoyi.system.domain.SysMenu; +import com.ruoyi.system.mapper.SysMenuMapper; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import com.ruoyi.common.support.Convert; +import com.ruoyi.system.domain.SysNotice; +import com.ruoyi.system.mapper.SysNoticeMapper; +import com.ruoyi.system.service.ISysNoticeService; + +/** + * 公告 服务层实现 + * + * @author ruoyi + * @date 2018-06-25 + */ +@Service +public class SysNoticeServiceImpl extends AbstractBaseServiceImpl implements ISysNoticeService +{ + @Autowired + private SysNoticeMapper noticeMapper; + + /** + * 查询公告信息 + * + * @param noticeId 公告ID + * @return 公告信息 + */ + @Override + public SysNotice selectNoticeById(Long noticeId) + { + return noticeMapper.selectNoticeById(noticeId); + } + + /** + * 查询公告列表 + * + * @param notice 公告信息 + * @return 公告集合 + */ + @Override + public List selectNoticeList(SysNotice notice) + { + startPage(); + return noticeMapper.selectNoticeList(notice); + } + + /** + * 新增公告 + * + * @param notice 公告信息 + * @return 结果 + */ + @Override + public int insertNotice(SysNotice notice) + { + return noticeMapper.insertNotice(notice); + } + + /** + * 修改公告 + * + * @param notice 公告信息 + * @return 结果 + */ + @Override + public int updateNotice(SysNotice notice) + { + return noticeMapper.updateNotice(notice); + } + + /** + * 删除公告对象 + * + * @param ids 需要删除的数据ID + * @return 结果 + */ + @Override + public int deleteNoticeByIds(String ids) + { + return noticeMapper.deleteNoticeByIds(Convert.toStrArray(ids)); + } +} diff --git a/ruoyi-framework/src/main/java/com/ruoyi/system/service/impl/SysOperLogServiceImpl.java b/ruoyi-framework/src/main/java/com/ruoyi/system/service/impl/SysOperLogServiceImpl.java new file mode 100644 index 000000000..101b04a1b --- /dev/null +++ b/ruoyi-framework/src/main/java/com/ruoyi/system/service/impl/SysOperLogServiceImpl.java @@ -0,0 +1,82 @@ +package com.ruoyi.system.service.impl; + +import java.util.List; + +import com.ruoyi.framework.web.base.AbstractBaseServiceImpl; +import com.ruoyi.system.domain.SysNotice; +import com.ruoyi.system.mapper.SysNoticeMapper; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import com.ruoyi.common.support.Convert; +import com.ruoyi.system.domain.SysOperLog; +import com.ruoyi.system.mapper.SysOperLogMapper; +import com.ruoyi.system.service.ISysOperLogService; + +/** + * 操作日志 服务层处理 + * + * @author ruoyi + */ +@Service +public class SysOperLogServiceImpl extends AbstractBaseServiceImpl implements ISysOperLogService +{ + @Autowired + private SysOperLogMapper operLogMapper; + + /** + * 新增操作日志 + * + * @param operLog 操作日志对象 + */ + @Override + public void insertOperlog(SysOperLog operLog) + { + operLogMapper.insertOperlog(operLog); + } + + /** + * 查询系统操作日志集合 + * + * @param operLog 操作日志对象 + * @return 操作日志集合 + */ + @Override + public List selectOperLogList(SysOperLog operLog) + { + startPage(); + return operLogMapper.selectOperLogList(operLog); + } + + /** + * 批量删除系统操作日志 + * + * @param ids 需要删除的数据 + * @return + */ + @Override + public int deleteOperLogByIds(String ids) + { + return operLogMapper.deleteOperLogByIds(Convert.toStrArray(ids)); + } + + /** + * 查询操作日志详细 + * + * @param operId 操作ID + * @return 操作日志对象 + */ + @Override + public SysOperLog selectOperLogById(Long operId) + { + return operLogMapper.selectOperLogById(operId); + } + + /** + * 清空操作日志 + */ + @Override + public void cleanOperLog() + { + operLogMapper.cleanOperLog(); + } +} diff --git a/ruoyi-framework/src/main/java/com/ruoyi/system/service/impl/SysPostServiceImpl.java b/ruoyi-framework/src/main/java/com/ruoyi/system/service/impl/SysPostServiceImpl.java new file mode 100644 index 000000000..a998601bd --- /dev/null +++ b/ruoyi-framework/src/main/java/com/ruoyi/system/service/impl/SysPostServiceImpl.java @@ -0,0 +1,184 @@ +package com.ruoyi.system.service.impl; + +import java.util.List; + +import com.ruoyi.framework.web.base.AbstractBaseServiceImpl; +import com.ruoyi.system.domain.SysOperLog; +import com.ruoyi.system.mapper.SysOperLogMapper; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import com.ruoyi.common.constant.UserConstants; +import com.ruoyi.common.support.Convert; +import com.ruoyi.common.utils.StringUtils; +import com.ruoyi.system.domain.SysPost; +import com.ruoyi.system.mapper.SysPostMapper; +import com.ruoyi.system.mapper.SysUserPostMapper; +import com.ruoyi.system.service.ISysPostService; + +/** + * 岗位信息 服务层处理 + * + * @author ruoyi + */ +@Service +public class SysPostServiceImpl extends AbstractBaseServiceImpl implements ISysPostService +{ + @Autowired + private SysPostMapper postMapper; + + @Autowired + private SysUserPostMapper userPostMapper; + + /** + * 查询岗位信息集合 + * + * @param post 岗位信息 + * @return 岗位信息集合 + */ + @Override + public List selectPostList(SysPost post) + { + return postMapper.selectPostList(post); + } + + /** + * 查询所有岗位 + * + * @return 岗位列表 + */ + @Override + public List selectPostAll() + { + return postMapper.selectPostAll(); + } + + /** + * 根据用户ID查询岗位 + * + * @param userId 用户ID + * @return 岗位列表 + */ + @Override + public List selectPostsByUserId(Long userId) + { + List userPosts = postMapper.selectPostsByUserId(userId); + List posts = postMapper.selectPostAll(); + for (SysPost post : posts) + { + for (SysPost userRole : userPosts) + { + if (post.getPostId().longValue() == userRole.getPostId().longValue()) + { + post.setFlag(true); + break; + } + } + } + return posts; + } + + /** + * 通过岗位ID查询岗位信息 + * + * @param postId 岗位ID + * @return 角色对象信息 + */ + @Override + public SysPost selectPostById(Long postId) + { + return postMapper.selectPostById(postId); + } + + /** + * 批量删除岗位信息 + * + * @param ids 需要删除的数据ID + * @throws Exception + */ + @Override + public int deletePostByIds(String ids) throws Exception + { + Long[] postIds = Convert.toLongArray(ids); + for (Long postId : postIds) + { + SysPost post = selectPostById(postId); + if (countUserPostById(postId) > 0) + { + throw new Exception(String.format("%1$s已分配,不能删除", post.getPostName())); + } + } + return postMapper.deletePostByIds(postIds); + } + + /** + * 新增保存岗位信息 + * + * @param post 岗位信息 + * @return 结果 + */ + @Override + public int insertPost(SysPost post) + { + return postMapper.insertPost(post); + } + + /** + * 修改保存岗位信息 + * + * @param post 岗位信息 + * @return 结果 + */ + @Override + public int updatePost(SysPost post) + { + return postMapper.updatePost(post); + } + + /** + * 通过岗位ID查询岗位使用数量 + * + * @param postId 岗位ID + * @return 结果 + */ + @Override + public int countUserPostById(Long postId) + { + return userPostMapper.countUserPostById(postId); + } + + /** + * 校验岗位名称是否唯一 + * + * @param post 岗位信息 + * @return 结果 + */ + @Override + public String checkPostNameUnique(SysPost post) + { + Long postId = StringUtils.isNull(post.getPostId()) ? -1L : post.getPostId(); + SysPost info = postMapper.checkPostNameUnique(post.getPostName()); + if (StringUtils.isNotNull(info) && info.getPostId().longValue() != postId.longValue()) + { + return UserConstants.POST_NAME_NOT_UNIQUE; + } + return UserConstants.POST_NAME_UNIQUE; + } + + /** + * 校验岗位编码是否唯一 + * + * @param post 岗位信息 + * @return 结果 + */ + @Override + public String checkPostCodeUnique(SysPost post) + { + Long postId = StringUtils.isNull(post.getPostId()) ? -1L : post.getPostId(); + SysPost info = postMapper.checkPostCodeUnique(post.getPostCode()); + if (StringUtils.isNotNull(info) && info.getPostId().longValue() != postId.longValue()) + { + return UserConstants.POST_CODE_NOT_UNIQUE; + } + return UserConstants.POST_CODE_UNIQUE; + } +} diff --git a/ruoyi-framework/src/main/java/com/ruoyi/system/service/impl/SysRoleServiceImpl.java b/ruoyi-framework/src/main/java/com/ruoyi/system/service/impl/SysRoleServiceImpl.java new file mode 100644 index 000000000..646706a43 --- /dev/null +++ b/ruoyi-framework/src/main/java/com/ruoyi/system/service/impl/SysRoleServiceImpl.java @@ -0,0 +1,301 @@ +package com.ruoyi.system.service.impl; + +import java.util.ArrayList; +import java.util.Arrays; +import java.util.HashSet; +import java.util.List; +import java.util.Set; + +import com.ruoyi.framework.web.base.AbstractBaseServiceImpl; +import com.ruoyi.system.domain.SysPost; +import com.ruoyi.system.mapper.*; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import com.ruoyi.common.annotation.DataScope; +import com.ruoyi.common.constant.UserConstants; +import com.ruoyi.common.support.Convert; +import com.ruoyi.common.utils.StringUtils; +import com.ruoyi.system.domain.SysRole; +import com.ruoyi.system.domain.SysRoleDept; +import com.ruoyi.system.domain.SysRoleMenu; +import com.ruoyi.system.service.ISysRoleService; + +/** + * 角色 业务层处理 + * + * @author ruoyi + */ +@Service +public class SysRoleServiceImpl extends AbstractBaseServiceImpl implements ISysRoleService +{ + @Autowired + private SysRoleMapper roleMapper; + + @Autowired + private SysRoleMenuMapper roleMenuMapper; + + @Autowired + private SysUserRoleMapper userRoleMapper; + + @Autowired + private SysRoleDeptMapper roleDeptMapper; + + /** + * 根据条件分页查询角色数据 + * + * @param role 角色信息 + * @return 角色数据集合信息 + */ + @Override + @DataScope(tableAlias = "u") + public List selectRoleList(SysRole role) + { + startPage(); + return roleMapper.selectRoleList(role); + } + + /** + * 根据用户ID查询权限 + * + * @param userId 用户ID + * @return 权限列表 + */ + @Override + public Set selectRoleKeys(Long userId) + { + List perms = roleMapper.selectRolesByUserId(userId); + Set permsSet = new HashSet<>(); + for (SysRole perm : perms) + { + if (StringUtils.isNotNull(perms)) + { + permsSet.addAll(Arrays.asList(perm.getRoleKey().trim().split(","))); + } + } + return permsSet; + } + + /** + * 根据用户ID查询角色 + * + * @param userId 用户ID + * @return 角色列表 + */ + @Override + public List selectRolesByUserId(Long userId) + { + List userRoles = roleMapper.selectRolesByUserId(userId); + List roles = selectRoleAll(); + for (SysRole role : roles) + { + for (SysRole userRole : userRoles) + { + if (role.getRoleId().longValue() == userRole.getRoleId().longValue()) + { + role.setFlag(true); + break; + } + } + } + return roles; + } + + /** + * 查询所有角色 + * + * @return 角色列表 + */ + @Override + public List selectRoleAll() + { + return selectRoleList(new SysRole()); + } + + /** + * 通过角色ID查询角色 + * + * @param roleId 角色ID + * @return 角色对象信息 + */ + @Override + public SysRole selectRoleById(Long roleId) + { + return roleMapper.selectRoleById(roleId); + } + + /** + * 通过角色ID删除角色 + * + * @param roleId 角色ID + * @return 结果 + */ + @Override + public boolean deleteRoleById(Long roleId) + { + return roleMapper.deleteRoleById(roleId) > 0 ? true : false; + } + + /** + * 批量删除角色信息 + * + * @param ids 需要删除的数据ID + * @throws Exception + */ + @Override + public int deleteRoleByIds(String ids) throws Exception + { + Long[] roleIds = Convert.toLongArray(ids); + for (Long roleId : roleIds) + { + SysRole role = selectRoleById(roleId); + if (countUserRoleByRoleId(roleId) > 0) + { + throw new Exception(String.format("%1$s已分配,不能删除", role.getRoleName())); + } + } + return roleMapper.deleteRoleByIds(roleIds); + } + + /** + * 新增保存角色信息 + * + * @param role 角色信息 + * @return 结果 + */ + @Override + public int insertRole(SysRole role) + { + // 新增角色信息 + roleMapper.insertRole(role); + return insertRoleMenu(role); + } + + /** + * 修改保存角色信息 + * + * @param role 角色信息 + * @return 结果 + */ + @Override + public int updateRole(SysRole role) + { + // 修改角色信息 + roleMapper.updateRole(role); + // 删除角色与菜单关联 + roleMenuMapper.deleteRoleMenuByRoleId(role.getRoleId()); + return insertRoleMenu(role); + } + + /** + * 修改数据权限信息 + * + * @param role 角色信息 + * @return 结果 + */ + @Override + public int updateRule(SysRole role) + { + // 修改角色信息 + roleMapper.updateRole(role); + // 删除角色与部门关联 + roleDeptMapper.deleteRoleDeptByRoleId(role.getRoleId()); + // 新增角色和部门信息（数据权限） + return insertRoleDept(role); + } + + /** + * 新增角色菜单信息 + * + * @param role 角色对象 + */ + public int insertRoleMenu(SysRole role) + { + int rows = 1; + // 新增用户与角色管理 + List list = new ArrayList(); + for (Long menuId : role.getMenuIds()) + { + SysRoleMenu rm = new SysRoleMenu(); + rm.setRoleId(role.getRoleId()); + rm.setMenuId(menuId); + list.add(rm); + } + if (list.size() > 0) + { + rows = roleMenuMapper.batchRoleMenu(list); + } + return rows; + } + + /** + * 新增角色部门信息(数据权限) + * + * @param role 角色对象 + */ + public int insertRoleDept(SysRole role) + { + int rows = 1; + // 新增角色与部门（数据权限）管理 + List list = new ArrayList(); + for (Long deptId : role.getDeptIds()) + { + SysRoleDept rd = new SysRoleDept(); + rd.setRoleId(role.getRoleId()); + rd.setDeptId(deptId); + list.add(rd); + } + if (list.size() > 0) + { + rows = roleDeptMapper.batchRoleDept(list); + } + return rows; + } + + /** + * 校验角色名称是否唯一 + * + * @param role 角色信息 + * @return 结果 + */ + @Override + public String checkRoleNameUnique(SysRole role) + { + Long roleId = StringUtils.isNull(role.getRoleId()) ? -1L : role.getRoleId(); + SysRole info = roleMapper.checkRoleNameUnique(role.getRoleName()); + if (StringUtils.isNotNull(info) && info.getRoleId().longValue() != roleId.longValue()) + { + return UserConstants.ROLE_NAME_NOT_UNIQUE; + } + return UserConstants.ROLE_NAME_UNIQUE; + } + + /** + * 校验角色权限是否唯一 + * + * @param role 角色信息 + * @return 结果 + */ + @Override + public String checkRoleKeyUnique(SysRole role) + { + Long roleId = StringUtils.isNull(role.getRoleId()) ? -1L : role.getRoleId(); + SysRole info = roleMapper.checkRoleKeyUnique(role.getRoleKey()); + if (StringUtils.isNotNull(info) && info.getRoleId().longValue() != roleId.longValue()) + { + return UserConstants.ROLE_KEY_NOT_UNIQUE; + } + return UserConstants.ROLE_KEY_UNIQUE; + } + + /** + * 通过角色ID查询角色使用数量 + * + * @param roleId 角色ID + * @return 结果 + */ + @Override + public int countUserRoleByRoleId(Long roleId) + { + return userRoleMapper.countUserRoleByRoleId(roleId); + } +} diff --git a/ruoyi-framework/src/main/java/com/ruoyi/system/service/impl/SysUserOnlineServiceImpl.java b/ruoyi-framework/src/main/java/com/ruoyi/system/service/impl/SysUserOnlineServiceImpl.java new file mode 100644 index 000000000..e5c4f347d --- /dev/null +++ b/ruoyi-framework/src/main/java/com/ruoyi/system/service/impl/SysUserOnlineServiceImpl.java @@ -0,0 +1,120 @@ +package com.ruoyi.system.service.impl; + +import java.util.Date; +import java.util.List; + +import com.ruoyi.framework.web.base.AbstractBaseServiceImpl; +import com.ruoyi.system.domain.SysRole; +import com.ruoyi.system.mapper.SysRoleMapper; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import com.ruoyi.common.utils.DateUtils; +import com.ruoyi.common.utils.StringUtils; +import com.ruoyi.system.domain.SysUserOnline; +import com.ruoyi.system.mapper.SysUserOnlineMapper; +import com.ruoyi.system.service.ISysUserOnlineService; + +/** + * 在线用户 服务层处理 + * + * @author ruoyi + */ +@Service +public class SysUserOnlineServiceImpl extends AbstractBaseServiceImpl implements ISysUserOnlineService +{ + @Autowired + private SysUserOnlineMapper userOnlineDao; + + /** + * 通过会话序号查询信息 + * + * @param sessionId 会话ID + * @return 在线用户信息 + */ + @Override + public SysUserOnline selectOnlineById(String sessionId) + { + return userOnlineDao.selectOnlineById(sessionId); + } + + /** + * 通过会话序号删除信息 + * + * @param sessionId 会话ID + * @return 在线用户信息 + */ + @Override + public void deleteOnlineById(String sessionId) + { + SysUserOnline userOnline = selectOnlineById(sessionId); + if (StringUtils.isNotNull(userOnline)) + { + userOnlineDao.deleteOnlineById(sessionId); + } + } + + /** + * 通过会话序号删除信息 + * + * @param sessions 会话ID集合 + * @return 在线用户信息 + */ + @Override + public void batchDeleteOnline(List sessions) + { + for (String sessionId : sessions) + { + SysUserOnline userOnline = selectOnlineById(sessionId); + if (StringUtils.isNotNull(userOnline)) + { + userOnlineDao.deleteOnlineById(sessionId); + } + } + } + + /** + * 保存会话信息 + * + * @param online 会话信息 + */ + @Override + public void saveOnline(SysUserOnline online) + { + userOnlineDao.saveOnline(online); + } + + /** + * 查询会话集合 + * + * @param userOnline 在线用户 + */ + @Override + public List selectUserOnlineList(SysUserOnline userOnline) + { + startPage(); + return userOnlineDao.selectUserOnlineList(userOnline); + } + + /** + * 强退用户 + * + * @param sessionId 会话ID + */ + @Override + public void forceLogout(String sessionId) + { + userOnlineDao.deleteOnlineById(sessionId); + } + + /** + * 查询会话集合 + * + * @param expiredDate 失效日期 + */ + @Override + public List selectOnlineByExpired(Date expiredDate) + { + String lastAccessTime = DateUtils.parseDateToStr(DateUtils.YYYY_MM_DD_HH_MM_SS, expiredDate); + return userOnlineDao.selectOnlineByExpired(lastAccessTime); + } +} diff --git a/ruoyi-framework/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java b/ruoyi-framework/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java new file mode 100644 index 000000000..30aa7dcb6 --- /dev/null +++ b/ruoyi-framework/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java @@ -0,0 +1,342 @@ +package com.ruoyi.system.service.impl; + +import java.util.ArrayList; +import java.util.List; + +import com.ruoyi.framework.web.base.AbstractBaseServiceImpl; +import com.ruoyi.system.domain.*; +import com.ruoyi.system.mapper.*; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import com.ruoyi.common.annotation.DataScope; +import com.ruoyi.common.constant.UserConstants; +import com.ruoyi.common.support.Convert; +import com.ruoyi.common.utils.StringUtils; +import com.ruoyi.system.service.ISysUserService; + +/** + * 用户 业务层处理 + * + * @author ruoyi + */ +@Service +public class SysUserServiceImpl extends AbstractBaseServiceImpl implements ISysUserService +{ + @Autowired + private SysUserMapper userMapper; + + @Autowired + private SysRoleMapper roleMapper; + + @Autowired + private SysPostMapper postMapper; + + @Autowired + private SysUserPostMapper userPostMapper; + + @Autowired + private SysUserRoleMapper userRoleMapper; + + /** + * 根据条件分页查询用户对象 + * + * @param user 用户信息 + * + * @return 用户信息集合信息 + */ + @Override + @DataScope(tableAlias = "u") + public List selectUserList(SysUser user) + { + startPage(); + return userMapper.selectUserList(user); + } + + /** + * 通过用户名查询用户 + * + * @param userName 用户名 + * @return 用户对象信息 + */ + @Override + public SysUser selectUserByLoginName(String userName) + { + return userMapper.selectUserByLoginName(userName); + } + + /** + * 通过手机号码查询用户 + * + * @param phoneNumber 手机号码 + * @return 用户对象信息 + */ + @Override + public SysUser selectUserByPhoneNumber(String phoneNumber) + { + return userMapper.selectUserByPhoneNumber(phoneNumber); + } + + /** + * 通过邮箱查询用户 + * + * @param email 邮箱 + * @return 用户对象信息 + */ + @Override + public SysUser selectUserByEmail(String email) + { + return userMapper.selectUserByEmail(email); + } + + /** + * 通过用户ID查询用户 + * + * @param userId 用户ID + * @return 用户对象信息 + */ + @Override + public SysUser selectUserById(Long userId) + { + return userMapper.selectUserById(userId); + } + + /** + * 通过用户ID删除用户 + * + * @param userId 用户ID + * @return 结果 + */ + @Override + public int deleteUserById(Long userId) + { + // 删除用户与角色关联 + userRoleMapper.deleteUserRoleByUserId(userId); + // 删除用户与岗位表 + userPostMapper.deleteUserPostByUserId(userId); + return userMapper.deleteUserById(userId); + } + + /** + * 批量删除用户信息 + * + * @param ids 需要删除的数据ID + * @return 结果 + */ + @Override + public int deleteUserByIds(String ids) throws Exception + { + Long[] userIds = Convert.toLongArray(ids); + for (Long userId : userIds) + { + if (SysUser.isAdmin(userId)) + { + throw new Exception("不允许删除超级管理员用户"); + } + } + return userMapper.deleteUserByIds(userIds); + } + + /** + * 新增保存用户信息 + * + * @param user 用户信息 + * @return 结果 + */ + @Override + public int insertUser(SysUser user) + { + // 新增用户信息 + int rows = userMapper.insertUser(user); + // 新增用户岗位关联 + insertUserPost(user); + // 新增用户与角色管理 + insertUserRole(user); + return rows; + } + + /** + * 修改保存用户信息 + * + * @param user 用户信息 + * @return 结果 + */ + @Override + public int updateUser(SysUser user) + { + Long userId = user.getUserId(); + // 删除用户与角色关联 + userRoleMapper.deleteUserRoleByUserId(userId); + // 新增用户与角色管理 + insertUserRole(user); + // 删除用户与岗位关联 + userPostMapper.deleteUserPostByUserId(userId); + // 新增用户与岗位管理 + insertUserPost(user); + return userMapper.updateUser(user); + } + + /** + * 修改用户个人详细信息 + * + * @param user 用户信息 + * @return 结果 + */ + @Override + public int updateUserInfo(SysUser user) + { + return userMapper.updateUser(user); + } + + /** + * 修改用户密码 + * + * @param user 用户信息 + * @return 结果 + */ + @Override + public int resetUserPwd(SysUser user) + { + return updateUserInfo(user); + } + + /** + * 新增用户角色信息 + * + * @param user 用户对象 + */ + public void insertUserRole(SysUser user) + { + // 新增用户与角色管理 + List list = new ArrayList(); + for (Long roleId : user.getRoleIds()) + { + SysUserRole ur = new SysUserRole(); + ur.setUserId(user.getUserId()); + ur.setRoleId(roleId); + list.add(ur); + } + if (list.size() > 0) + { + userRoleMapper.batchUserRole(list); + } + } + + /** + * 新增用户岗位信息 + * + * @param user 用户对象 + */ + public void insertUserPost(SysUser user) + { + // 新增用户与岗位管理 + List list = new ArrayList(); + for (Long postId : user.getPostIds()) + { + SysUserPost up = new SysUserPost(); + up.setUserId(user.getUserId()); + up.setPostId(postId); + list.add(up); + } + if (list.size() > 0) + { + userPostMapper.batchUserPost(list); + } + } + + /** + * 校验用户名称是否唯一 + * + * @param loginName 用户名 + * @return + */ + @Override + public String checkLoginNameUnique(String loginName) + { + int count = userMapper.checkLoginNameUnique(loginName); + if (count > 0) + { + return UserConstants.USER_NAME_NOT_UNIQUE; + } + return UserConstants.USER_NAME_UNIQUE; + } + + /** + * 校验用户名称是否唯一 + * + * @param user 用户信息 + * @return + */ + @Override + public String checkPhoneUnique(SysUser user) + { + Long userId = StringUtils.isNull(user.getUserId()) ? -1L : user.getUserId(); + SysUser info = userMapper.checkPhoneUnique(user.getPhonenumber()); + if (StringUtils.isNotNull(info) && info.getUserId().longValue() != userId.longValue()) + { + return UserConstants.USER_PHONE_NOT_UNIQUE; + } + return UserConstants.USER_PHONE_UNIQUE; + } + + /** + * 校验email是否唯一 + * + * @param user 用户信息 + * @return + */ + @Override + public String checkEmailUnique(SysUser user) + { + Long userId = StringUtils.isNull(user.getUserId()) ? -1L : user.getUserId(); + SysUser info = userMapper.checkEmailUnique(user.getEmail()); + if (StringUtils.isNotNull(info) && info.getUserId().longValue() != userId.longValue()) + { + return UserConstants.USER_EMAIL_NOT_UNIQUE; + } + return UserConstants.USER_EMAIL_UNIQUE; + } + + /** + * 查询用户所属角色组 + * + * @param userId 用户ID + * @return 结果 + */ + @Override + public String selectUserRoleGroup(Long userId) + { + List list = roleMapper.selectRolesByUserId(userId); + StringBuffer idsStr = new StringBuffer(); + for (SysRole role : list) + { + idsStr.append(role.getRoleName()).append(","); + } + if (StringUtils.isNotEmpty(idsStr.toString())) + { + return idsStr.substring(0, idsStr.length() - 1); + } + return idsStr.toString(); + } + + /** + * 查询用户所属岗位组 + * + * @param userId 用户ID + * @return 结果 + */ + @Override + public String selectUserPostGroup(Long userId) + { + List list = postMapper.selectPostsByUserId(userId); + StringBuffer idsStr = new StringBuffer(); + for (SysPost post : list) + { + idsStr.append(post.getPostName()).append(","); + } + if (StringUtils.isNotEmpty(idsStr.toString())) + { + return idsStr.substring(0, idsStr.length() - 1); + } + return idsStr.toString(); + } +} diff --git a/ruoyi-framework/src/main/resources/mapper/mybatis-config.xml b/ruoyi-framework/src/main/resources/mapper/mybatis-config.xml new file mode 100644 index 000000000..e8b52be8c --- /dev/null +++ b/ruoyi-framework/src/main/resources/mapper/mybatis-config.xml @@ -0,0 +1,15 @@ + + + + + + + + + + + + + diff --git a/ruoyi-framework/src/main/resources/mapper/system/SysConfigMapper.xml b/ruoyi-framework/src/main/resources/mapper/system/SysConfigMapper.xml new file mode 100644 index 000000000..cdb5d8635 --- /dev/null +++ b/ruoyi-framework/src/main/resources/mapper/system/SysConfigMapper.xml @@ -0,0 +1,108 @@ + + + + + + + + + + + + + + + + + + select config_id, config_name, config_key, config_value, config_type, create_by, create_time, update_by, update_time, remark + from sys_config + + + + + + + and config_id = #{configId} + + + and config_key = #{configKey} + + + + + + + + + + + + insert into sys_config ( + config_name, + config_key, + config_value, + config_type, + create_by, + remark, + create_time + )values( + #{configName}, + #{configKey}, + #{configValue}, + #{configType}, + #{createBy}, + #{remark}, + sysdate() + ) + + + + update sys_config + + config_name = #{configName}, + config_key = #{configKey}, + config_value = #{configValue}, + config_type = #{configType}, + update_by = #{updateBy}, + remark = #{remark}, + update_time = sysdate() + + where config_id = #{configId} + + + + delete from sys_config where config_id in + + #{configId} + + + + \ No newline at end of file diff --git a/ruoyi-framework/src/main/resources/mapper/system/SysDeptMapper.xml b/ruoyi-framework/src/main/resources/mapper/system/SysDeptMapper.xml new file mode 100644 index 000000000..51a0e18c7 --- /dev/null +++ b/ruoyi-framework/src/main/resources/mapper/system/SysDeptMapper.xml @@ -0,0 +1,139 @@ + + + + + + + + + + + + + + + + + + + + + + + + select d.dept_id, d.parent_id, d.ancestors, d.dept_name, d.order_num, d.leader, d.phone, d.email, d.status, d.del_flag, d.create_by, d.create_time + from sys_dept d + + + + + + + + + + + + + + + + insert into sys_dept( + dept_id, + parent_id, + dept_name, + ancestors, + order_num, + leader, + phone, + email, + status, + create_by, + create_time + )values( + #{deptId}, + #{parentId}, + #{deptName}, + #{ancestors}, + #{orderNum}, + #{leader}, + #{phone}, + #{email}, + #{status}, + #{createBy}, + sysdate() + ) + + + + update sys_dept + + parent_id = #{parentId}, + dept_name = #{deptName}, + ancestors = #{ancestors}, + order_num = #{orderNum}, + leader = #{leader}, + phone = #{phone}, + email = #{email}, + status = #{status}, + update_by = #{updateBy}, + update_time = sysdate() + + where dept_id = #{deptId} + + + + update sys_dept set ancestors = + + when #{item.deptId} then #{item.ancestors} + + where dept_id in + + #{item.deptId} + + + + + update sys_dept set del_flag = '2' where dept_id = #{deptId} + + + \ No newline at end of file diff --git a/ruoyi-framework/src/main/resources/mapper/system/SysDictDataMapper.xml b/ruoyi-framework/src/main/resources/mapper/system/SysDictDataMapper.xml new file mode 100644 index 000000000..c960df0d6 --- /dev/null +++ b/ruoyi-framework/src/main/resources/mapper/system/SysDictDataMapper.xml @@ -0,0 +1,123 @@ + + + + + + + + + + + + + + + + + + + + + + select dict_code, dict_sort, dict_label, dict_value, dict_type, css_class, list_class, is_default, status, create_by, create_time, remark + from sys_dict_data + + + + + + + + + + + + + + delete from sys_dict_data where dict_code = #{dictCode} + + + + delete from sys_dict_data where dict_code in + + #{dictCode} + + + + + update sys_dict_data + + dict_sort = #{dictSort}, + dict_label = #{dictLabel}, + dict_value = #{dictValue}, + dict_type = #{dictType}, + css_class = #{cssClass}, + list_class = #{listClass}, + is_default = #{isDefault}, + status = #{status}, + remark = #{remark}, + update_by = #{updateBy}, + update_time = sysdate() + + where dict_code = #{dictCode} + + + + update sys_dict_data set dict_type = #{newDictType} where dict_type = #{oldDictType} + + + + insert into sys_dict_data( + dict_sort, + dict_label, + dict_value, + dict_type, + css_class, + list_class, + is_default, + status, + remark, + create_by, + create_time + )values( + #{dictSort}, + #{dictLabel}, + #{dictValue}, + #{dictType}, + #{cssClass}, + #{listClass}, + #{isDefault}, + #{status}, + #{remark}, + #{createBy}, + sysdate() + ) + + + \ No newline at end of file diff --git a/ruoyi-framework/src/main/resources/mapper/system/SysDictTypeMapper.xml b/ruoyi-framework/src/main/resources/mapper/system/SysDictTypeMapper.xml new file mode 100644 index 000000000..e13d21827 --- /dev/null +++ b/ruoyi-framework/src/main/resources/mapper/system/SysDictTypeMapper.xml @@ -0,0 +1,100 @@ + + + + + + + + + + + + + + + + + select dict_id, dict_name, dict_type, status, create_by, create_time, remark + from sys_dict_type + + + + + + + + + + + + delete from sys_dict_type where dict_id = #{dictId} + + + + delete from sys_dict_type where dict_id in + + #{dictId} + + + + + update sys_dict_type + + dict_name = #{dictName}, + dict_type = #{dictType}, + status = #{status}, + remark = #{remark}, + update_by = #{updateBy}, + update_time = sysdate() + + where dict_id = #{dictId} + + + + insert into sys_dict_type( + dict_name, + dict_type, + status, + remark, + create_by, + create_time + )values( + #{dictName}, + #{dictType}, + #{status}, + #{remark}, + #{createBy}, + sysdate() + ) + + + \ No newline at end of file diff --git a/ruoyi-framework/src/main/resources/mapper/system/SysLogininforMapper.xml b/ruoyi-framework/src/main/resources/mapper/system/SysLogininforMapper.xml new file mode 100644 index 000000000..cd42fff48 --- /dev/null +++ b/ruoyi-framework/src/main/resources/mapper/system/SysLogininforMapper.xml @@ -0,0 +1,56 @@ + + + + + + + + + + + + + + + + + + insert into sys_logininfor (login_name, status, ipaddr, login_location, browser, os, msg, login_time) + values (#{loginName}, #{status}, #{ipaddr}, #{loginLocation}, #{browser}, #{os}, #{msg}, sysdate()) + + + + + + delete from sys_logininfor where info_id in + + #{infoId} + + + + + truncate table sys_logininfor + + + \ No newline at end of file diff --git a/ruoyi-framework/src/main/resources/mapper/system/SysMenuMapper.xml b/ruoyi-framework/src/main/resources/mapper/system/SysMenuMapper.xml new file mode 100644 index 000000000..ebdc0b63f --- /dev/null +++ b/ruoyi-framework/src/main/resources/mapper/system/SysMenuMapper.xml @@ -0,0 +1,147 @@ + + + + + + + + + + + + + + + + + + + + + + + + select menu_id, menu_name, parent_id, order_num, url, menu_type, visible, perms, icon, create_by, create_time + from sys_menu + + + + + + + + + + + + + + + + delete from sys_menu where menu_id = #{menuId} or parent_id = #{menuId} + + + + + + + + + + update sys_menu + + menu_name = #{menuName}, + parent_id = #{parentId}, + order_num = #{orderNum}, + url = #{url}, + menu_type = #{menuType}, + visible = #{visible}, + perms = #{perms}, + icon = #{icon}, + remark = #{remark}, + update_by = #{updateBy}, + update_time = sysdate() + + where menu_id = #{menuId} + + + + insert into sys_menu( + menu_id, + parent_id, + menu_name, + order_num, + url, + menu_type, + visible, + perms, + icon, + remark, + create_by, + create_time + )values( + #{menuId}, + #{parentId}, + #{menuName}, + #{orderNum}, + #{url}, + #{menuType}, + #{visible}, + #{perms}, + #{icon}, + #{remark}, + #{createBy}, + sysdate() + ) + + + \ No newline at end of file diff --git a/ruoyi-framework/src/main/resources/mapper/system/SysNoticeMapper.xml b/ruoyi-framework/src/main/resources/mapper/system/SysNoticeMapper.xml new file mode 100644 index 000000000..40dccb236 --- /dev/null +++ b/ruoyi-framework/src/main/resources/mapper/system/SysNoticeMapper.xml @@ -0,0 +1,85 @@ + + + + + + + + + + + + + + + + + + + select notice_id, notice_title, notice_type, notice_content, status, create_by, create_time, update_by, update_time, remark + from sys_notice + + + + + + + + insert into sys_notice ( + notice_title, + notice_type, + notice_content, + status, + remark, + create_by, + create_time + )values( + #{noticeTitle}, + #{noticeType}, + #{noticeContent}, + #{status}, + #{remark}, + #{createBy}, + sysdate() + ) + + + + update sys_notice + + notice_title = #{noticeTitle}, + notice_type = #{noticeType}, + notice_content = #{noticeContent}, + status = #{status}, + update_by = #{updateBy}, + update_time = sysdate() + + where notice_id = #{noticeId} + + + + delete from sys_notice where notice_id in + + #{noticeId} + + + + \ No newline at end of file diff --git a/ruoyi-framework/src/main/resources/mapper/system/SysOperLogMapper.xml b/ruoyi-framework/src/main/resources/mapper/system/SysOperLogMapper.xml new file mode 100644 index 000000000..1ded2c32d --- /dev/null +++ b/ruoyi-framework/src/main/resources/mapper/system/SysOperLogMapper.xml @@ -0,0 +1,71 @@ + + + + + + + + + + + + + + + + + + + + + + + select oper_id, title, business_type, method, operator_type, oper_name, dept_name, oper_url, oper_ip, oper_location, oper_param, status, error_msg, oper_time + from sys_oper_log + + + + insert into sys_oper_log(title, business_type, method, operator_type, oper_name, dept_name, oper_url, oper_ip, oper_location, oper_param, status, error_msg, oper_time) + values (#{title}, #{businessType}, #{method}, #{operatorType}, #{operName}, #{deptName}, #{operUrl}, #{operIp}, #{operLocation}, #{operParam}, #{status}, #{errorMsg}, sysdate()) + + + + + + delete from sys_oper_log where oper_id in + + #{operId} + + + + + + + truncate table sys_oper_log + + + \ No newline at end of file diff --git a/ruoyi-framework/src/main/resources/mapper/system/SysPostMapper.xml b/ruoyi-framework/src/main/resources/mapper/system/SysPostMapper.xml new file mode 100644 index 000000000..338ea9754 --- /dev/null +++ b/ruoyi-framework/src/main/resources/mapper/system/SysPostMapper.xml @@ -0,0 +1,110 @@ + + + + + + + + + + + + + + + + + + + select post_id, post_code, post_name, post_sort, status, create_by, create_time, remark + from sys_post + + + + + + + + + + + + + + + + delete from sys_post where post_id in + + #{postId} + + + + + update sys_post + + post_code = #{postCode}, + post_name = #{postName}, + post_sort = #{postSort}, + status = #{status}, + remark = #{remark}, + update_by = #{updateBy}, + update_time = sysdate() + + where post_id = #{postId} + + + + insert into sys_post( + post_id, + post_code, + post_name, + post_sort, + status, + remark, + create_by, + create_time + )values( + #{postId}, + #{postCode}, + #{postName}, + #{postSort}, + #{status}, + #{remark}, + #{createBy}, + sysdate() + ) + + + \ No newline at end of file diff --git a/ruoyi-framework/src/main/resources/mapper/system/SysRoleDeptMapper.xml b/ruoyi-framework/src/main/resources/mapper/system/SysRoleDeptMapper.xml new file mode 100644 index 000000000..182bc243f --- /dev/null +++ b/ruoyi-framework/src/main/resources/mapper/system/SysRoleDeptMapper.xml @@ -0,0 +1,34 @@ + + + + + + + + + + + delete from sys_role_dept where role_id=#{roleId} + + + + + + delete from sys_role_dept where role_id in + + #{roleId} + + + + + insert into sys_role_dept(role_id, dept_id) values + + (#{item.roleId},#{item.deptId}) + + + + \ No newline at end of file diff --git a/ruoyi-framework/src/main/resources/mapper/system/SysRoleMapper.xml b/ruoyi-framework/src/main/resources/mapper/system/SysRoleMapper.xml new file mode 100644 index 000000000..8503e5e17 --- /dev/null +++ b/ruoyi-framework/src/main/resources/mapper/system/SysRoleMapper.xml @@ -0,0 +1,131 @@ + + + + + + + + + + + + + + + + + + + + + select distinct r.role_id, r.role_name, r.role_key, r.role_sort, r.data_scope, + r.status, r.del_flag, r.create_time, r.remark + from sys_role r + left join sys_user_role ur on ur.role_id = r.role_id + left join sys_user u on u.user_id = ur.user_id + left join sys_dept d on u.dept_id = d.dept_id + + + + select r.role_id, r.role_name, r.role_key, r.role_sort, r.data_scope, r.status, r.del_flag, r.create_time, r.remark + from sys_role r + + + + + + + + + + + + + + delete from sys_role where role_id = #{roleId} + + + + update sys_role set del_flag = '2' where role_id in + + #{roleId} + + + + + update sys_role + + role_name = #{roleName}, + role_key = #{roleKey}, + role_sort = #{roleSort}, + data_scope = #{dataScope}, + status = #{status}, + remark = #{remark}, + update_by = #{updateBy}, + update_time = sysdate() + + where role_id = #{roleId} + + + + insert into sys_role( + role_id, + role_name, + role_key, + role_sort, + data_scope, + status, + remark, + create_by, + create_time + )values( + #{roleId}, + #{roleName}, + #{roleKey}, + #{roleSort}, + #{dataScope}, + #{status}, + #{remark}, + #{createBy}, + sysdate() + ) + + + \ No newline at end of file diff --git a/ruoyi-framework/src/main/resources/mapper/system/SysRoleMenuMapper.xml b/ruoyi-framework/src/main/resources/mapper/system/SysRoleMenuMapper.xml new file mode 100644 index 000000000..d213bdde0 --- /dev/null +++ b/ruoyi-framework/src/main/resources/mapper/system/SysRoleMenuMapper.xml @@ -0,0 +1,34 @@ + + + + + + + + + + + delete from sys_role_menu where role_id=#{roleId} + + + + + + delete from sys_role_menu where role_id in + + #{roleId} + + + + + insert into sys_role_menu(role_id, menu_id) values + + (#{item.roleId},#{item.menuId}) + + + + \ No newline at end of file diff --git a/ruoyi-framework/src/main/resources/mapper/system/SysUserMapper.xml b/ruoyi-framework/src/main/resources/mapper/system/SysUserMapper.xml new file mode 100644 index 000000000..5e2d9bdb2 --- /dev/null +++ b/ruoyi-framework/src/main/resources/mapper/system/SysUserMapper.xml @@ -0,0 +1,181 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + select u.user_id, u.dept_id, u.login_name, u.user_name, u.email, u.phonenumber, u.sex, u.avatar, u.password, u.salt, u.status, u.del_flag, u.login_ip, u.login_date, u.create_time, u.remark, + d.dept_id, d.parent_id, d.dept_name, d.order_num, d.status as dept_status, + r.role_id, r.role_name, r.role_key, r.role_sort, r.data_scope, r.status as role_status + from sys_user u + left join sys_dept d on u.dept_id = d.dept_id + left join sys_user_role ur on u.user_id = ur.user_id + left join sys_role r on r.role_id = ur.role_id + + + + + + + + + + + + + + + + + + + + delete from sys_user where user_id = #{userId} + + + + update sys_user set del_flag = '2' where user_id in + + #{userId} + + + + + update sys_user + + dept_id = #{deptId}, + login_name = #{loginName}, + user_name = #{userName}, + email = #{email}, + phonenumber = #{phonenumber}, + sex = #{sex}, + avatar = #{avatar}, + password = #{password}, + salt = #{salt}, + status = #{status}, + login_ip = #{loginIp}, + login_date = #{loginDate}, + update_by = #{updateBy}, + remark = #{remark}, + update_time = sysdate() + + where user_id = #{userId} + + + + insert into sys_user( + user_id, + dept_id, + login_name, + user_name, + email, + phonenumber, + sex, + password, + salt, + status, + create_by, + remark, + create_time + )values( + #{userId}, + #{deptId}, + #{loginName}, + #{userName}, + #{email}, + #{phonenumber}, + #{sex}, + #{password}, + #{salt}, + #{status}, + #{createBy}, + #{remark}, + sysdate() + ) + + + \ No newline at end of file diff --git a/ruoyi-framework/src/main/resources/mapper/system/SysUserOnlineMapper.xml b/ruoyi-framework/src/main/resources/mapper/system/SysUserOnlineMapper.xml new file mode 100644 index 000000000..a4343364c --- /dev/null +++ b/ruoyi-framework/src/main/resources/mapper/system/SysUserOnlineMapper.xml @@ -0,0 +1,57 @@ + + + + + + + + + + + + + + + + + + + + select sessionId, login_name, dept_name, ipaddr, login_location, browser, os, status, status, start_timestamp, last_access_time, expire_time + from sys_user_online + + + + + + replace into sys_user_online(sessionId, login_name, dept_name, ipaddr, login_location, browser, os, status, start_timestamp, last_access_time, expire_time) + values (#{sessionId}, #{loginName}, #{deptName}, #{ipaddr}, #{loginLocation}, #{browser}, #{os}, #{status}, #{startTimestamp}, #{lastAccessTime}, #{expireTime}) + + + + delete from sys_user_online where sessionId = #{sessionId} + + + + + + + \ No newline at end of file diff --git a/ruoyi-framework/src/main/resources/mapper/system/SysUserPostMapper.xml b/ruoyi-framework/src/main/resources/mapper/system/SysUserPostMapper.xml new file mode 100644 index 000000000..2b90bc40b --- /dev/null +++ b/ruoyi-framework/src/main/resources/mapper/system/SysUserPostMapper.xml @@ -0,0 +1,34 @@ + + + + + + + + + + + delete from sys_user_post where user_id=#{userId} + + + + + + delete from sys_user_post where user_id in + + #{userId} + + + + + insert into sys_user_post(user_id, post_id) values + + (#{item.userId},#{item.postId}) + + + + \ No newline at end of file diff --git a/ruoyi-framework/src/main/resources/mapper/system/SysUserRoleMapper.xml b/ruoyi-framework/src/main/resources/mapper/system/SysUserRoleMapper.xml new file mode 100644 index 000000000..c1d4a3fda --- /dev/null +++ b/ruoyi-framework/src/main/resources/mapper/system/SysUserRoleMapper.xml @@ -0,0 +1,34 @@ + + + + + + + + + + + delete from sys_user_role where user_id=#{userId} + + + + + + delete from sys_user_role where user_id in + + #{userId} + + + + + insert into sys_user_role(user_id, role_id) values + + (#{item.userId},#{item.roleId}) + + + + \ No newline at end of file diff --git a/ruoyi-generator/src/main/java/com/ruoyi/agile/controller/GenTableColumnController.java b/ruoyi-generator/src/main/java/com/ruoyi/agile/controller/GenTableColumnController.java index 43a4769f0..f55a5e01d 100644 --- a/ruoyi-generator/src/main/java/com/ruoyi/agile/controller/GenTableColumnController.java +++ b/ruoyi-generator/src/main/java/com/ruoyi/agile/controller/GenTableColumnController.java @@ -49,7 +49,6 @@ public class GenTableColumnController extends BaseController @ResponseBody public TableDataInfo list(GenTableColumn genTableColumn) { - startPage(); List list = genTableColumnService.selectGenTableColumnList(genTableColumn); return getDataTable(list); } diff --git a/ruoyi-generator/src/main/java/com/ruoyi/agile/controller/GenTableController.java b/ruoyi-generator/src/main/java/com/ruoyi/agile/controller/GenTableController.java index d985afd2f..b653fd6ae 100644 --- a/ruoyi-generator/src/main/java/com/ruoyi/agile/controller/GenTableController.java +++ b/ruoyi-generator/src/main/java/com/ruoyi/agile/controller/GenTableController.java @@ -1,15 +1,12 @@ package com.ruoyi.agile.controller; import java.util.List; + import org.apache.shiro.authz.annotation.RequiresPermissions; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; import org.springframework.ui.ModelMap; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PathVariable; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.ResponseBody; +import org.springframework.web.bind.annotation.*; import com.ruoyi.common.annotation.Log; import com.ruoyi.common.enums.BusinessType; import com.ruoyi.agile.domain.GenTable; @@ -21,107 +18,99 @@ import com.ruoyi.common.utils.ExcelUtil; /** * 代码生成 信息操作处理 - * + * * @author zhujj * @date 2018-11-29 */ -@Controller +@RestController @RequestMapping("/agile/genTable") -public class GenTableController extends BaseController -{ +public class GenTableController extends BaseController { private String prefix = "agile/genTable"; - - @Autowired - private IGenTableService genTableService; - - @RequiresPermissions("agile:genTable:view") - @GetMapping() - public String genTable() - { - return prefix + "/genTable"; - } - - /** - * 查询代码生成列表 - */ - @RequiresPermissions("agile:genTable:list") - @PostMapping("/list") - @ResponseBody - public TableDataInfo list(GenTable genTable) - { - startPage(); + + @Autowired + private IGenTableService genTableService; + + @RequiresPermissions("agile:genTable:view") + @GetMapping() + public String genTable() { + return prefix + "/genTable"; + } + + /** + * 查询代码生成列表 + */ + @RequiresPermissions("agile:genTable:list") + @PostMapping("/list") + @ResponseBody + public TableDataInfo list(GenTable genTable) { List list = genTableService.selectGenTableList(genTable); - return getDataTable(list); - } - - - /** - * 导出代码生成列表 - */ - @RequiresPermissions("agile:genTable:export") + return getDataTable(list); + } + + + /** + * 导出代码生成列表 + */ + @RequiresPermissions("agile:genTable:export") @PostMapping("/export") @ResponseBody - public AjaxResult export(GenTable genTable) - { - List list = genTableService.selectGenTableList(genTable); + public AjaxResult export(GenTable genTable) { + List list = genTableService.selectGenTableList(genTable); ExcelUtil util = new ExcelUtil(GenTable.class); return util.exportExcel(list, "genTable"); } - - /** - * 新增代码生成 - */ - @GetMapping("/add") - public String add() - { - return prefix + "/add"; - } - - /** - * 新增保存代码生成 - */ - @RequiresPermissions("agile:genTable:add") - @Log(title = "代码生成", businessType = BusinessType.INSERT) - @PostMapping("/add") - @ResponseBody - public AjaxResult addSave(GenTable genTable) - { - return toAjax(genTableService.insertGenTable(genTable)); - } - /** - * 修改代码生成 - */ - @GetMapping("/edit/{tableName}") - public String edit(@PathVariable("tableName") String tableName, ModelMap mmap) - { - GenTable genTable = genTableService.selectGenTableById(tableName); - mmap.put("genTable", genTable); - return prefix + "/edit"; - } - - /** - * 修改保存代码生成 - */ - @RequiresPermissions("agile:genTable:edit") - @Log(title = "代码生成", businessType = BusinessType.UPDATE) - @PostMapping("/edit") - @ResponseBody - public AjaxResult editSave(GenTable genTable) - { - return toAjax(genTableService.updateGenTable(genTable)); - } - - /** - * 删除代码生成 - */ - @RequiresPermissions("agile:genTable:remove") - @Log(title = "代码生成", businessType = BusinessType.DELETE) - @PostMapping( "/remove") - @ResponseBody - public AjaxResult remove(String ids) - { - return toAjax(genTableService.deleteGenTableByIds(ids)); - } - + /** + * 新增代码生成 + */ + @GetMapping("/add") + public String add() { + return prefix + "/add"; + } + + /** + * 新增保存代码生成 + */ + @RequiresPermissions("agile:genTable:add") + @Log(title = "代码生成", businessType = BusinessType.INSERT) + @PostMapping("/add") + @ResponseBody + public AjaxResult addSave(GenTable genTable) { + + return toAjax(genTableService.insertGenTable(genTable)); + } + + /** + * 修改代码生成 + */ + @GetMapping("/edit/{tableName}") + public String edit(@PathVariable("tableName") String tableName, ModelMap mmap) { + GenTable genTable = genTableService.selectGenTableById(tableName); + mmap.put("genTable", genTable); + return prefix + "/edit"; + } + + /** + * 修改保存代码生成 + */ + @RequiresPermissions("agile:genTable:edit") + @Log(title = "代码生成", businessType = BusinessType.UPDATE) + @PostMapping("/edit") + @ResponseBody + public AjaxResult editSave(GenTable genTable) { + return toAjax(genTableService.updateGenTable(genTable)); + } + + /** + * 删除代码生成 + */ + @RequiresPermissions("agile:genTable:remove") + @Log(title = "代码生成", businessType = BusinessType.DELETE) + @PostMapping("/remove") + @ResponseBody + public AjaxResult remove(String ids) { + + return toAjax(genTableService.deleteGenTableByIds(ids)); + } + } diff --git a/ruoyi-generator/src/main/java/com/ruoyi/agile/domain/GenTable.java b/ruoyi-generator/src/main/java/com/ruoyi/agile/domain/GenTable.java index 7f2d50781..c72ab5ef5 100644 --- a/ruoyi-generator/src/main/java/com/ruoyi/agile/domain/GenTable.java +++ b/ruoyi-generator/src/main/java/com/ruoyi/agile/domain/GenTable.java @@ -9,12 +9,14 @@ import java.util.Date; * 代码生成表 gen_table * * @author zhujj - * @date 2018-11-29 + * @date 2018-11-30 */ public class GenTable extends BaseEntity { private static final long serialVersionUID = 1L; + /** 编码 */ + private Integer id; /** 表名 */ private String tableName; /** 实体类名称 */ @@ -40,7 +42,7 @@ public class GenTable extends BaseEntity /** 生成功能名（简写） */ private String functionNameSimple; /** 生成功能作者 */ - private String functionAuthor; + private String functionAuthor="AgileDev"; /** 生成基础路径 */ private String genBaseDir; /** 其它生成选项 */ @@ -56,6 +58,15 @@ public class GenTable extends BaseEntity /** 备注信息 */ private String remarks; + public void setId(Integer id) + { + this.id = id; + } + + public Integer getId() + { + return id; + } public void setTableName(String tableName) { this.tableName = tableName; @@ -239,6 +250,7 @@ public class GenTable extends BaseEntity public String toString() { return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) + .append("id", getId()) .append("tableName", getTableName()) .append("className", getClassName()) .append("comments", getComments()) diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/tool/BuildController.java b/ruoyi-generator/src/main/java/com/ruoyi/generator/controller/BuildController.java similarity index 90% rename from ruoyi-admin/src/main/java/com/ruoyi/web/controller/tool/BuildController.java rename to ruoyi-generator/src/main/java/com/ruoyi/generator/controller/BuildController.java index 202c5765a..4f06dc2ac 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/tool/BuildController.java +++ b/ruoyi-generator/src/main/java/com/ruoyi/generator/controller/BuildController.java @@ -1,26 +1,26 @@ -package com.ruoyi.web.controller.tool; - -import org.apache.shiro.authz.annotation.RequiresPermissions; -import org.springframework.stereotype.Controller; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.RequestMapping; -import com.ruoyi.framework.web.base.BaseController; - -/** - * build 表单构建 - * - * @author ruoyi - */ -@Controller -@RequestMapping("/tool/build") -public class BuildController extends BaseController -{ - private String prefix = "tool/build"; - - @RequiresPermissions("tool:build:view") - @GetMapping() - public String build() - { - return prefix + "/build"; - } -} +package com.ruoyi.generator.controller; + +import com.ruoyi.framework.web.base.BaseController; +import org.apache.shiro.authz.annotation.RequiresPermissions; +import org.springframework.stereotype.Controller; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RequestMapping; + +/** + * build 表单构建 + * + * @author ruoyi + */ +@Controller +@RequestMapping("/tool/build") +public class BuildController extends BaseController +{ + private String prefix = "tool/build"; + + @RequiresPermissions("tool:build:view") + @GetMapping() + public String build() + { + return prefix + "/build"; + } +} diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/tool/GenController.java b/ruoyi-generator/src/main/java/com/ruoyi/generator/controller/GenController.java similarity index 85% rename from ruoyi-admin/src/main/java/com/ruoyi/web/controller/tool/GenController.java rename to ruoyi-generator/src/main/java/com/ruoyi/generator/controller/GenController.java index b5e68dc9e..dc6e1d3f7 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/tool/GenController.java +++ b/ruoyi-generator/src/main/java/com/ruoyi/generator/controller/GenController.java @@ -1,89 +1,85 @@ -package com.ruoyi.web.controller.tool; - -import java.io.IOException; -import java.util.List; -import javax.servlet.http.HttpServletResponse; -import org.apache.commons.io.IOUtils; -import org.apache.shiro.authz.annotation.RequiresPermissions; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Controller; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PathVariable; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.ResponseBody; -import com.ruoyi.common.annotation.Log; -import com.ruoyi.common.enums.BusinessType; -import com.ruoyi.common.support.Convert; -import com.ruoyi.framework.web.page.TableDataInfo; -import com.ruoyi.generator.domain.TableInfo; -import com.ruoyi.generator.service.IGenService; -import com.ruoyi.framework.web.base.BaseController; - -/** - * 代码生成 操作处理 - * - * @author ruoyi - */ -@Controller -@RequestMapping("/tool/gen") -public class GenController extends BaseController -{ - private String prefix = "tool/gen"; - - @Autowired - private IGenService genService; - - @RequiresPermissions("tool:gen:view") - @GetMapping() - public String gen() - { - return prefix + "/gen"; - } - - @RequiresPermissions("tool:gen:list") - @PostMapping("/list") - @ResponseBody - public TableDataInfo list(TableInfo tableInfo) - { - startPage(); - List list = genService.selectTableList(tableInfo); - return getDataTable(list); - } - - /** - * 生成代码 - */ - @RequiresPermissions("tool:gen:code") - @Log(title = "代码生成", businessType = BusinessType.GENCODE) - @GetMapping("/genCode/{tableName}") - public void genCode(HttpServletResponse response, @PathVariable("tableName") String tableName) throws IOException - { - byte[] data = genService.generatorCode(tableName); - response.reset(); - response.setHeader("Content-Disposition", "attachment; filename=\"ruoyi.zip\""); - response.addHeader("Content-Length", "" + data.length); - response.setContentType("application/octet-stream; charset=UTF-8"); - - IOUtils.write(data, response.getOutputStream()); - } - - /** - * 批量生成代码 - */ - @RequiresPermissions("tool:gen:code") - @Log(title = "代码生成", businessType = BusinessType.GENCODE) - @GetMapping("/batchGenCode") - @ResponseBody - public void batchGenCode(HttpServletResponse response, String tables) throws IOException - { - String[] tableNames = Convert.toStrArray(tables); - byte[] data = genService.generatorCode(tableNames); - response.reset(); - response.setHeader("Content-Disposition", "attachment; filename=\"ruoyi.zip\""); - response.addHeader("Content-Length", "" + data.length); - response.setContentType("application/octet-stream; charset=UTF-8"); - - IOUtils.write(data, response.getOutputStream()); - } -} +package com.ruoyi.generator.controller; + +import com.ruoyi.common.annotation.Log; +import com.ruoyi.common.enums.BusinessType; +import com.ruoyi.common.support.Convert; +import com.ruoyi.framework.web.base.BaseController; +import com.ruoyi.framework.web.page.TableDataInfo; +import com.ruoyi.generator.domain.TableInfo; +import com.ruoyi.generator.service.IGenService; +import org.apache.commons.io.IOUtils; +import org.apache.shiro.authz.annotation.RequiresPermissions; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Controller; +import org.springframework.web.bind.annotation.*; + +import javax.servlet.http.HttpServletResponse; +import java.io.IOException; +import java.util.List; + +/** + * 代码生成 操作处理 + * + * @author ruoyi + */ +@Controller +@RequestMapping("/tool/gen") +public class GenController extends BaseController +{ + private String prefix = "tool/gen"; + + @Autowired + private IGenService genService; + + @RequiresPermissions("tool:gen:view") + @GetMapping() + public String gen() + { + return prefix + "/gen"; + } + + @RequiresPermissions("tool:gen:list") + @PostMapping("/list") + @ResponseBody + public TableDataInfo list(TableInfo tableInfo) + { + List list = genService.selectTableList(tableInfo); + return getDataTable(list); + } + + /** + * 生成代码 + */ + @RequiresPermissions("tool:gen:code") + @Log(title = "代码生成", businessType = BusinessType.GENCODE) + @GetMapping("/genCode/{tableName}") + public void genCode(HttpServletResponse response, @PathVariable("tableName") String tableName) throws IOException + { + byte[] data = genService.generatorCode(tableName); + response.reset(); + response.setHeader("Content-Disposition", "attachment; filename=\"ruoyi.zip\""); + response.addHeader("Content-Length", "" + data.length); + response.setContentType("application/octet-stream; charset=UTF-8"); + + IOUtils.write(data, response.getOutputStream()); + } + + /** + * 批量生成代码 + */ + @RequiresPermissions("tool:gen:code") + @Log(title = "代码生成", businessType = BusinessType.GENCODE) + @GetMapping("/batchGenCode") + @ResponseBody + public void batchGenCode(HttpServletResponse response, String tables) throws IOException + { + String[] tableNames = Convert.toStrArray(tables); + byte[] data = genService.generatorCode(tableNames); + response.reset(); + response.setHeader("Content-Disposition", "attachment; filename=\"ruoyi.zip\""); + response.addHeader("Content-Length", "" + data.length); + response.setContentType("application/octet-stream; charset=UTF-8"); + + IOUtils.write(data, response.getOutputStream()); + } +} diff --git a/ruoyi-generator/src/main/java/com/ruoyi/generator/mapper/GenMapper.java b/ruoyi-generator/src/main/java/com/ruoyi/generator/mapper/GenMapper.java index a516128a3..d11b47b4e 100644 --- a/ruoyi-generator/src/main/java/com/ruoyi/generator/mapper/GenMapper.java +++ b/ruoyi-generator/src/main/java/com/ruoyi/generator/mapper/GenMapper.java @@ -3,13 +3,14 @@ package com.ruoyi.generator.mapper; import java.util.List; import com.ruoyi.generator.domain.ColumnInfo; import com.ruoyi.generator.domain.TableInfo; +import tk.mybatis.mapper.common.Mapper; /** * 代码生成 数据层 * * @author ruoyi */ -public interface GenMapper +public interface GenMapper extends Mapper { /** * 查询ry数据库表信息 diff --git a/ruoyi-generator/src/main/java/com/ruoyi/generator/service/IGenService.java b/ruoyi-generator/src/main/java/com/ruoyi/generator/service/IGenService.java index 1dbf12afb..3dfd80d82 100644 --- a/ruoyi-generator/src/main/java/com/ruoyi/generator/service/IGenService.java +++ b/ruoyi-generator/src/main/java/com/ruoyi/generator/service/IGenService.java @@ -1,6 +1,8 @@ package com.ruoyi.generator.service; import java.util.List; + +import com.ruoyi.framework.web.base.AbstractBaseService; import com.ruoyi.generator.domain.TableInfo; /** @@ -8,7 +10,7 @@ import com.ruoyi.generator.domain.TableInfo; * * @author ruoyi */ -public interface IGenService +public interface IGenService extends AbstractBaseService { /** * 查询ry数据库表信息 diff --git a/ruoyi-generator/src/main/java/com/ruoyi/generator/service/impl/GenServiceImpl.java b/ruoyi-generator/src/main/java/com/ruoyi/generator/service/impl/GenServiceImpl.java index 682921b66..b14c30544 100644 --- a/ruoyi-generator/src/main/java/com/ruoyi/generator/service/impl/GenServiceImpl.java +++ b/ruoyi-generator/src/main/java/com/ruoyi/generator/service/impl/GenServiceImpl.java @@ -6,13 +6,14 @@ import java.io.StringWriter; import java.util.List; import java.util.zip.ZipEntry; import java.util.zip.ZipOutputStream; + +import com.ruoyi.framework.web.base.AbstractBaseServiceImpl; import org.apache.commons.io.IOUtils; import org.apache.velocity.Template; import org.apache.velocity.VelocityContext; import org.apache.velocity.app.Velocity; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import com.ruoyi.common.config.Global; import com.ruoyi.common.constant.Constants; @@ -30,12 +31,9 @@ import com.ruoyi.generator.util.VelocityInitializer; * @author ruoyi */ @Service -public class GenServiceImpl implements IGenService -{ +public class GenServiceImpl extends AbstractBaseServiceImpl implements IGenService { private static final Logger log = LoggerFactory.getLogger(GenServiceImpl.class); - @Autowired - private GenMapper genMapper; /** * 查询ry数据库表信息 @@ -46,7 +44,8 @@ public class GenServiceImpl implements IGenService @Override public List selectTableList(TableInfo tableInfo) { - return genMapper.selectTableList(tableInfo); + startPage(); + return mapper.selectTableList(tableInfo); } /** @@ -61,9 +60,9 @@ public class GenServiceImpl implements IGenService ByteArrayOutputStream outputStream = new ByteArrayOutputStream(); ZipOutputStream zip = new ZipOutputStream(outputStream); // 查询表信息 - TableInfo table = genMapper.selectTableByName(tableName); + TableInfo table = mapper.selectTableByName(tableName); // 查询列信息 - List columns = genMapper.selectTableColumnsByName(tableName); + List columns = mapper.selectTableColumnsByName(tableName); // 生成代码 generatorCode(table, columns, zip); IOUtils.closeQuietly(zip); @@ -84,9 +83,9 @@ public class GenServiceImpl implements IGenService for (String tableName : tableNames) { // 查询表信息 - TableInfo table = genMapper.selectTableByName(tableName); + TableInfo table = mapper.selectTableByName(tableName); // 查询列信息 - List columns = genMapper.selectTableColumnsByName(tableName); + List columns = mapper.selectTableColumnsByName(tableName); // 生成代码 generatorCode(table, columns, zip); } diff --git a/ruoyi-generator/src/main/resources/mapper/agile/GenTableMapper.xml b/ruoyi-generator/src/main/resources/mapper/agile/GenTableMapper.xml index 2d2bb5e72..a3d2fe48a 100644 --- a/ruoyi-generator/src/main/resources/mapper/agile/GenTableMapper.xml +++ b/ruoyi-generator/src/main/resources/mapper/agile/GenTableMapper.xml @@ -5,6 +5,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + @@ -28,13 +29,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - select table_name, class_name, comments, parent_table_name, parent_table_fk_name, data_source_name, tpl_category, package_name, module_name, sub_module_name, function_name, function_name_simple, function_author, gen_base_dir, options, create_by, create_date, update_by, update_date, remarks from gen_table + select id, table_name, class_name, comments, parent_table_name, parent_table_fk_name, data_source_name, tpl_category, package_name, module_name, sub_module_name, function_name, function_name_simple, function_author, gen_base_dir, options, create_by, create_date, update_by, update_date, remarks from gen_table - - where table_name = #{tableName} + where id = #{id} insert into gen_table + id, table_name, class_name, comments, @@ -87,6 +90,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" remarks, + #{id}, #{tableName}, #{className}, #{comments}, @@ -113,6 +117,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" update gen_table + table_name = #{tableName}, class_name = #{className}, comments = #{comments}, parent_table_name = #{parentTableName}, @@ -133,17 +138,17 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" update_date = #{updateDate}, remarks = #{remarks}, - where table_name = #{tableName} + where id = #{id} - - delete from gen_table where table_name = #{tableName} + + delete from gen_table where id = #{id} - delete from gen_table where table_name in - - #{tableName} + delete from gen_table where id in + + #{id} diff --git a/ruoyi-generator/src/main/resources/templates/agile/genTable/genTable.html b/ruoyi-generator/src/main/resources/templates/agile/genTable/genTable.html index af6b4589b..6279cf18b 100644 --- a/ruoyi-generator/src/main/resources/templates/agile/genTable/genTable.html +++ b/ruoyi-generator/src/main/resources/templates/agile/genTable/genTable.html @@ -3,7 +3,6 @@ -
@@ -11,81 +10,12 @@
  • - 实体类名称： + 表名：
    • -
  • 表说明：
    • -
  • - 关联父表的表名： -
    • - -
  • - 本表关联父表的外键名： -
    • - -
  • - 数据源名称： -
    • - -
  • - 使用的模板： -
    • - -
  • - 生成包路径： -
    • - -
  • - 生成模块名： -
    • - -
  • - 生成子模块名： -
    • - -
  • - 生成功能名： -
    • - -
  • - 生成功能名（简写）： -
    • - -
  • - 生成功能作者： -
    • - -
  • - 生成基础路径： -
    • - -
  • - 其它生成选项： -
    • - -
  • - 创建者： -
    • - -
  • - 创建时间： -
    • - -
  • - 更新者： -
    • - -
  • - 更新时间： -
    • - -
  • - 备注信息： -
    • -
  •  搜索  重置 @@ -148,91 +78,16 @@ title : '表说明', sortable: true }, - { - field : 'parentTableName', - title : '关联父表的表名', - sortable: true - }, - { - field : 'parentTableFkName', - title : '本表关联父表的外键名', - sortable: true - }, - { - field : 'dataSourceName', - title : '数据源名称', - sortable: true - }, - { - field : 'tplCategory', - title : '使用的模板', - sortable: true - }, - { - field : 'packageName', - title : '生成包路径', - sortable: true - }, - { - field : 'moduleName', - title : '生成模块名', - sortable: true - }, - { - field : 'subModuleName', - title : '生成子模块名', - sortable: true - }, - { - field : 'functionName', - title : '生成功能名', - sortable: true - }, - { - field : 'functionNameSimple', - title : '生成功能名（简写）', - sortable: true - }, { field : 'functionAuthor', title : '生成功能作者', sortable: true }, - { - field : 'genBaseDir', - title : '生成基础路径', - sortable: true - }, - { - field : 'options', - title : '其它生成选项', - sortable: true - }, - { - field : 'createBy', - title : '创建者', - sortable: true - }, { field : 'createDate', title : '创建时间', sortable: true }, - { - field : 'updateBy', - title : '更新者', - sortable: true - }, - { - field : 'updateDate', - title : '更新时间', - sortable: true - }, - { - field : 'remarks', - title : '备注信息', - sortable: true - }, { title: '操作', align: 'center', diff --git a/ruoyi-admin/src/main/resources/templates/tool/build/build.html b/ruoyi-generator/src/main/resources/templates/tool/build/build.html similarity index 98% rename from ruoyi-admin/src/main/resources/templates/tool/build/build.html rename to ruoyi-generator/src/main/resources/templates/tool/build/build.html index a7442e616..477fb4a00 100644 --- a/ruoyi-admin/src/main/resources/templates/tool/build/build.html +++ b/ruoyi-generator/src/main/resources/templates/tool/build/build.html @@ -1,175 +1,175 @@ - - - - - - - - -
    -
    -
    -
    -
    -
    元素
    -
    - - - - - - - - - - -
    -
    -
    -
    - 拖拽左侧的表单元素到右侧区域，即可生成相应的HTML代码，表单代码，轻松搞定！ -
    -
    -
    - -
    - -
    -
    - -
    - -
    - -
    -
    - -
    - -
    - -
    -
    -
    - -
    - -
    -
    -
    - - -
    -

    这里是纯文字信息

    -
    -
    -
    - - -
    - - -
    -
    -
    - - -
    - - - -
    -
    -
    - - -
    -
    - - -
    -
    -
    -
    - - -
    -
    -
    - - -
    -
    -
    -
    -
    -
    -
    - - -
    -
    -
    -
    -
    -
    -
    -
    -
    -
    -
    拖拽左侧表单元素到此区域
    -
    - 请选择显示的列数： - -
    -
    - -
    -
    -
    -
    - - -
    - -
    -
    -
    -
    -
    -
    - - - - - - - + + + + + + + + +
    +
    +
    +
    +
    +
    元素
    +
    + + + + + + + + + + +
    +
    +
    +
    + 拖拽左侧的表单元素到右侧区域，即可生成相应的HTML代码，表单代码，轻松搞定！ +
    +
    +
    + +
    + +
    +
    + +
    + +
    + +
    +
    + +
    + +
    + +
    +
    +
    + +
    + +
    +
    +
    + + +
    +

    这里是纯文字信息

    +
    +
    +
    + + +
    + + +
    +
    +
    + + +
    + + + +
    +
    +
    + + +
    +
    + + +
    +
    +
    +
    + + +
    +
    +
    + + +
    +
    +
    +
    +
    +
    +
    + + +
    +
    +
    +
    +
    +
    +
    +
    +
    +
    +
    拖拽左侧表单元素到此区域
    +
    + 请选择显示的列数： + +
    +
    + +
    +
    +
    +
    + + +
    + +
    +
    +
    +
    +
    +
    + + + + + + + diff --git a/ruoyi-admin/src/main/resources/templates/tool/gen/gen.html b/ruoyi-generator/src/main/resources/templates/tool/gen/gen.html similarity index 97% rename from ruoyi-admin/src/main/resources/templates/tool/gen/gen.html rename to ruoyi-generator/src/main/resources/templates/tool/gen/gen.html index 42df3c328..e36249fd1 100644 --- a/ruoyi-admin/src/main/resources/templates/tool/gen/gen.html +++ b/ruoyi-generator/src/main/resources/templates/tool/gen/gen.html @@ -1,117 +1,117 @@ - - - - - - -
    -
    -
    -
    -
    -
      -
    • - 表名称： -
      • -
    • - 表描述： -
      • -
    • - - - - - -
      • -
    • -  搜索 -  重置 -
      • -
    -
    -
    -
    - - - -
    -
    -
    -
    -
    -
    - - + + + + + + +
    +
    +
    +
    +
    +
      +
    • + 表名称： +
      • +
    • + 表描述： +
      • +
    • + + + - + +
      • +
    • +  搜索 +  重置 +
      • +
    +
    +
    +
    + + + +
    +
    +
    +
    +
    +
    + + \ No newline at end of file diff --git a/ruoyi-quartz/pom.xml b/ruoyi-quartz/pom.xml index 229426ab9..d342e672c 100644 --- a/ruoyi-quartz/pom.xml +++ b/ruoyi-quartz/pom.xml @@ -35,7 +35,12 @@ ruoyi-common ${ruoyi.version} - + + + com.ruoyi + ruoyi-framework + 3.0 + \ No newline at end of file diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitor/SysJobController.java b/ruoyi-quartz/src/main/java/com/ruoyi/quartz/controller/SysJobController.java similarity index 95% rename from ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitor/SysJobController.java rename to ruoyi-quartz/src/main/java/com/ruoyi/quartz/controller/SysJobController.java index 29d5baafe..f213e624d 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitor/SysJobController.java +++ b/ruoyi-quartz/src/main/java/com/ruoyi/quartz/controller/SysJobController.java @@ -1,162 +1,161 @@ -package com.ruoyi.web.controller.monitor; - -import java.util.List; -import org.apache.shiro.authz.annotation.RequiresPermissions; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Controller; -import org.springframework.ui.ModelMap; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PathVariable; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.ResponseBody; -import com.ruoyi.common.annotation.Log; -import com.ruoyi.common.base.AjaxResult; -import com.ruoyi.common.enums.BusinessType; -import com.ruoyi.common.utils.ExcelUtil; -import com.ruoyi.framework.util.ShiroUtils; -import com.ruoyi.framework.web.page.TableDataInfo; -import com.ruoyi.quartz.domain.SysJob; -import com.ruoyi.quartz.service.ISysJobService; -import com.ruoyi.framework.web.base.BaseController; - -/** - * 调度任务信息操作处理 - * - * @author ruoyi - */ -@Controller -@RequestMapping("/monitor/job") -public class SysJobController extends BaseController -{ - private String prefix = "monitor/job"; - - @Autowired - private ISysJobService jobService; - - @RequiresPermissions("monitor:job:view") - @GetMapping() - public String job() - { - return prefix + "/job"; - } - - @RequiresPermissions("monitor:job:list") - @PostMapping("/list") - @ResponseBody - public TableDataInfo list(SysJob job) - { - startPage(); - List list = jobService.selectJobList(job); - return getDataTable(list); - } - - @Log(title = "定时任务", businessType = BusinessType.EXPORT) - @RequiresPermissions("monitor:job:export") - @PostMapping("/export") - @ResponseBody - public AjaxResult export(SysJob job) - { - List list = jobService.selectJobList(job); - ExcelUtil util = new ExcelUtil(SysJob.class); - return util.exportExcel(list, "job"); - } - - @Log(title = "定时任务", businessType = BusinessType.DELETE) - @RequiresPermissions("monitor:job:remove") - @PostMapping("/remove") - @ResponseBody - public AjaxResult remove(String ids) - { - try - { - jobService.deleteJobByIds(ids); - return success(); - } - catch (Exception e) - { - e.printStackTrace(); - return error(e.getMessage()); - } - } - - /** - * 任务调度状态修改 - */ - @Log(title = "定时任务", businessType = BusinessType.UPDATE) - @RequiresPermissions("monitor:job:changeStatus") - @PostMapping("/changeStatus") - @ResponseBody - public AjaxResult changeStatus(SysJob job) - { - job.setUpdateBy(ShiroUtils.getLoginName()); - return toAjax(jobService.changeStatus(job)); - } - - /** - * 任务调度立即执行一次 - */ - @Log(title = "定时任务", businessType = BusinessType.UPDATE) - @RequiresPermissions("monitor:job:changeStatus") - @PostMapping("/run") - @ResponseBody - public AjaxResult run(SysJob job) - { - return toAjax(jobService.run(job)); - } - - /** - * 新增调度 - */ - @GetMapping("/add") - public String add() - { - return prefix + "/add"; - } - - /** - * 新增保存调度 - */ - @Log(title = "定时任务", businessType = BusinessType.INSERT) - @RequiresPermissions("monitor:job:add") - @PostMapping("/add") - @ResponseBody - public AjaxResult addSave(SysJob job) - { - job.setCreateBy(ShiroUtils.getLoginName()); - return toAjax(jobService.insertJobCron(job)); - } - - /** - * 修改调度 - */ - @GetMapping("/edit/{jobId}") - public String edit(@PathVariable("jobId") Long jobId, ModelMap mmap) - { - mmap.put("job", jobService.selectJobById(jobId)); - return prefix + "/edit"; - } - - /** - * 修改保存调度 - */ - @Log(title = "定时任务", businessType = BusinessType.UPDATE) - @RequiresPermissions("monitor:job:edit") - @PostMapping("/edit") - @ResponseBody - public AjaxResult editSave(SysJob job) - { - job.setUpdateBy(ShiroUtils.getLoginName()); - return toAjax(jobService.updateJobCron(job)); - } - - /** - * 校验cron表达式是否有效 - */ - @PostMapping("/checkCronExpressionIsValid") - @ResponseBody - public boolean checkCronExpressionIsValid(SysJob job) - { - return jobService.checkCronExpressionIsValid(job.getCronExpression()); - } -} +package com.ruoyi.quartz.controller; + +import java.util.List; +import org.apache.shiro.authz.annotation.RequiresPermissions; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Controller; +import org.springframework.ui.ModelMap; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.ResponseBody; +import com.ruoyi.common.annotation.Log; +import com.ruoyi.common.base.AjaxResult; +import com.ruoyi.common.enums.BusinessType; +import com.ruoyi.common.utils.ExcelUtil; +import com.ruoyi.framework.util.ShiroUtils; +import com.ruoyi.framework.web.page.TableDataInfo; +import com.ruoyi.quartz.domain.SysJob; +import com.ruoyi.quartz.service.ISysJobService; +import com.ruoyi.framework.web.base.BaseController; + +/** + * 调度任务信息操作处理 + * + * @author ruoyi + */ +@Controller +@RequestMapping("/monitor/job") +public class SysJobController extends BaseController +{ + private String prefix = "monitor/job"; + + @Autowired + private ISysJobService jobService; + + @RequiresPermissions("monitor:job:view") + @GetMapping() + public String job() + { + return prefix + "/job"; + } + + @RequiresPermissions("monitor:job:list") + @PostMapping("/list") + @ResponseBody + public TableDataInfo list(SysJob job) + { + List list = jobService.selectJobList(job); + return getDataTable(list); + } + + @Log(title = "定时任务", businessType = BusinessType.EXPORT) + @RequiresPermissions("monitor:job:export") + @PostMapping("/export") + @ResponseBody + public AjaxResult export(SysJob job) + { + List list = jobService.selectJobList(job); + ExcelUtil util = new ExcelUtil(SysJob.class); + return util.exportExcel(list, "job"); + } + + @Log(title = "定时任务", businessType = BusinessType.DELETE) + @RequiresPermissions("monitor:job:remove") + @PostMapping("/remove") + @ResponseBody + public AjaxResult remove(String ids) + { + try + { + jobService.deleteJobByIds(ids); + return success(); + } + catch (Exception e) + { + e.printStackTrace(); + return error(e.getMessage()); + } + } + + /** + * 任务调度状态修改 + */ + @Log(title = "定时任务", businessType = BusinessType.UPDATE) + @RequiresPermissions("monitor:job:changeStatus") + @PostMapping("/changeStatus") + @ResponseBody + public AjaxResult changeStatus(SysJob job) + { + job.setUpdateBy(ShiroUtils.getLoginName()); + return toAjax(jobService.changeStatus(job)); + } + + /** + * 任务调度立即执行一次 + */ + @Log(title = "定时任务", businessType = BusinessType.UPDATE) + @RequiresPermissions("monitor:job:changeStatus") + @PostMapping("/run") + @ResponseBody + public AjaxResult run(SysJob job) + { + return toAjax(jobService.run(job)); + } + + /** + * 新增调度 + */ + @GetMapping("/add") + public String add() + { + return prefix + "/add"; + } + + /** + * 新增保存调度 + */ + @Log(title = "定时任务", businessType = BusinessType.INSERT) + @RequiresPermissions("monitor:job:add") + @PostMapping("/add") + @ResponseBody + public AjaxResult addSave(SysJob job) + { + job.setCreateBy(ShiroUtils.getLoginName()); + return toAjax(jobService.insertJobCron(job)); + } + + /** + * 修改调度 + */ + @GetMapping("/edit/{jobId}") + public String edit(@PathVariable("jobId") Long jobId, ModelMap mmap) + { + mmap.put("job", jobService.selectJobById(jobId)); + return prefix + "/edit"; + } + + /** + * 修改保存调度 + */ + @Log(title = "定时任务", businessType = BusinessType.UPDATE) + @RequiresPermissions("monitor:job:edit") + @PostMapping("/edit") + @ResponseBody + public AjaxResult editSave(SysJob job) + { + job.setUpdateBy(ShiroUtils.getLoginName()); + return toAjax(jobService.updateJobCron(job)); + } + + /** + * 校验cron表达式是否有效 + */ + @PostMapping("/checkCronExpressionIsValid") + @ResponseBody + public boolean checkCronExpressionIsValid(SysJob job) + { + return jobService.checkCronExpressionIsValid(job.getCronExpression()); + } +} diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitor/SysJobLogController.java b/ruoyi-quartz/src/main/java/com/ruoyi/quartz/controller/SysJobLogController.java similarity index 94% rename from ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitor/SysJobLogController.java rename to ruoyi-quartz/src/main/java/com/ruoyi/quartz/controller/SysJobLogController.java index 1e98551cc..3420f7635 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitor/SysJobLogController.java +++ b/ruoyi-quartz/src/main/java/com/ruoyi/quartz/controller/SysJobLogController.java @@ -1,90 +1,89 @@ -package com.ruoyi.web.controller.monitor; - -import java.util.List; -import org.apache.shiro.authz.annotation.RequiresPermissions; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Controller; -import org.springframework.ui.ModelMap; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PathVariable; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.ResponseBody; -import com.ruoyi.common.annotation.Log; -import com.ruoyi.common.base.AjaxResult; -import com.ruoyi.common.enums.BusinessType; -import com.ruoyi.common.utils.ExcelUtil; -import com.ruoyi.framework.web.base.BaseController; -import com.ruoyi.framework.web.page.TableDataInfo; -import com.ruoyi.quartz.domain.SysJobLog; -import com.ruoyi.quartz.service.ISysJobLogService; - -/** - * 调度日志操作处理 - * - * @author ruoyi - */ -@Controller -@RequestMapping("/monitor/jobLog") -public class SysJobLogController extends BaseController -{ - private String prefix = "monitor/job"; - - @Autowired - private ISysJobLogService jobLogService; - - @RequiresPermissions("monitor:job:view") - @GetMapping() - public String jobLog() - { - return prefix + "/jobLog"; - } - - @RequiresPermissions("monitor:job:list") - @PostMapping("/list") - @ResponseBody - public TableDataInfo list(SysJobLog jobLog) - { - startPage(); - List list = jobLogService.selectJobLogList(jobLog); - return getDataTable(list); - } - - @Log(title = "调度日志", businessType = BusinessType.EXPORT) - @RequiresPermissions("monitor:job:export") - @PostMapping("/export") - @ResponseBody - public AjaxResult export(SysJobLog jobLog) - { - List list = jobLogService.selectJobLogList(jobLog); - ExcelUtil util = new ExcelUtil(SysJobLog.class); - return util.exportExcel(list, "jobLog"); - } - - @Log(title = "调度日志", businessType = BusinessType.DELETE) - @RequiresPermissions("monitor:job:remove") - @PostMapping("/remove") - @ResponseBody - public AjaxResult remove(String ids) - { - return toAjax(jobLogService.deleteJobLogByIds(ids)); - } - - @RequiresPermissions("monitor:job:detail") - @GetMapping("/detail/{jobLogId}") - public String detail(@PathVariable("jobLogId") Long jobLogId, ModelMap mmap) - { - mmap.put("jobLog", jobLogService.selectJobLogById(jobLogId)); - return prefix + "/detail"; - } - - @Log(title = "调度日志", businessType = BusinessType.CLEAN) - @RequiresPermissions("monitor:job:remove") - @PostMapping("/clean") - @ResponseBody - public AjaxResult clean() - { - jobLogService.cleanJobLog(); - return success(); - } -} +package com.ruoyi.quartz.controller; + +import java.util.List; +import org.apache.shiro.authz.annotation.RequiresPermissions; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Controller; +import org.springframework.ui.ModelMap; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.ResponseBody; +import com.ruoyi.common.annotation.Log; +import com.ruoyi.common.base.AjaxResult; +import com.ruoyi.common.enums.BusinessType; +import com.ruoyi.common.utils.ExcelUtil; +import com.ruoyi.framework.web.base.BaseController; +import com.ruoyi.framework.web.page.TableDataInfo; +import com.ruoyi.quartz.domain.SysJobLog; +import com.ruoyi.quartz.service.ISysJobLogService; + +/** + * 调度日志操作处理 + * + * @author ruoyi + */ +@Controller +@RequestMapping("/monitor/jobLog") +public class SysJobLogController extends BaseController +{ + private String prefix = "monitor/job"; + + @Autowired + private ISysJobLogService jobLogService; + + @RequiresPermissions("monitor:job:view") + @GetMapping() + public String jobLog() + { + return prefix + "/jobLog"; + } + + @RequiresPermissions("monitor:job:list") + @PostMapping("/list") + @ResponseBody + public TableDataInfo list(SysJobLog jobLog) + { + List list = jobLogService.selectJobLogList(jobLog); + return getDataTable(list); + } + + @Log(title = "调度日志", businessType = BusinessType.EXPORT) + @RequiresPermissions("monitor:job:export") + @PostMapping("/export") + @ResponseBody + public AjaxResult export(SysJobLog jobLog) + { + List list = jobLogService.selectJobLogList(jobLog); + ExcelUtil util = new ExcelUtil(SysJobLog.class); + return util.exportExcel(list, "jobLog"); + } + + @Log(title = "调度日志", businessType = BusinessType.DELETE) + @RequiresPermissions("monitor:job:remove") + @PostMapping("/remove") + @ResponseBody + public AjaxResult remove(String ids) + { + return toAjax(jobLogService.deleteJobLogByIds(ids)); + } + + @RequiresPermissions("monitor:job:detail") + @GetMapping("/detail/{jobLogId}") + public String detail(@PathVariable("jobLogId") Long jobLogId, ModelMap mmap) + { + mmap.put("jobLog", jobLogService.selectJobLogById(jobLogId)); + return prefix + "/detail"; + } + + @Log(title = "调度日志", businessType = BusinessType.CLEAN) + @RequiresPermissions("monitor:job:remove") + @PostMapping("/clean") + @ResponseBody + public AjaxResult clean() + { + jobLogService.cleanJobLog(); + return success(); + } +} diff --git a/ruoyi-quartz/src/main/java/com/ruoyi/quartz/mapper/SysJobLogMapper.java b/ruoyi-quartz/src/main/java/com/ruoyi/quartz/mapper/SysJobLogMapper.java index 083c4e46a..1c805e1b5 100644 --- a/ruoyi-quartz/src/main/java/com/ruoyi/quartz/mapper/SysJobLogMapper.java +++ b/ruoyi-quartz/src/main/java/com/ruoyi/quartz/mapper/SysJobLogMapper.java @@ -1,14 +1,17 @@ package com.ruoyi.quartz.mapper; import java.util.List; + +import com.ruoyi.quartz.domain.SysJob; import com.ruoyi.quartz.domain.SysJobLog; +import tk.mybatis.mapper.common.Mapper; /** * 调度任务日志信息 数据层 * * @author ruoyi */ -public interface SysJobLogMapper +public interface SysJobLogMapper extends Mapper { /** * 获取quartz调度器日志的计划任务 diff --git a/ruoyi-quartz/src/main/java/com/ruoyi/quartz/mapper/SysJobMapper.java b/ruoyi-quartz/src/main/java/com/ruoyi/quartz/mapper/SysJobMapper.java index aed5c24f7..16e0ed310 100644 --- a/ruoyi-quartz/src/main/java/com/ruoyi/quartz/mapper/SysJobMapper.java +++ b/ruoyi-quartz/src/main/java/com/ruoyi/quartz/mapper/SysJobMapper.java @@ -2,13 +2,15 @@ package com.ruoyi.quartz.mapper; import java.util.List; import com.ruoyi.quartz.domain.SysJob; +import com.ruoyi.system.domain.SysConfig; +import tk.mybatis.mapper.common.Mapper; /** * 调度任务信息 数据层 * * @author ruoyi */ -public interface SysJobMapper +public interface SysJobMapper extends Mapper { /** * 查询调度任务日志集合 diff --git a/ruoyi-quartz/src/main/java/com/ruoyi/quartz/service/ISysJobLogService.java b/ruoyi-quartz/src/main/java/com/ruoyi/quartz/service/ISysJobLogService.java index 93ae0f77b..ef1e2ca2c 100644 --- a/ruoyi-quartz/src/main/java/com/ruoyi/quartz/service/ISysJobLogService.java +++ b/ruoyi-quartz/src/main/java/com/ruoyi/quartz/service/ISysJobLogService.java @@ -1,6 +1,9 @@ package com.ruoyi.quartz.service; import java.util.List; + +import com.ruoyi.framework.web.base.AbstractBaseService; +import com.ruoyi.quartz.domain.SysJob; import com.ruoyi.quartz.domain.SysJobLog; /** @@ -8,7 +11,7 @@ import com.ruoyi.quartz.domain.SysJobLog; * * @author ruoyi */ -public interface ISysJobLogService +public interface ISysJobLogService extends AbstractBaseService { /** * 获取quartz调度器日志的计划任务 diff --git a/ruoyi-quartz/src/main/java/com/ruoyi/quartz/service/ISysJobService.java b/ruoyi-quartz/src/main/java/com/ruoyi/quartz/service/ISysJobService.java index 0cf3a000b..ac026c017 100644 --- a/ruoyi-quartz/src/main/java/com/ruoyi/quartz/service/ISysJobService.java +++ b/ruoyi-quartz/src/main/java/com/ruoyi/quartz/service/ISysJobService.java @@ -1,14 +1,17 @@ package com.ruoyi.quartz.service; import java.util.List; + +import com.ruoyi.framework.web.base.AbstractBaseService; import com.ruoyi.quartz.domain.SysJob; +import com.ruoyi.quartz.domain.SysJobLog; /** * 定时任务调度信息信息 服务层 * * @author ruoyi */ -public interface ISysJobService +public interface ISysJobService extends AbstractBaseService { /** * 获取quartz调度器的计划任务 diff --git a/ruoyi-quartz/src/main/java/com/ruoyi/quartz/service/impl/SysJobLogServiceImpl.java b/ruoyi-quartz/src/main/java/com/ruoyi/quartz/service/impl/SysJobLogServiceImpl.java index 37a4885cf..d17e7a305 100644 --- a/ruoyi-quartz/src/main/java/com/ruoyi/quartz/service/impl/SysJobLogServiceImpl.java +++ b/ruoyi-quartz/src/main/java/com/ruoyi/quartz/service/impl/SysJobLogServiceImpl.java @@ -1,6 +1,10 @@ package com.ruoyi.quartz.service.impl; import java.util.List; + +import com.ruoyi.framework.web.base.AbstractBaseServiceImpl; +import com.ruoyi.quartz.domain.SysJob; +import com.ruoyi.quartz.mapper.SysJobMapper; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import com.ruoyi.common.support.Convert; @@ -14,7 +18,7 @@ import com.ruoyi.quartz.service.ISysJobLogService; * @author ruoyi */ @Service -public class SysJobLogServiceImpl implements ISysJobLogService +public class SysJobLogServiceImpl extends AbstractBaseServiceImpl implements ISysJobLogService { @Autowired private SysJobLogMapper jobLogMapper; @@ -28,6 +32,7 @@ public class SysJobLogServiceImpl implements ISysJobLogService @Override public List selectJobLogList(SysJobLog jobLog) { + startPage(); return jobLogMapper.selectJobLogList(jobLog); } diff --git a/ruoyi-quartz/src/main/java/com/ruoyi/quartz/service/impl/SysJobServiceImpl.java b/ruoyi-quartz/src/main/java/com/ruoyi/quartz/service/impl/SysJobServiceImpl.java index 930d44820..c541c2fdc 100644 --- a/ruoyi-quartz/src/main/java/com/ruoyi/quartz/service/impl/SysJobServiceImpl.java +++ b/ruoyi-quartz/src/main/java/com/ruoyi/quartz/service/impl/SysJobServiceImpl.java @@ -2,6 +2,10 @@ package com.ruoyi.quartz.service.impl; import java.util.List; import javax.annotation.PostConstruct; + +import com.ruoyi.framework.web.base.AbstractBaseServiceImpl; +import com.ruoyi.system.domain.SysDept; +import com.ruoyi.system.mapper.SysDeptMapper; import org.quartz.CronTrigger; import org.quartz.Scheduler; import org.springframework.beans.factory.annotation.Autowired; @@ -20,7 +24,7 @@ import com.ruoyi.quartz.util.ScheduleUtils; * @author ruoyi */ @Service -public class SysJobServiceImpl implements ISysJobService +public class SysJobServiceImpl extends AbstractBaseServiceImpl implements ISysJobService { @Autowired private Scheduler scheduler; @@ -59,6 +63,7 @@ public class SysJobServiceImpl implements ISysJobService @Override public List selectJobList(SysJob job) { + startPage(); return jobMapper.selectJobList(job); } diff --git a/ruoyi-system/pom.xml b/ruoyi-system/pom.xml index aa5236fc0..9ede76ce5 100644 --- a/ruoyi-system/pom.xml +++ b/ruoyi-system/pom.xml @@ -22,6 +22,12 @@ ruoyi-common ${ruoyi.version} + + + com.ruoyi + ruoyi-framework + ${ruoyi.version} + \ No newline at end of file diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysConfigMapper.java b/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysConfigMapper.java index c529a0bc4..bd1f515ed 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysConfigMapper.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysConfigMapper.java @@ -2,18 +2,19 @@ package com.ruoyi.system.mapper; import java.util.List; import com.ruoyi.system.domain.SysConfig; +import tk.mybatis.mapper.common.Mapper; /** * 参数配置 数据层 * * @author ruoyi */ -public interface SysConfigMapper +public interface SysConfigMapper extends Mapper { /** * 查询参数配置信息 * - * @param configId 参数配置信息 + * @param config 参数配置信息 * @return 参数配置信息 */ public SysConfig selectConfig(SysConfig config); diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysDeptMapper.java b/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysDeptMapper.java index b6eb9c1b1..368642761 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysDeptMapper.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysDeptMapper.java @@ -1,15 +1,18 @@ package com.ruoyi.system.mapper; import java.util.List; + +import com.ruoyi.system.domain.SysConfig; import org.apache.ibatis.annotations.Param; import com.ruoyi.system.domain.SysDept; +import tk.mybatis.mapper.common.Mapper; /** * 部门管理 数据层 * * @author ruoyi */ -public interface SysDeptMapper +public interface SysDeptMapper extends Mapper { /** * 查询部门人数 diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysDictDataMapper.java b/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysDictDataMapper.java index ad251fdea..959397afb 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysDictDataMapper.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysDictDataMapper.java @@ -1,15 +1,18 @@ package com.ruoyi.system.mapper; import java.util.List; + +import com.ruoyi.system.domain.SysDept; import org.apache.ibatis.annotations.Param; import com.ruoyi.system.domain.SysDictData; +import tk.mybatis.mapper.common.Mapper; /** * 字典表 数据层 * * @author ruoyi */ -public interface SysDictDataMapper +public interface SysDictDataMapper extends Mapper { /** * 根据条件分页查询字典数据 diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysDictTypeMapper.java b/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysDictTypeMapper.java index b2beb2122..95c4eff96 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysDictTypeMapper.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysDictTypeMapper.java @@ -10,7 +10,7 @@ import com.ruoyi.system.domain.SysDictType; * @author ruoyi */ @Mapper -public interface SysDictTypeMapper +public interface SysDictTypeMapper extends tk.mybatis.mapper.common.Mapper { /** * 根据条件分页查询字典类型 diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysLogininforMapper.java b/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysLogininforMapper.java index ec96c13dd..a69d129d3 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysLogininforMapper.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysLogininforMapper.java @@ -2,13 +2,14 @@ package com.ruoyi.system.mapper; import java.util.List; import com.ruoyi.system.domain.SysLogininfor; +import tk.mybatis.mapper.common.Mapper; /** * 系统访问日志情况信息 数据层 * * @author ruoyi */ -public interface SysLogininforMapper +public interface SysLogininforMapper extends Mapper { /** * 新增系统登录日志 diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysMenuMapper.java b/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysMenuMapper.java index eae456b12..31bb21656 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysMenuMapper.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysMenuMapper.java @@ -3,13 +3,14 @@ package com.ruoyi.system.mapper; import java.util.List; import org.apache.ibatis.annotations.Param; import com.ruoyi.system.domain.SysMenu; +import tk.mybatis.mapper.common.Mapper; /** * 菜单表 数据层 * * @author ruoyi */ -public interface SysMenuMapper +public interface SysMenuMapper extends Mapper { /** * 查询系统所有菜单（含按钮） diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysNoticeMapper.java b/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysNoticeMapper.java index 1ce1d8cde..5db3ebb63 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysNoticeMapper.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysNoticeMapper.java @@ -2,13 +2,14 @@ package com.ruoyi.system.mapper; import java.util.List; import com.ruoyi.system.domain.SysNotice; +import tk.mybatis.mapper.common.Mapper; /** * 公告 数据层 * * @author ruoyi */ -public interface SysNoticeMapper +public interface SysNoticeMapper extends Mapper { /** * 查询公告信息 diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysOperLogMapper.java b/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysOperLogMapper.java index 98ca5d130..9556e88e6 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysOperLogMapper.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysOperLogMapper.java @@ -2,13 +2,14 @@ package com.ruoyi.system.mapper; import java.util.List; import com.ruoyi.system.domain.SysOperLog; +import tk.mybatis.mapper.common.Mapper; /** * 操作日志 数据层 * * @author ruoyi */ -public interface SysOperLogMapper +public interface SysOperLogMapper extends Mapper { /** * 新增操作日志 diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysPostMapper.java b/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysPostMapper.java index a4aab595b..05ba19f98 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysPostMapper.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysPostMapper.java @@ -2,13 +2,14 @@ package com.ruoyi.system.mapper; import java.util.List; import com.ruoyi.system.domain.SysPost; +import tk.mybatis.mapper.common.Mapper; /** * 岗位信息 数据层 * * @author ruoyi */ -public interface SysPostMapper +public interface SysPostMapper extends Mapper { /** * 查询岗位数据集合 diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysRoleDeptMapper.java b/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysRoleDeptMapper.java index a4ad4de24..7122a8ee7 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysRoleDeptMapper.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysRoleDeptMapper.java @@ -2,13 +2,14 @@ package com.ruoyi.system.mapper; import java.util.List; import com.ruoyi.system.domain.SysRoleDept; +import tk.mybatis.mapper.common.Mapper; /** * 角色与部门关联表 数据层 * * @author ruoyi */ -public interface SysRoleDeptMapper +public interface SysRoleDeptMapper extends Mapper { /** * 通过角色ID删除角色和部门关联 diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysRoleMapper.java b/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysRoleMapper.java index 8c2ea6501..2d282b9bb 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysRoleMapper.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysRoleMapper.java @@ -2,13 +2,14 @@ package com.ruoyi.system.mapper; import java.util.List; import com.ruoyi.system.domain.SysRole; +import tk.mybatis.mapper.common.Mapper; /** * 角色表 数据层 * * @author ruoyi */ -public interface SysRoleMapper +public interface SysRoleMapper extends Mapper { /** * 根据条件分页查询角色数据 diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysRoleMenuMapper.java b/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysRoleMenuMapper.java index 5ed98f294..f8073cc0f 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysRoleMenuMapper.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysRoleMenuMapper.java @@ -2,13 +2,14 @@ package com.ruoyi.system.mapper; import java.util.List; import com.ruoyi.system.domain.SysRoleMenu; +import tk.mybatis.mapper.common.Mapper; /** * 角色与菜单关联表 数据层 * * @author ruoyi */ -public interface SysRoleMenuMapper +public interface SysRoleMenuMapper extends Mapper { /** * 通过角色ID删除角色和菜单关联 diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysUserMapper.java b/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysUserMapper.java index 397ccd120..c6ce2b286 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysUserMapper.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysUserMapper.java @@ -2,13 +2,14 @@ package com.ruoyi.system.mapper; import java.util.List; import com.ruoyi.system.domain.SysUser; +import tk.mybatis.mapper.common.Mapper; /** * 用户表 数据层 * * @author ruoyi */ -public interface SysUserMapper +public interface SysUserMapper extends Mapper { /** * 根据条件分页查询用户对象 diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysUserOnlineMapper.java b/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysUserOnlineMapper.java index c6bf94cd2..30f6d0ee9 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysUserOnlineMapper.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysUserOnlineMapper.java @@ -2,13 +2,14 @@ package com.ruoyi.system.mapper; import java.util.List; import com.ruoyi.system.domain.SysUserOnline; +import tk.mybatis.mapper.common.Mapper; /** * 在线用户 数据层 * * @author ruoyi */ -public interface SysUserOnlineMapper +public interface SysUserOnlineMapper extends Mapper { /** * 通过会话序号查询信息 diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysUserPostMapper.java b/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysUserPostMapper.java index d2e8e7e5e..6b0301172 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysUserPostMapper.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysUserPostMapper.java @@ -2,13 +2,14 @@ package com.ruoyi.system.mapper; import java.util.List; import com.ruoyi.system.domain.SysUserPost; +import tk.mybatis.mapper.common.Mapper; /** * 用户与岗位 表 数据层 * * @author ruoyi */ -public interface SysUserPostMapper +public interface SysUserPostMapper extends Mapper { /** * 通过用户ID删除用户和岗位关联 diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysUserRoleMapper.java b/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysUserRoleMapper.java index d27eaf968..6d1d4a6b6 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysUserRoleMapper.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysUserRoleMapper.java @@ -2,13 +2,14 @@ package com.ruoyi.system.mapper; import java.util.List; import com.ruoyi.system.domain.SysUserRole; +import tk.mybatis.mapper.common.Mapper; /** * 用户表 数据层 * * @author ruoyi */ -public interface SysUserRoleMapper +public interface SysUserRoleMapper extends Mapper { /** * 通过用户ID删除用户和角色关联 diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysConfigService.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysConfigService.java index 949bf44c9..85341e95d 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysConfigService.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysConfigService.java @@ -1,6 +1,8 @@ package com.ruoyi.system.service; import java.util.List; + +import com.ruoyi.framework.web.base.AbstractBaseService; import com.ruoyi.system.domain.SysConfig; /** @@ -8,7 +10,7 @@ import com.ruoyi.system.domain.SysConfig; * * @author ruoyi */ -public interface ISysConfigService +public interface ISysConfigService extends AbstractBaseService { /** * 查询参数配置信息 diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysDeptService.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysDeptService.java index f8f3e3756..e7fef9e12 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysDeptService.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysDeptService.java @@ -2,6 +2,9 @@ package com.ruoyi.system.service; import java.util.List; import java.util.Map; + +import com.ruoyi.framework.web.base.AbstractBaseService; +import com.ruoyi.system.domain.SysConfig; import com.ruoyi.system.domain.SysDept; import com.ruoyi.system.domain.SysRole; @@ -10,7 +13,7 @@ import com.ruoyi.system.domain.SysRole; * * @author ruoyi */ -public interface ISysDeptService +public interface ISysDeptService extends AbstractBaseService { /** * 查询部门管理数据 diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysDictDataService.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysDictDataService.java index 68d68d812..b0a9cdeea 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysDictDataService.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysDictDataService.java @@ -1,6 +1,9 @@ package com.ruoyi.system.service; import java.util.List; + +import com.ruoyi.framework.web.base.AbstractBaseService; +import com.ruoyi.system.domain.SysDept; import com.ruoyi.system.domain.SysDictData; /** @@ -8,7 +11,7 @@ import com.ruoyi.system.domain.SysDictData; * * @author ruoyi */ -public interface ISysDictDataService +public interface ISysDictDataService extends AbstractBaseService { /** * 根据条件分页查询字典数据 diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysDictTypeService.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysDictTypeService.java index 0039de632..ee60bcd20 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysDictTypeService.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysDictTypeService.java @@ -1,6 +1,8 @@ package com.ruoyi.system.service; import java.util.List; + +import com.ruoyi.framework.web.base.AbstractBaseService; import com.ruoyi.system.domain.SysDictType; /** @@ -8,7 +10,7 @@ import com.ruoyi.system.domain.SysDictType; * * @author ruoyi */ -public interface ISysDictTypeService +public interface ISysDictTypeService extends AbstractBaseService { /** * 根据条件分页查询字典类型 diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysLogininforService.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysLogininforService.java index 8e292c25b..d99da5c69 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysLogininforService.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysLogininforService.java @@ -1,6 +1,8 @@ package com.ruoyi.system.service; import java.util.List; + +import com.ruoyi.framework.web.base.AbstractBaseService; import com.ruoyi.system.domain.SysLogininfor; /** @@ -8,7 +10,7 @@ import com.ruoyi.system.domain.SysLogininfor; * * @author ruoyi */ -public interface ISysLogininforService +public interface ISysLogininforService extends AbstractBaseService { /** * 新增系统登录日志 diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysMenuService.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysMenuService.java index cc6266912..490f2c2b8 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysMenuService.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysMenuService.java @@ -3,6 +3,8 @@ package com.ruoyi.system.service; import java.util.List; import java.util.Map; import java.util.Set; + +import com.ruoyi.framework.web.base.AbstractBaseService; import com.ruoyi.system.domain.SysMenu; import com.ruoyi.system.domain.SysRole; import com.ruoyi.system.domain.SysUser; @@ -12,7 +14,7 @@ import com.ruoyi.system.domain.SysUser; * * @author ruoyi */ -public interface ISysMenuService +public interface ISysMenuService extends AbstractBaseService { /** * 根据用户ID查询菜单 diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysNoticeService.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysNoticeService.java index abd6d7afc..e5c5745b8 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysNoticeService.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysNoticeService.java @@ -1,6 +1,8 @@ package com.ruoyi.system.service; import java.util.List; + +import com.ruoyi.framework.web.base.AbstractBaseService; import com.ruoyi.system.domain.SysNotice; /** @@ -8,7 +10,7 @@ import com.ruoyi.system.domain.SysNotice; * * @author ruoyi */ -public interface ISysNoticeService +public interface ISysNoticeService extends AbstractBaseService { /** * 查询公告信息 diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysOperLogService.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysOperLogService.java index 61efe6020..751e3dff0 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysOperLogService.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysOperLogService.java @@ -1,6 +1,8 @@ package com.ruoyi.system.service; import java.util.List; + +import com.ruoyi.framework.web.base.AbstractBaseService; import com.ruoyi.system.domain.SysOperLog; /** @@ -8,7 +10,7 @@ import com.ruoyi.system.domain.SysOperLog; * * @author ruoyi */ -public interface ISysOperLogService +public interface ISysOperLogService extends AbstractBaseService { /** * 新增操作日志 diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysPostService.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysPostService.java index bbf7b784f..470219e94 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysPostService.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysPostService.java @@ -1,6 +1,8 @@ package com.ruoyi.system.service; import java.util.List; + +import com.ruoyi.framework.web.base.AbstractBaseService; import com.ruoyi.system.domain.SysPost; /** @@ -8,7 +10,7 @@ import com.ruoyi.system.domain.SysPost; * * @author ruoyi */ -public interface ISysPostService +public interface ISysPostService extends AbstractBaseService { /** * 查询岗位信息集合 diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysRoleService.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysRoleService.java index 8f5853d28..b313d0bf1 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysRoleService.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysRoleService.java @@ -2,6 +2,8 @@ package com.ruoyi.system.service; import java.util.List; import java.util.Set; + +import com.ruoyi.framework.web.base.AbstractBaseService; import com.ruoyi.system.domain.SysRole; /** @@ -9,7 +11,7 @@ import com.ruoyi.system.domain.SysRole; * * @author ruoyi */ -public interface ISysRoleService +public interface ISysRoleService extends AbstractBaseService { /** * 根据条件分页查询角色数据 diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysUserOnlineService.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysUserOnlineService.java index 1ed908064..c9ac875c7 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysUserOnlineService.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysUserOnlineService.java @@ -2,6 +2,8 @@ package com.ruoyi.system.service; import java.util.Date; import java.util.List; + +import com.ruoyi.framework.web.base.AbstractBaseService; import com.ruoyi.system.domain.SysUserOnline; /** @@ -9,7 +11,7 @@ import com.ruoyi.system.domain.SysUserOnline; * * @author ruoyi */ -public interface ISysUserOnlineService +public interface ISysUserOnlineService extends AbstractBaseService { /** * 通过会话序号查询信息 diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysUserService.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysUserService.java index bdff6ee2c..9f1e86ae0 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysUserService.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysUserService.java @@ -1,6 +1,8 @@ package com.ruoyi.system.service; import java.util.List; + +import com.ruoyi.framework.web.base.AbstractBaseService; import com.ruoyi.system.domain.SysUser; /** @@ -8,7 +10,7 @@ import com.ruoyi.system.domain.SysUser; * * @author ruoyi */ -public interface ISysUserService +public interface ISysUserService extends AbstractBaseService { /** * 根据条件分页查询用户对象 diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysConfigServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysConfigServiceImpl.java index 9853f6137..23b30fb6d 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysConfigServiceImpl.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysConfigServiceImpl.java @@ -1,6 +1,8 @@ package com.ruoyi.system.service.impl; import java.util.List; + +import com.ruoyi.framework.web.base.AbstractBaseServiceImpl; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import com.ruoyi.common.constant.UserConstants; @@ -16,7 +18,7 @@ import com.ruoyi.system.service.ISysConfigService; * @author ruoyi */ @Service -public class SysConfigServiceImpl implements ISysConfigService +public class SysConfigServiceImpl extends AbstractBaseServiceImpl implements ISysConfigService { @Autowired private SysConfigMapper configMapper; @@ -59,6 +61,7 @@ public class SysConfigServiceImpl implements ISysConfigService @Override public List selectConfigList(SysConfig config) { + startPage(); return configMapper.selectConfigList(config); } diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysDeptServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysDeptServiceImpl.java index a26d130ab..26115edbc 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysDeptServiceImpl.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysDeptServiceImpl.java @@ -4,6 +4,10 @@ import java.util.ArrayList; import java.util.HashMap; import java.util.List; import java.util.Map; + +import com.ruoyi.framework.web.base.AbstractBaseServiceImpl; +import com.ruoyi.system.domain.SysConfig; +import com.ruoyi.system.mapper.SysConfigMapper; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import com.ruoyi.common.annotation.DataScope; @@ -20,7 +24,7 @@ import com.ruoyi.system.service.ISysDeptService; * @author ruoyi */ @Service -public class SysDeptServiceImpl implements ISysDeptService +public class SysDeptServiceImpl extends AbstractBaseServiceImpl implements ISysDeptService { @Autowired private SysDeptMapper deptMapper; @@ -34,7 +38,7 @@ public class SysDeptServiceImpl implements ISysDeptService @DataScope(tableAlias = "d") public List selectDeptList(SysDept dept) { - return deptMapper.selectDeptList(dept); + return mapper.selectDeptList(dept); } /** diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysDictDataServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysDictDataServiceImpl.java index 4f8ae61d4..cf4fd949d 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysDictDataServiceImpl.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysDictDataServiceImpl.java @@ -1,6 +1,10 @@ package com.ruoyi.system.service.impl; import java.util.List; + +import com.ruoyi.framework.web.base.AbstractBaseServiceImpl; +import com.ruoyi.system.domain.SysDept; +import com.ruoyi.system.mapper.SysDeptMapper; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import com.ruoyi.common.support.Convert; @@ -14,7 +18,7 @@ import com.ruoyi.system.service.ISysDictDataService; * @author ruoyi */ @Service -public class SysDictDataServiceImpl implements ISysDictDataService +public class SysDictDataServiceImpl extends AbstractBaseServiceImpl implements ISysDictDataService { @Autowired private SysDictDataMapper dictDataMapper; diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysDictTypeServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysDictTypeServiceImpl.java index 7baf3218f..6a46a3dc7 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysDictTypeServiceImpl.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysDictTypeServiceImpl.java @@ -1,6 +1,9 @@ package com.ruoyi.system.service.impl; import java.util.List; + +import com.ruoyi.framework.web.base.AbstractBaseServiceImpl; +import com.ruoyi.system.domain.SysDictData; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import com.ruoyi.common.constant.UserConstants; @@ -17,7 +20,7 @@ import com.ruoyi.system.service.ISysDictTypeService; * @author ruoyi */ @Service -public class SysDictTypeServiceImpl implements ISysDictTypeService +public class SysDictTypeServiceImpl extends AbstractBaseServiceImpl implements ISysDictTypeService { @Autowired private SysDictTypeMapper dictTypeMapper; diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysLogininforServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysLogininforServiceImpl.java index ca9f868c6..2fcc73f0a 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysLogininforServiceImpl.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysLogininforServiceImpl.java @@ -1,6 +1,10 @@ package com.ruoyi.system.service.impl; import java.util.List; + +import com.ruoyi.framework.web.base.AbstractBaseServiceImpl; +import com.ruoyi.system.domain.SysDictType; +import com.ruoyi.system.mapper.SysDictTypeMapper; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import com.ruoyi.common.support.Convert; @@ -14,7 +18,7 @@ import com.ruoyi.system.service.ISysLogininforService; * @author ruoyi */ @Service -public class SysLogininforServiceImpl implements ISysLogininforService +public class SysLogininforServiceImpl extends AbstractBaseServiceImpl implements ISysLogininforService { @Autowired diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysMenuServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysMenuServiceImpl.java index 85782e38d..da4cf1f05 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysMenuServiceImpl.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysMenuServiceImpl.java @@ -11,6 +11,10 @@ import java.util.LinkedList; import java.util.List; import java.util.Map; import java.util.Set; + +import com.ruoyi.framework.web.base.AbstractBaseServiceImpl; +import com.ruoyi.system.domain.SysLogininfor; +import com.ruoyi.system.mapper.SysLogininforMapper; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import com.ruoyi.common.constant.UserConstants; @@ -28,7 +32,7 @@ import com.ruoyi.system.service.ISysMenuService; * @author ruoyi */ @Service -public class SysMenuServiceImpl implements ISysMenuService +public class SysMenuServiceImpl extends AbstractBaseServiceImpl implements ISysMenuService { public static final String PREMISSION_STRING = "perms[\"{0}\"]"; diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysNoticeServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysNoticeServiceImpl.java index c8895a31c..361d3382c 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysNoticeServiceImpl.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysNoticeServiceImpl.java @@ -1,6 +1,10 @@ package com.ruoyi.system.service.impl; import java.util.List; + +import com.ruoyi.framework.web.base.AbstractBaseServiceImpl; +import com.ruoyi.system.domain.SysMenu; +import com.ruoyi.system.mapper.SysMenuMapper; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import com.ruoyi.common.support.Convert; @@ -15,7 +19,7 @@ import com.ruoyi.system.service.ISysNoticeService; * @date 2018-06-25 */ @Service -public class SysNoticeServiceImpl implements ISysNoticeService +public class SysNoticeServiceImpl extends AbstractBaseServiceImpl implements ISysNoticeService { @Autowired private SysNoticeMapper noticeMapper; diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysOperLogServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysOperLogServiceImpl.java index e8609abb5..1d7328095 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysOperLogServiceImpl.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysOperLogServiceImpl.java @@ -1,6 +1,10 @@ package com.ruoyi.system.service.impl; import java.util.List; + +import com.ruoyi.framework.web.base.AbstractBaseServiceImpl; +import com.ruoyi.system.domain.SysNotice; +import com.ruoyi.system.mapper.SysNoticeMapper; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import com.ruoyi.common.support.Convert; @@ -14,7 +18,7 @@ import com.ruoyi.system.service.ISysOperLogService; * @author ruoyi */ @Service -public class SysOperLogServiceImpl implements ISysOperLogService +public class SysOperLogServiceImpl extends AbstractBaseServiceImpl implements ISysOperLogService { @Autowired private SysOperLogMapper operLogMapper; diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysPostServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysPostServiceImpl.java index a88513ab9..e91b7bb05 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysPostServiceImpl.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysPostServiceImpl.java @@ -1,6 +1,10 @@ package com.ruoyi.system.service.impl; import java.util.List; + +import com.ruoyi.framework.web.base.AbstractBaseServiceImpl; +import com.ruoyi.system.domain.SysOperLog; +import com.ruoyi.system.mapper.SysOperLogMapper; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import com.ruoyi.common.constant.UserConstants; @@ -17,7 +21,7 @@ import com.ruoyi.system.service.ISysPostService; * @author ruoyi */ @Service -public class SysPostServiceImpl implements ISysPostService +public class SysPostServiceImpl extends AbstractBaseServiceImpl implements ISysPostService { @Autowired private SysPostMapper postMapper; @@ -34,6 +38,7 @@ public class SysPostServiceImpl implements ISysPostService @Override public List selectPostList(SysPost post) { + startPage(); return postMapper.selectPostList(post); } diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysRoleServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysRoleServiceImpl.java index 045f36482..77d331a24 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysRoleServiceImpl.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysRoleServiceImpl.java @@ -5,6 +5,10 @@ import java.util.Arrays; import java.util.HashSet; import java.util.List; import java.util.Set; + +import com.ruoyi.framework.web.base.AbstractBaseServiceImpl; +import com.ruoyi.system.domain.SysPost; +import com.ruoyi.system.mapper.*; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import com.ruoyi.common.annotation.DataScope; @@ -14,10 +18,6 @@ import com.ruoyi.common.utils.StringUtils; import com.ruoyi.system.domain.SysRole; import com.ruoyi.system.domain.SysRoleDept; import com.ruoyi.system.domain.SysRoleMenu; -import com.ruoyi.system.mapper.SysRoleDeptMapper; -import com.ruoyi.system.mapper.SysRoleMapper; -import com.ruoyi.system.mapper.SysRoleMenuMapper; -import com.ruoyi.system.mapper.SysUserRoleMapper; import com.ruoyi.system.service.ISysRoleService; /** @@ -26,7 +26,7 @@ import com.ruoyi.system.service.ISysRoleService; * @author ruoyi */ @Service -public class SysRoleServiceImpl implements ISysRoleService +public class SysRoleServiceImpl extends AbstractBaseServiceImpl implements ISysRoleService { @Autowired private SysRoleMapper roleMapper; @@ -50,6 +50,7 @@ public class SysRoleServiceImpl implements ISysRoleService @DataScope(tableAlias = "u") public List selectRoleList(SysRole role) { + startPage(); return roleMapper.selectRoleList(role); } diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserOnlineServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserOnlineServiceImpl.java index b9d6f1d24..fc43b759d 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserOnlineServiceImpl.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserOnlineServiceImpl.java @@ -2,6 +2,10 @@ package com.ruoyi.system.service.impl; import java.util.Date; import java.util.List; + +import com.ruoyi.framework.web.base.AbstractBaseServiceImpl; +import com.ruoyi.system.domain.SysRole; +import com.ruoyi.system.mapper.SysRoleMapper; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import com.ruoyi.common.utils.DateUtils; @@ -16,7 +20,7 @@ import com.ruoyi.system.service.ISysUserOnlineService; * @author ruoyi */ @Service -public class SysUserOnlineServiceImpl implements ISysUserOnlineService +public class SysUserOnlineServiceImpl extends AbstractBaseServiceImpl implements ISysUserOnlineService { @Autowired private SysUserOnlineMapper userOnlineDao; diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java index b4ecfb4c1..4bb78686b 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java @@ -2,22 +2,16 @@ package com.ruoyi.system.service.impl; import java.util.ArrayList; import java.util.List; + +import com.ruoyi.framework.web.base.AbstractBaseServiceImpl; +import com.ruoyi.system.domain.*; +import com.ruoyi.system.mapper.*; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import com.ruoyi.common.annotation.DataScope; import com.ruoyi.common.constant.UserConstants; import com.ruoyi.common.support.Convert; import com.ruoyi.common.utils.StringUtils; -import com.ruoyi.system.domain.SysPost; -import com.ruoyi.system.domain.SysRole; -import com.ruoyi.system.domain.SysUser; -import com.ruoyi.system.domain.SysUserPost; -import com.ruoyi.system.domain.SysUserRole; -import com.ruoyi.system.mapper.SysPostMapper; -import com.ruoyi.system.mapper.SysRoleMapper; -import com.ruoyi.system.mapper.SysUserMapper; -import com.ruoyi.system.mapper.SysUserPostMapper; -import com.ruoyi.system.mapper.SysUserRoleMapper; import com.ruoyi.system.service.ISysUserService; /** @@ -26,7 +20,7 @@ import com.ruoyi.system.service.ISysUserService; * @author ruoyi */ @Service -public class SysUserServiceImpl implements ISysUserService +public class SysUserServiceImpl extends AbstractBaseServiceImpl implements ISysUserService { @Autowired private SysUserMapper userMapper; @@ -54,6 +48,7 @@ public class SysUserServiceImpl implements ISysUserService @DataScope(tableAlias = "u") public List selectUserList(SysUser user) { + startPage(); return userMapper.selectUserList(user); }