From 29f17bf686ebfb767a0f79f12f30a503a0e434c4 Mon Sep 17 00:00:00 2001 From: dongzeliang <2746733890@qq.com> Date: Mon, 13 Nov 2023 14:18:13 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8A=A0=E5=85=A5Mybatis-plus?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 105 +--------- .../muyu/gen/mapper/GenTableColumnMapper.java | 3 +- .../com/muyu/gen/mapper/GenTableMapper.java | 3 +- .../com/muyu/job/mapper/SysJobLogMapper.java | 3 +- .../com/muyu/job/mapper/SysJobMapper.java | 3 +- .../controller/SysConfigController.java | 21 +- .../controller/SysConfigPlusController.java | 118 ----------- .../system/controller/SysDeptController.java | 5 +- .../controller/SysDictDataController.java | 8 +- .../controller/SysDictTypeController.java | 4 +- .../controller/SysLogininforController.java | 4 +- .../system/controller/SysMenuController.java | 4 +- .../controller/SysNoticeController.java | 4 +- .../controller/SysOperlogController.java | 4 +- .../system/controller/SysPostController.java | 4 +- .../controller/SysProfileController.java | 4 +- .../system/controller/SysRoleController.java | 12 +- .../system/controller/SysUserController.java | 12 +- .../controller/SysUserOnlineController.java | 4 +- .../muyu/system/mapper/SysConfigMapper.java | 82 +------- .../system/mapper/SysConfigPlusMapper.java | 12 -- .../com/muyu/system/mapper/SysDeptMapper.java | 3 +- .../muyu/system/mapper/SysDictDataMapper.java | 3 +- .../muyu/system/mapper/SysDictTypeMapper.java | 3 +- .../system/mapper/SysLogininforMapper.java | 3 +- .../com/muyu/system/mapper/SysMenuMapper.java | 3 +- .../muyu/system/mapper/SysNoticeMapper.java | 3 +- .../muyu/system/mapper/SysOperLogMapper.java | 3 +- .../com/muyu/system/mapper/SysPostMapper.java | 3 +- .../muyu/system/mapper/SysRoleDeptMapper.java | 3 +- .../com/muyu/system/mapper/SysRoleMapper.java | 3 +- .../muyu/system/mapper/SysRoleMenuMapper.java | 3 +- .../com/muyu/system/mapper/SysUserMapper.java | 3 +- .../muyu/system/mapper/SysUserPostMapper.java | 3 +- .../muyu/system/mapper/SysUserRoleMapper.java | 3 +- .../system/service/ISysConfigService.java | 88 --------- ...PlusService.java => SysConfigService.java} | 3 +- ...ysDeptService.java => SysDeptService.java} | 3 +- ...taService.java => SysDictDataService.java} | 3 +- ...peService.java => SysDictTypeService.java} | 3 +- ...Service.java => SysLogininforService.java} | 3 +- ...ysMenuService.java => SysMenuService.java} | 3 +- ...ticeService.java => SysNoticeService.java} | 3 +- ...LogService.java => SysOperLogService.java} | 3 +- ...Service.java => SysPermissionService.java} | 2 +- ...ysPostService.java => SysPostService.java} | 3 +- ...ysRoleService.java => SysRoleService.java} | 3 +- ...Service.java => SysUserOnlineService.java} | 3 +- ...ysUserService.java => SysUserService.java} | 3 +- .../impl/SysConfigPlusServiceImpl.java | 114 ----------- .../service/impl/SysConfigServiceImpl.java | 187 +++++------------- .../service/impl/SysDeptServiceImpl.java | 5 +- .../service/impl/SysDictDataServiceImpl.java | 5 +- .../service/impl/SysDictTypeServiceImpl.java | 5 +- .../impl/SysLogininforServiceImpl.java | 5 +- .../service/impl/SysMenuServiceImpl.java | 5 +- .../service/impl/SysNoticeServiceImpl.java | 5 +- .../service/impl/SysOperLogServiceImpl.java | 5 +- .../impl/SysPermissionServiceImpl.java | 13 +- .../service/impl/SysPostServiceImpl.java | 5 +- .../service/impl/SysRoleServiceImpl.java | 5 +- .../impl/SysUserOnlineServiceImpl.java | 5 +- .../service/impl/SysUserServiceImpl.java | 9 +- 63 files changed, 205 insertions(+), 755 deletions(-) delete mode 100644 muyu-modules/muyu-system/src/main/java/com/muyu/system/controller/SysConfigPlusController.java delete mode 100644 muyu-modules/muyu-system/src/main/java/com/muyu/system/mapper/SysConfigPlusMapper.java delete mode 100644 muyu-modules/muyu-system/src/main/java/com/muyu/system/service/ISysConfigService.java rename muyu-modules/muyu-system/src/main/java/com/muyu/system/service/{SysConfigPlusService.java => SysConfigService.java} (87%) rename muyu-modules/muyu-system/src/main/java/com/muyu/system/service/{ISysDeptService.java => SysDeptService.java} (95%) rename muyu-modules/muyu-system/src/main/java/com/muyu/system/service/{ISysDictDataService.java => SysDictDataService.java} (91%) rename muyu-modules/muyu-system/src/main/java/com/muyu/system/service/{ISysDictTypeService.java => SysDictTypeService.java} (94%) rename muyu-modules/muyu-system/src/main/java/com/muyu/system/service/{ISysLogininforService.java => SysLogininforService.java} (86%) rename muyu-modules/muyu-system/src/main/java/com/muyu/system/service/{ISysMenuService.java => SysMenuService.java} (96%) rename muyu-modules/muyu-system/src/main/java/com/muyu/system/service/{ISysNoticeService.java => SysNoticeService.java} (90%) rename muyu-modules/muyu-system/src/main/java/com/muyu/system/service/{ISysOperLogService.java => SysOperLogService.java} (88%) rename muyu-modules/muyu-system/src/main/java/com/muyu/system/service/{ISysPermissionService.java => SysPermissionService.java} (92%) rename muyu-modules/muyu-system/src/main/java/com/muyu/system/service/{ISysPostService.java => SysPostService.java} (94%) rename muyu-modules/muyu-system/src/main/java/com/muyu/system/service/{ISysRoleService.java => SysRoleService.java} (96%) rename muyu-modules/muyu-system/src/main/java/com/muyu/system/service/{ISysUserOnlineService.java => SysUserOnlineService.java} (92%) rename muyu-modules/muyu-system/src/main/java/com/muyu/system/service/{ISysUserService.java => SysUserService.java} (97%) delete mode 100644 muyu-modules/muyu-system/src/main/java/com/muyu/system/service/impl/SysConfigPlusServiceImpl.java diff --git a/README.md b/README.md index 532868e..cf4627d 100644 --- a/README.md +++ b/README.md @@ -1,29 +1,3 @@ -

- logo -

-

MuYu v3.6.3

-

基于 Vue/Element UI 和 Spring Boot/Spring Cloud & Alibaba 前后端分离的分布式微服务架构

-

- - - -

- -## 平台简介 - -若依是一套全部开源的快速开发平台，毫无保留给个人及企业免费使用。 - -* 采用前后端分离的模式，微服务版本前端(基于 [MuYu-Vue](https://gitee.com/y_project/MuYu-Vue))。 -* 后端采用Spring Boot、Spring Cloud & Alibaba。 -* 注册中心、配置中心选型Nacos，权限认证使用Redis。 -* 流量控制框架选型Sentinel，分布式事务选型Seata。 -* 提供了技术栈（[Vue3](https://v3.cn.vuejs.org) [Element Plus](https://element-plus.org/zh-CN) [Vite](https://cn.vitejs.dev)）版本[MuYu-Cloud-Vue3](https://github.com/yangzongzhuan/MuYu-Cloud-Vue3)，保持同步更新。 -* 如需不分离应用，请移步 [MuYu](https://gitee.com/y_project/MuYu)，如需分离应用，请移步 [MuYu-Vue](https://gitee.com/y_project/MuYu-Vue) -* 阿里云折扣场：[点我进入](http://aly.muyu.vip)，腾讯云秒杀场：[点我进入](http://txy.muyu.vip)   -* 阿里云优惠券：[点我领取](https://www.aliyun.com/minisite/goods?userCode=brki8iof&share_source=copy_link)，腾讯云优惠券：[点我领取](https://cloud.tencent.com/redirect.php?redirect=1025&cps_key=198c8df2ed259157187173bc7f4f32fd&from=console)   - -#### 友情链接 [若依/MuYu-Cloud](https://gitee.com/zhangmrit/muyu-cloud) Ant Design版本。 - ## 系统模块 ~~~ @@ -40,6 +14,7 @@ com.muyu │ └── muyu-common-seata // 分布式事务 │ └── muyu-common-security // 安全模块 │ └── muyu-common-swagger // 系统接口 +│ └── muyu-common-system // 系统基础 ├── muyu-modules // 业务模块 │ └── muyu-system // 系统模块 [9201] │ └── muyu-gen // 代码生成 [9202] @@ -49,81 +24,3 @@ com.muyu │ └── muyu-visual-monitor // 监控中心 [9100] ├──pom.xml // 公共依赖 ~~~ - -## 架构图 - - - -## 内置功能 - -1. 用户管理：用户是系统操作者，该功能主要完成系统用户配置。 -2. 部门管理：配置系统组织机构（公司、部门、小组），树结构展现支持数据权限。 -3. 岗位管理：配置系统用户所属担任职务。 -4. 菜单管理：配置系统菜单，操作权限，按钮权限标识等。 -5. 角色管理：角色菜单权限分配、设置角色按机构进行数据范围权限划分。 -6. 字典管理：对系统中经常使用的一些较为固定的数据进行维护。 -7. 参数管理：对系统动态配置常用参数。 -8. 通知公告：系统通知公告信息发布维护。 -9. 操作日志：系统正常操作日志记录和查询；系统异常信息日志记录和查询。 -10. 登录日志：系统登录日志记录查询包含登录异常。 -11. 在线用户：当前系统中活跃用户状态监控。 -12. 定时任务：在线（添加、修改、删除)任务调度包含执行结果日志。 -13. 代码生成：前后端代码的生成（java、html、xml、sql）支持CRUD下载 。 -14. 系统接口：根据业务代码自动生成相关的api接口文档。 -15. 服务监控：监视当前系统CPU、内存、磁盘、堆栈等相关信息。 -16. 在线构建器：拖动表单元素生成相应的HTML代码。 -17. 连接池监视：监视当前系统数据库连接池状态，可进行分析SQL找出系统性能瓶颈。 - -## 在线体验 - -- admin/admin123 -- 陆陆续续收到一些打赏，为了更好的体验已用于演示服务器升级。谢谢各位小伙伴。 - -演示地址：http://muyu.vip -文档地址：http://doc.muyu.vip - -## 演示图 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - -## 若依微服务交流群 - -QQ群： [![加入QQ群](https://img.shields.io/badge/已满-42799195-blue.svg)](https://jq.qq.com/?_wv=1027&k=yqInfq0S) [![加入QQ群](https://img.shields.io/badge/已满-170157040-blue.svg)](https://jq.qq.com/?_wv=1027&k=Oy1mb3p8) [![加入QQ群](https://img.shields.io/badge/已满-130643120-blue.svg)](https://jq.qq.com/?_wv=1027&k=rvxkJtXK) [![加入QQ群](https://img.shields.io/badge/已满-225920371-blue.svg)](https://jq.qq.com/?_wv=1027&k=0Ck3PvTe) [![加入QQ群](https://img.shields.io/badge/已满-201705537-blue.svg)](https://jq.qq.com/?_wv=1027&k=FnHHP4TT) [![加入QQ群](https://img.shields.io/badge/已满-236543183-blue.svg)](https://jq.qq.com/?_wv=1027&k=qdT1Ojpz) [![加入QQ群](https://img.shields.io/badge/已满-213618602-blue.svg)](https://jq.qq.com/?_wv=1027&k=nw3OiyXs) [![加入QQ群](https://img.shields.io/badge/已满-148794840-blue.svg)](https://jq.qq.com/?_wv=1027&k=kiU5WDls) [![加入QQ群](https://img.shields.io/badge/已满-118752664-blue.svg)](https://jq.qq.com/?_wv=1027&k=MtBy6YfT) [![加入QQ群](https://img.shields.io/badge/已满-101038945-blue.svg)](https://jq.qq.com/?_wv=1027&k=FqImHgH2) [![加入QQ群](https://img.shields.io/badge/128355254-blue.svg)](http://qm.qq.com/cgi-bin/qm/qr?_wv=1027&k=G4jZ4EtdT50PhnMBudTnEwgonxkXOscJ&authKey=FkGHYfoTKlGE6wHdKdjH9bVoOgQjtLP9WM%2Fj7pqGY1msoqw9uxDiBo39E2mLgzYg&noverify=0&group_code=128355254) 点击按钮入群。 diff --git a/muyu-modules/muyu-gen/src/main/java/com/muyu/gen/mapper/GenTableColumnMapper.java b/muyu-modules/muyu-gen/src/main/java/com/muyu/gen/mapper/GenTableColumnMapper.java index 745122c..5825d59 100644 --- a/muyu-modules/muyu-gen/src/main/java/com/muyu/gen/mapper/GenTableColumnMapper.java +++ b/muyu-modules/muyu-gen/src/main/java/com/muyu/gen/mapper/GenTableColumnMapper.java @@ -1,5 +1,6 @@ package com.muyu.gen.mapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.muyu.gen.domain.GenTableColumn; import java.util.List; @@ -9,7 +10,7 @@ import java.util.List; * * @author muyu */ -public interface GenTableColumnMapper { +public interface GenTableColumnMapper extends BaseMapper { /** * 根据表名称查询列信息 * diff --git a/muyu-modules/muyu-gen/src/main/java/com/muyu/gen/mapper/GenTableMapper.java b/muyu-modules/muyu-gen/src/main/java/com/muyu/gen/mapper/GenTableMapper.java index 3a97b69..66858cb 100644 --- a/muyu-modules/muyu-gen/src/main/java/com/muyu/gen/mapper/GenTableMapper.java +++ b/muyu-modules/muyu-gen/src/main/java/com/muyu/gen/mapper/GenTableMapper.java @@ -1,5 +1,6 @@ package com.muyu.gen.mapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.muyu.gen.domain.GenTable; import java.util.List; @@ -9,7 +10,7 @@ import java.util.List; * * @author muyu */ -public interface GenTableMapper { +public interface GenTableMapper extends BaseMapper { /** * 查询业务列表 * diff --git a/muyu-modules/muyu-job/src/main/java/com/muyu/job/mapper/SysJobLogMapper.java b/muyu-modules/muyu-job/src/main/java/com/muyu/job/mapper/SysJobLogMapper.java index a8ec076..675b15d 100644 --- a/muyu-modules/muyu-job/src/main/java/com/muyu/job/mapper/SysJobLogMapper.java +++ b/muyu-modules/muyu-job/src/main/java/com/muyu/job/mapper/SysJobLogMapper.java @@ -1,5 +1,6 @@ package com.muyu.job.mapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.muyu.job.domain.SysJobLog; import java.util.List; @@ -9,7 +10,7 @@ import java.util.List; * * @author muyu */ -public interface SysJobLogMapper { +public interface SysJobLogMapper extends BaseMapper { /** * 获取quartz调度器日志的计划任务 * diff --git a/muyu-modules/muyu-job/src/main/java/com/muyu/job/mapper/SysJobMapper.java b/muyu-modules/muyu-job/src/main/java/com/muyu/job/mapper/SysJobMapper.java index d9a4cd9..84e9fa4 100644 --- a/muyu-modules/muyu-job/src/main/java/com/muyu/job/mapper/SysJobMapper.java +++ b/muyu-modules/muyu-job/src/main/java/com/muyu/job/mapper/SysJobMapper.java @@ -1,5 +1,6 @@ package com.muyu.job.mapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.muyu.job.domain.SysJob; import java.util.List; @@ -9,7 +10,7 @@ import java.util.List; * * @author muyu */ -public interface SysJobMapper { +public interface SysJobMapper extends BaseMapper { /** * 查询调度任务日志集合 * diff --git a/muyu-modules/muyu-system/src/main/java/com/muyu/system/controller/SysConfigController.java b/muyu-modules/muyu-system/src/main/java/com/muyu/system/controller/SysConfigController.java index ba0c897..fdabe7a 100644 --- a/muyu-modules/muyu-system/src/main/java/com/muyu/system/controller/SysConfigController.java +++ b/muyu-modules/muyu-system/src/main/java/com/muyu/system/controller/SysConfigController.java @@ -1,21 +1,21 @@ package com.muyu.system.controller; +import com.muyu.common.core.domain.Result; import com.muyu.common.core.utils.poi.ExcelUtil; import com.muyu.common.core.web.controller.BaseController; -import com.muyu.common.core.domain.Result; import com.muyu.common.core.web.page.TableDataInfo; import com.muyu.common.log.annotation.Log; import com.muyu.common.log.enums.BusinessType; import com.muyu.common.security.annotation.RequiresPermissions; import com.muyu.common.security.utils.SecurityUtils; import com.muyu.system.domain.SysConfig; -import com.muyu.system.service.ISysConfigService; -import org.apache.poi.ss.formula.functions.T; +import com.muyu.system.service.SysConfigService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; import javax.servlet.http.HttpServletResponse; +import java.util.Arrays; import java.util.List; /** @@ -26,8 +26,9 @@ import java.util.List; @RestController @RequestMapping("/config") public class SysConfigController extends BaseController { + @Autowired - private ISysConfigService configService; + private SysConfigService configService; /** * 获取参数配置列表 @@ -36,7 +37,7 @@ public class SysConfigController extends BaseController { @GetMapping("/list") public Result> list (SysConfig config) { startPage(); - List list = configService.selectConfigList(config); + List list = configService.pageQuery(config); return getDataTable(list); } @@ -44,7 +45,7 @@ public class SysConfigController extends BaseController { @RequiresPermissions("system:config:export") @PostMapping("/export") public void export (HttpServletResponse response, SysConfig config) { - List list = configService.selectConfigList(config); + List list = configService.pageQuery(config); ExcelUtil util = new ExcelUtil(SysConfig.class); util.exportExcel(response, list, "参数数据"); } @@ -54,7 +55,7 @@ public class SysConfigController extends BaseController { */ @GetMapping(value = "/{configId}") public Result getInfo (@PathVariable Long configId) { - return success(configService.selectConfigById(configId)); + return success(configService.getById(configId)); } /** @@ -76,7 +77,7 @@ public class SysConfigController extends BaseController { return error("新增参数'" + config.getConfigName() + "'失败，参数键名已存在"); } config.setCreateBy(SecurityUtils.getUsername()); - return toAjax(configService.insertConfig(config)); + return toAjax(configService.save(config)); } /** @@ -90,7 +91,7 @@ public class SysConfigController extends BaseController { return error("修改参数'" + config.getConfigName() + "'失败，参数键名已存在"); } config.setUpdateBy(SecurityUtils.getUsername()); - return toAjax(configService.updateConfig(config)); + return toAjax(configService.updateById(config)); } /** @@ -100,7 +101,7 @@ public class SysConfigController extends BaseController { @Log(title = "参数管理", businessType = BusinessType.DELETE) @DeleteMapping("/{configIds}") public Result remove (@PathVariable Long[] configIds) { - configService.deleteConfigByIds(configIds); + configService.removeBatchByIds(Arrays.asList(configIds)); return success(); } diff --git a/muyu-modules/muyu-system/src/main/java/com/muyu/system/controller/SysConfigPlusController.java b/muyu-modules/muyu-system/src/main/java/com/muyu/system/controller/SysConfigPlusController.java deleted file mode 100644 index 1299b6b..0000000 --- a/muyu-modules/muyu-system/src/main/java/com/muyu/system/controller/SysConfigPlusController.java +++ /dev/null @@ -1,118 +0,0 @@ -package com.muyu.system.controller; - -import com.muyu.common.core.domain.Result; -import com.muyu.common.core.utils.poi.ExcelUtil; -import com.muyu.common.core.web.controller.BaseController; -import com.muyu.common.core.web.domain.BaseEntity; -import com.muyu.common.core.web.page.TableDataInfo; -import com.muyu.common.log.annotation.Log; -import com.muyu.common.log.enums.BusinessType; -import com.muyu.common.security.annotation.RequiresPermissions; -import com.muyu.common.security.utils.SecurityUtils; -import com.muyu.system.domain.SysConfig; -import com.muyu.system.service.SysConfigPlusService; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.validation.annotation.Validated; -import org.springframework.web.bind.annotation.*; - -import javax.servlet.http.HttpServletResponse; -import java.util.Arrays; -import java.util.List; - -/** - * 参数配置 信息操作处理 - * - * @author muyu - */ -@RestController -@RequestMapping("/config/plus") -public class SysConfigPlusController extends BaseController { - @Autowired - private SysConfigPlusService configService; - - /** - * 获取参数配置列表 - */ - @RequiresPermissions("system:config:list") - @GetMapping("/list") - public Result> list (SysConfig config) { - startPage(); - List list = configService.pageQuery(config); - return getDataTable(list); - } - - @Log(title = "参数管理", businessType = BusinessType.EXPORT) - @RequiresPermissions("system:config:export") - @PostMapping("/export") - public void export (HttpServletResponse response, SysConfig config) { - List list = configService.pageQuery(config); - ExcelUtil util = new ExcelUtil(SysConfig.class); - util.exportExcel(response, list, "参数数据"); - } - - /** - * 根据参数编号获取详细信息 - */ - @GetMapping(value = "/{configId}") - public Result getInfo (@PathVariable Long configId) { - return success(configService.getById(configId)); - } - - /** - * 根据参数键名查询参数值 - */ - @GetMapping(value = "/configKey/{configKey}") - public Result getConfigKey (@PathVariable String configKey) { - return success(configService.selectConfigByKey(configKey)); - } - - /** - * 新增参数配置 - */ - @RequiresPermissions("system:config:add") - @Log(title = "参数管理", businessType = BusinessType.INSERT) - @PostMapping - public Result add (@Validated @RequestBody SysConfig config) { - if (!configService.checkConfigKeyUnique(config)) { - return error("新增参数'" + config.getConfigName() + "'失败，参数键名已存在"); - } - config.setCreateBy(SecurityUtils.getUsername()); - return toAjax(configService.save(config)); - } - - /** - * 修改参数配置 - */ - @RequiresPermissions("system:config:edit") - @Log(title = "参数管理", businessType = BusinessType.UPDATE) - @PutMapping - public Result edit (@Validated @RequestBody SysConfig config) { - if (!configService.checkConfigKeyUnique(config)) { - return error("修改参数'" + config.getConfigName() + "'失败，参数键名已存在"); - } - config.setUpdateBy(SecurityUtils.getUsername()); - return toAjax(configService.updateById(config)); - } - - /** - * 删除参数配置 - */ - @RequiresPermissions("system:config:remove") - @Log(title = "参数管理", businessType = BusinessType.DELETE) - @DeleteMapping("/{configIds}") - public Result remove (@PathVariable Long[] configIds) { - configService.removeBatchByIds(Arrays.asList(configIds)); - return success(); - } - - /** - * 刷新参数缓存 - */ - @RequiresPermissions("system:config:remove") - @Log(title = "参数管理", businessType = BusinessType.CLEAN) - @DeleteMapping("/refreshCache") - public Result refreshCache () { - configService.resetConfigCache(); - return success(); - } -} diff --git a/muyu-modules/muyu-system/src/main/java/com/muyu/system/controller/SysDeptController.java b/muyu-modules/muyu-system/src/main/java/com/muyu/system/controller/SysDeptController.java index a25f8d0..f1ed572 100644 --- a/muyu-modules/muyu-system/src/main/java/com/muyu/system/controller/SysDeptController.java +++ b/muyu-modules/muyu-system/src/main/java/com/muyu/system/controller/SysDeptController.java @@ -9,7 +9,7 @@ import com.muyu.common.log.enums.BusinessType; import com.muyu.common.security.annotation.RequiresPermissions; import com.muyu.common.security.utils.SecurityUtils; import com.muyu.common.system.domain.SysDept; -import com.muyu.system.service.ISysDeptService; +import com.muyu.system.service.SysDeptService; import org.apache.commons.lang3.ArrayUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.validation.annotation.Validated; @@ -25,8 +25,9 @@ import java.util.List; @RestController @RequestMapping("/dept") public class SysDeptController extends BaseController { + @Autowired - private ISysDeptService deptService; + private SysDeptService deptService; /** * 获取部门列表 diff --git a/muyu-modules/muyu-system/src/main/java/com/muyu/system/controller/SysDictDataController.java b/muyu-modules/muyu-system/src/main/java/com/muyu/system/controller/SysDictDataController.java index b8e04b9..418ce2a 100644 --- a/muyu-modules/muyu-system/src/main/java/com/muyu/system/controller/SysDictDataController.java +++ b/muyu-modules/muyu-system/src/main/java/com/muyu/system/controller/SysDictDataController.java @@ -10,8 +10,8 @@ import com.muyu.common.log.enums.BusinessType; import com.muyu.common.security.annotation.RequiresPermissions; import com.muyu.common.security.utils.SecurityUtils; import com.muyu.common.system.domain.SysDictData; -import com.muyu.system.service.ISysDictDataService; -import com.muyu.system.service.ISysDictTypeService; +import com.muyu.system.service.SysDictDataService; +import com.muyu.system.service.SysDictTypeService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; @@ -29,10 +29,10 @@ import java.util.List; @RequestMapping("/dict/data") public class SysDictDataController extends BaseController { @Autowired - private ISysDictDataService dictDataService; + private SysDictDataService dictDataService; @Autowired - private ISysDictTypeService dictTypeService; + private SysDictTypeService dictTypeService; @RequiresPermissions("system:dict:list") @GetMapping("/list") diff --git a/muyu-modules/muyu-system/src/main/java/com/muyu/system/controller/SysDictTypeController.java b/muyu-modules/muyu-system/src/main/java/com/muyu/system/controller/SysDictTypeController.java index 4633dc1..4d1325c 100644 --- a/muyu-modules/muyu-system/src/main/java/com/muyu/system/controller/SysDictTypeController.java +++ b/muyu-modules/muyu-system/src/main/java/com/muyu/system/controller/SysDictTypeController.java @@ -9,7 +9,7 @@ import com.muyu.common.log.enums.BusinessType; import com.muyu.common.security.annotation.RequiresPermissions; import com.muyu.common.security.utils.SecurityUtils; import com.muyu.common.system.domain.SysDictType; -import com.muyu.system.service.ISysDictTypeService; +import com.muyu.system.service.SysDictTypeService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; @@ -26,7 +26,7 @@ import java.util.List; @RequestMapping("/dict/type") public class SysDictTypeController extends BaseController { @Autowired - private ISysDictTypeService dictTypeService; + private SysDictTypeService dictTypeService; @RequiresPermissions("system:dict:list") @GetMapping("/list") diff --git a/muyu-modules/muyu-system/src/main/java/com/muyu/system/controller/SysLogininforController.java b/muyu-modules/muyu-system/src/main/java/com/muyu/system/controller/SysLogininforController.java index c67119b..7a4e5ac 100644 --- a/muyu-modules/muyu-system/src/main/java/com/muyu/system/controller/SysLogininforController.java +++ b/muyu-modules/muyu-system/src/main/java/com/muyu/system/controller/SysLogininforController.java @@ -11,7 +11,7 @@ import com.muyu.common.redis.service.RedisService; import com.muyu.common.security.annotation.InnerAuth; import com.muyu.common.security.annotation.RequiresPermissions; import com.muyu.common.system.domain.SysLogininfor; -import com.muyu.system.service.ISysLogininforService; +import com.muyu.system.service.SysLogininforService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; @@ -27,7 +27,7 @@ import java.util.List; @RequestMapping("/logininfor") public class SysLogininforController extends BaseController { @Autowired - private ISysLogininforService logininforService; + private SysLogininforService logininforService; @Autowired private RedisService redisService; diff --git a/muyu-modules/muyu-system/src/main/java/com/muyu/system/controller/SysMenuController.java b/muyu-modules/muyu-system/src/main/java/com/muyu/system/controller/SysMenuController.java index 75d8cbe..c22f798 100644 --- a/muyu-modules/muyu-system/src/main/java/com/muyu/system/controller/SysMenuController.java +++ b/muyu-modules/muyu-system/src/main/java/com/muyu/system/controller/SysMenuController.java @@ -10,7 +10,7 @@ import com.muyu.common.security.annotation.RequiresPermissions; import com.muyu.common.security.utils.SecurityUtils; import com.muyu.system.domain.SysMenu; import com.muyu.system.domain.resp.RoleMenuTreeResp; -import com.muyu.system.service.ISysMenuService; +import com.muyu.system.service.SysMenuService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; @@ -26,7 +26,7 @@ import java.util.List; @RequestMapping("/menu") public class SysMenuController extends BaseController { @Autowired - private ISysMenuService menuService; + private SysMenuService menuService; /** * 获取菜单列表 diff --git a/muyu-modules/muyu-system/src/main/java/com/muyu/system/controller/SysNoticeController.java b/muyu-modules/muyu-system/src/main/java/com/muyu/system/controller/SysNoticeController.java index de28fe8..9706350 100644 --- a/muyu-modules/muyu-system/src/main/java/com/muyu/system/controller/SysNoticeController.java +++ b/muyu-modules/muyu-system/src/main/java/com/muyu/system/controller/SysNoticeController.java @@ -8,7 +8,7 @@ import com.muyu.common.log.enums.BusinessType; import com.muyu.common.security.annotation.RequiresPermissions; import com.muyu.common.security.utils.SecurityUtils; import com.muyu.system.domain.SysNotice; -import com.muyu.system.service.ISysNoticeService; +import com.muyu.system.service.SysNoticeService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; @@ -24,7 +24,7 @@ import java.util.List; @RequestMapping("/notice") public class SysNoticeController extends BaseController { @Autowired - private ISysNoticeService noticeService; + private SysNoticeService noticeService; /** * 获取通知公告列表 diff --git a/muyu-modules/muyu-system/src/main/java/com/muyu/system/controller/SysOperlogController.java b/muyu-modules/muyu-system/src/main/java/com/muyu/system/controller/SysOperlogController.java index bfaffaf..add3ba5 100644 --- a/muyu-modules/muyu-system/src/main/java/com/muyu/system/controller/SysOperlogController.java +++ b/muyu-modules/muyu-system/src/main/java/com/muyu/system/controller/SysOperlogController.java @@ -9,7 +9,7 @@ import com.muyu.common.log.enums.BusinessType; import com.muyu.common.security.annotation.InnerAuth; import com.muyu.common.security.annotation.RequiresPermissions; import com.muyu.common.system.domain.SysOperLog; -import com.muyu.system.service.ISysOperLogService; +import com.muyu.system.service.SysOperLogService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; @@ -25,7 +25,7 @@ import java.util.List; @RequestMapping("/operlog") public class SysOperlogController extends BaseController { @Autowired - private ISysOperLogService operLogService; + private SysOperLogService operLogService; @RequiresPermissions("system:operlog:list") @GetMapping("/list") diff --git a/muyu-modules/muyu-system/src/main/java/com/muyu/system/controller/SysPostController.java b/muyu-modules/muyu-system/src/main/java/com/muyu/system/controller/SysPostController.java index 190c310..f9da917 100644 --- a/muyu-modules/muyu-system/src/main/java/com/muyu/system/controller/SysPostController.java +++ b/muyu-modules/muyu-system/src/main/java/com/muyu/system/controller/SysPostController.java @@ -9,7 +9,7 @@ import com.muyu.common.log.enums.BusinessType; import com.muyu.common.security.annotation.RequiresPermissions; import com.muyu.common.security.utils.SecurityUtils; import com.muyu.system.domain.SysPost; -import com.muyu.system.service.ISysPostService; +import com.muyu.system.service.SysPostService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; @@ -26,7 +26,7 @@ import java.util.List; @RequestMapping("/post") public class SysPostController extends BaseController { @Autowired - private ISysPostService postService; + private SysPostService postService; /** * 获取岗位列表 diff --git a/muyu-modules/muyu-system/src/main/java/com/muyu/system/controller/SysProfileController.java b/muyu-modules/muyu-system/src/main/java/com/muyu/system/controller/SysProfileController.java index 269fe09..ae49255 100644 --- a/muyu-modules/muyu-system/src/main/java/com/muyu/system/controller/SysProfileController.java +++ b/muyu-modules/muyu-system/src/main/java/com/muyu/system/controller/SysProfileController.java @@ -14,7 +14,7 @@ import com.muyu.common.system.domain.SysFile; import com.muyu.common.system.domain.SysUser; import com.muyu.common.system.domain.LoginUser; import com.muyu.system.domain.resp.ProfileResp; -import com.muyu.system.service.ISysUserService; +import com.muyu.system.service.SysUserService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; import org.springframework.web.multipart.MultipartFile; @@ -30,7 +30,7 @@ import java.util.Arrays; @RequestMapping("/user/profile") public class SysProfileController extends BaseController { @Autowired - private ISysUserService userService; + private SysUserService userService; @Autowired private TokenService tokenService; diff --git a/muyu-modules/muyu-system/src/main/java/com/muyu/system/controller/SysRoleController.java b/muyu-modules/muyu-system/src/main/java/com/muyu/system/controller/SysRoleController.java index 89db398..63df7a9 100644 --- a/muyu-modules/muyu-system/src/main/java/com/muyu/system/controller/SysRoleController.java +++ b/muyu-modules/muyu-system/src/main/java/com/muyu/system/controller/SysRoleController.java @@ -13,9 +13,9 @@ import com.muyu.common.system.domain.SysRole; import com.muyu.common.system.domain.SysUser; import com.muyu.system.domain.SysUserRole; import com.muyu.system.domain.resp.DeptTreeResp; -import com.muyu.system.service.ISysDeptService; -import com.muyu.system.service.ISysRoleService; -import com.muyu.system.service.ISysUserService; +import com.muyu.system.service.SysDeptService; +import com.muyu.system.service.SysRoleService; +import com.muyu.system.service.SysUserService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; @@ -32,13 +32,13 @@ import java.util.List; @RequestMapping("/role") public class SysRoleController extends BaseController { @Autowired - private ISysRoleService roleService; + private SysRoleService roleService; @Autowired - private ISysUserService userService; + private SysUserService userService; @Autowired - private ISysDeptService deptService; + private SysDeptService deptService; @RequiresPermissions("system:role:list") @GetMapping("/list") diff --git a/muyu-modules/muyu-system/src/main/java/com/muyu/system/controller/SysUserController.java b/muyu-modules/muyu-system/src/main/java/com/muyu/system/controller/SysUserController.java index 5b6fe9f..9811a0e 100644 --- a/muyu-modules/muyu-system/src/main/java/com/muyu/system/controller/SysUserController.java +++ b/muyu-modules/muyu-system/src/main/java/com/muyu/system/controller/SysUserController.java @@ -39,22 +39,22 @@ import java.util.stream.Collectors; @RequestMapping("/user") public class SysUserController extends BaseController { @Autowired - private ISysUserService userService; + private SysUserService userService; @Autowired - private ISysRoleService roleService; + private SysRoleService roleService; @Autowired - private ISysDeptService deptService; + private SysDeptService deptService; @Autowired - private ISysPostService postService; + private SysPostService postService; @Autowired - private ISysPermissionService permissionService; + private SysPermissionService permissionService; @Autowired - private ISysConfigService configService; + private SysConfigService configService; /** * 获取用户列表 diff --git a/muyu-modules/muyu-system/src/main/java/com/muyu/system/controller/SysUserOnlineController.java b/muyu-modules/muyu-system/src/main/java/com/muyu/system/controller/SysUserOnlineController.java index b4e0432..26f7883 100644 --- a/muyu-modules/muyu-system/src/main/java/com/muyu/system/controller/SysUserOnlineController.java +++ b/muyu-modules/muyu-system/src/main/java/com/muyu/system/controller/SysUserOnlineController.java @@ -11,7 +11,7 @@ import com.muyu.common.redis.service.RedisService; import com.muyu.common.security.annotation.RequiresPermissions; import com.muyu.common.system.domain.LoginUser; import com.muyu.system.domain.SysUserOnline; -import com.muyu.system.service.ISysUserOnlineService; +import com.muyu.system.service.SysUserOnlineService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; @@ -29,7 +29,7 @@ import java.util.List; @RequestMapping("/online") public class SysUserOnlineController extends BaseController { @Autowired - private ISysUserOnlineService userOnlineService; + private SysUserOnlineService userOnlineService; @Autowired private RedisService redisService; diff --git a/muyu-modules/muyu-system/src/main/java/com/muyu/system/mapper/SysConfigMapper.java b/muyu-modules/muyu-system/src/main/java/com/muyu/system/mapper/SysConfigMapper.java index e05047c..ced239a 100644 --- a/muyu-modules/muyu-system/src/main/java/com/muyu/system/mapper/SysConfigMapper.java +++ b/muyu-modules/muyu-system/src/main/java/com/muyu/system/mapper/SysConfigMapper.java @@ -1,84 +1,12 @@ package com.muyu.system.mapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.muyu.system.domain.SysConfig; -import java.util.List; - /** - * 参数配置 数据层 - * - * @author muyu + * @author DongZl + * @description: 配置mybatis配置 + * @Date 2023-11-13 上午 10:05 */ -public interface SysConfigMapper { - /** - * 查询参数配置信息 - * - * @param config 参数配置信息 - * - * @return 参数配置信息 - */ - public SysConfig selectConfig (SysConfig config); - - /** - * 通过ID查询配置 - * - * @param configId 参数ID - * - * @return 参数配置信息 - */ - public SysConfig selectConfigById (Long configId); - - /** - * 查询参数配置列表 - * - * @param config 参数配置信息 - * - * @return 参数配置集合 - */ - public List selectConfigList (SysConfig config); - - /** - * 根据键名查询参数配置信息 - * - * @param configKey 参数键名 - * - * @return 参数配置信息 - */ - public SysConfig checkConfigKeyUnique (String configKey); - - /** - * 新增参数配置 - * - * @param config 参数配置信息 - * - * @return 结果 - */ - public int insertConfig (SysConfig config); - - /** - * 修改参数配置 - * - * @param config 参数配置信息 - * - * @return 结果 - */ - public int updateConfig (SysConfig config); - - /** - * 删除参数配置 - * - * @param configId 参数ID - * - * @return 结果 - */ - public int deleteConfigById (Long configId); - - /** - * 批量删除参数信息 - * - * @param configIds 需要删除的参数ID - * - * @return 结果 - */ - public int deleteConfigByIds (Long[] configIds); +public interface SysConfigMapper extends BaseMapper { } diff --git a/muyu-modules/muyu-system/src/main/java/com/muyu/system/mapper/SysConfigPlusMapper.java b/muyu-modules/muyu-system/src/main/java/com/muyu/system/mapper/SysConfigPlusMapper.java deleted file mode 100644 index 2cd83f1..0000000 --- a/muyu-modules/muyu-system/src/main/java/com/muyu/system/mapper/SysConfigPlusMapper.java +++ /dev/null @@ -1,12 +0,0 @@ -package com.muyu.system.mapper; - -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.muyu.system.domain.SysConfig; - -/** - * @author DongZl - * @description: 配置mybatis配置 - * @Date 2023-11-13 上午 10:05 - */ -public interface SysConfigPlusMapper extends BaseMapper { -} diff --git a/muyu-modules/muyu-system/src/main/java/com/muyu/system/mapper/SysDeptMapper.java b/muyu-modules/muyu-system/src/main/java/com/muyu/system/mapper/SysDeptMapper.java index 38493df..5ef9ab4 100644 --- a/muyu-modules/muyu-system/src/main/java/com/muyu/system/mapper/SysDeptMapper.java +++ b/muyu-modules/muyu-system/src/main/java/com/muyu/system/mapper/SysDeptMapper.java @@ -1,5 +1,6 @@ package com.muyu.system.mapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.muyu.common.system.domain.SysDept; import org.apache.ibatis.annotations.Param; @@ -10,7 +11,7 @@ import java.util.List; * * @author muyu */ -public interface SysDeptMapper { +public interface SysDeptMapper extends BaseMapper { /** * 查询部门管理数据 * diff --git a/muyu-modules/muyu-system/src/main/java/com/muyu/system/mapper/SysDictDataMapper.java b/muyu-modules/muyu-system/src/main/java/com/muyu/system/mapper/SysDictDataMapper.java index 8b3ee5a..1e87a7e 100644 --- a/muyu-modules/muyu-system/src/main/java/com/muyu/system/mapper/SysDictDataMapper.java +++ b/muyu-modules/muyu-system/src/main/java/com/muyu/system/mapper/SysDictDataMapper.java @@ -1,5 +1,6 @@ package com.muyu.system.mapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.muyu.common.system.domain.SysDictData; import org.apache.ibatis.annotations.Param; @@ -10,7 +11,7 @@ import java.util.List; * * @author muyu */ -public interface SysDictDataMapper { +public interface SysDictDataMapper extends BaseMapper { /** * 根据条件分页查询字典数据 * diff --git a/muyu-modules/muyu-system/src/main/java/com/muyu/system/mapper/SysDictTypeMapper.java b/muyu-modules/muyu-system/src/main/java/com/muyu/system/mapper/SysDictTypeMapper.java index 1958885..0a4ffe6 100644 --- a/muyu-modules/muyu-system/src/main/java/com/muyu/system/mapper/SysDictTypeMapper.java +++ b/muyu-modules/muyu-system/src/main/java/com/muyu/system/mapper/SysDictTypeMapper.java @@ -1,5 +1,6 @@ package com.muyu.system.mapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.muyu.common.system.domain.SysDictType; import java.util.List; @@ -9,7 +10,7 @@ import java.util.List; * * @author muyu */ -public interface SysDictTypeMapper { +public interface SysDictTypeMapper extends BaseMapper { /** * 根据条件分页查询字典类型 * diff --git a/muyu-modules/muyu-system/src/main/java/com/muyu/system/mapper/SysLogininforMapper.java b/muyu-modules/muyu-system/src/main/java/com/muyu/system/mapper/SysLogininforMapper.java index d0292d9..0f1f86a 100644 --- a/muyu-modules/muyu-system/src/main/java/com/muyu/system/mapper/SysLogininforMapper.java +++ b/muyu-modules/muyu-system/src/main/java/com/muyu/system/mapper/SysLogininforMapper.java @@ -1,5 +1,6 @@ package com.muyu.system.mapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.muyu.common.system.domain.SysLogininfor; import java.util.List; @@ -9,7 +10,7 @@ import java.util.List; * * @author muyu */ -public interface SysLogininforMapper { +public interface SysLogininforMapper extends BaseMapper { /** * 新增系统登录日志 * diff --git a/muyu-modules/muyu-system/src/main/java/com/muyu/system/mapper/SysMenuMapper.java b/muyu-modules/muyu-system/src/main/java/com/muyu/system/mapper/SysMenuMapper.java index 71b90b3..8ceaaa0 100644 --- a/muyu-modules/muyu-system/src/main/java/com/muyu/system/mapper/SysMenuMapper.java +++ b/muyu-modules/muyu-system/src/main/java/com/muyu/system/mapper/SysMenuMapper.java @@ -1,5 +1,6 @@ package com.muyu.system.mapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.muyu.system.domain.SysMenu; import org.apache.ibatis.annotations.Param; @@ -10,7 +11,7 @@ import java.util.List; * * @author muyu */ -public interface SysMenuMapper { +public interface SysMenuMapper extends BaseMapper { /** * 查询系统菜单列表 * diff --git a/muyu-modules/muyu-system/src/main/java/com/muyu/system/mapper/SysNoticeMapper.java b/muyu-modules/muyu-system/src/main/java/com/muyu/system/mapper/SysNoticeMapper.java index 2dc4932..fee9930 100644 --- a/muyu-modules/muyu-system/src/main/java/com/muyu/system/mapper/SysNoticeMapper.java +++ b/muyu-modules/muyu-system/src/main/java/com/muyu/system/mapper/SysNoticeMapper.java @@ -1,5 +1,6 @@ package com.muyu.system.mapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.muyu.system.domain.SysNotice; import java.util.List; @@ -9,7 +10,7 @@ import java.util.List; * * @author muyu */ -public interface SysNoticeMapper { +public interface SysNoticeMapper extends BaseMapper { /** * 查询公告信息 * diff --git a/muyu-modules/muyu-system/src/main/java/com/muyu/system/mapper/SysOperLogMapper.java b/muyu-modules/muyu-system/src/main/java/com/muyu/system/mapper/SysOperLogMapper.java index 7b8748f..6ea1bcd 100644 --- a/muyu-modules/muyu-system/src/main/java/com/muyu/system/mapper/SysOperLogMapper.java +++ b/muyu-modules/muyu-system/src/main/java/com/muyu/system/mapper/SysOperLogMapper.java @@ -1,5 +1,6 @@ package com.muyu.system.mapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.muyu.common.system.domain.SysOperLog; import java.util.List; @@ -9,7 +10,7 @@ import java.util.List; * * @author muyu */ -public interface SysOperLogMapper { +public interface SysOperLogMapper extends BaseMapper { /** * 新增操作日志 * diff --git a/muyu-modules/muyu-system/src/main/java/com/muyu/system/mapper/SysPostMapper.java b/muyu-modules/muyu-system/src/main/java/com/muyu/system/mapper/SysPostMapper.java index 5adea43..4bfd66d 100644 --- a/muyu-modules/muyu-system/src/main/java/com/muyu/system/mapper/SysPostMapper.java +++ b/muyu-modules/muyu-system/src/main/java/com/muyu/system/mapper/SysPostMapper.java @@ -1,5 +1,6 @@ package com.muyu.system.mapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.muyu.system.domain.SysPost; import java.util.List; @@ -9,7 +10,7 @@ import java.util.List; * * @author muyu */ -public interface SysPostMapper { +public interface SysPostMapper extends BaseMapper { /** * 查询岗位数据集合 * diff --git a/muyu-modules/muyu-system/src/main/java/com/muyu/system/mapper/SysRoleDeptMapper.java b/muyu-modules/muyu-system/src/main/java/com/muyu/system/mapper/SysRoleDeptMapper.java index ce72fdf..0e6dd4d 100644 --- a/muyu-modules/muyu-system/src/main/java/com/muyu/system/mapper/SysRoleDeptMapper.java +++ b/muyu-modules/muyu-system/src/main/java/com/muyu/system/mapper/SysRoleDeptMapper.java @@ -1,6 +1,7 @@ package com.muyu.system.mapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.muyu.system.domain.SysRoleDept; import java.util.List; @@ -10,7 +11,7 @@ import java.util.List; * * @author muyu */ -public interface SysRoleDeptMapper { +public interface SysRoleDeptMapper extends BaseMapper { /** * 通过角色ID删除角色和部门关联 * diff --git a/muyu-modules/muyu-system/src/main/java/com/muyu/system/mapper/SysRoleMapper.java b/muyu-modules/muyu-system/src/main/java/com/muyu/system/mapper/SysRoleMapper.java index c56278e..2b01dc3 100644 --- a/muyu-modules/muyu-system/src/main/java/com/muyu/system/mapper/SysRoleMapper.java +++ b/muyu-modules/muyu-system/src/main/java/com/muyu/system/mapper/SysRoleMapper.java @@ -1,5 +1,6 @@ package com.muyu.system.mapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.muyu.common.system.domain.SysRole; import java.util.List; @@ -9,7 +10,7 @@ import java.util.List; * * @author muyu */ -public interface SysRoleMapper { +public interface SysRoleMapper extends BaseMapper { /** * 根据条件分页查询角色数据 * diff --git a/muyu-modules/muyu-system/src/main/java/com/muyu/system/mapper/SysRoleMenuMapper.java b/muyu-modules/muyu-system/src/main/java/com/muyu/system/mapper/SysRoleMenuMapper.java index e333c51..664ce26 100644 --- a/muyu-modules/muyu-system/src/main/java/com/muyu/system/mapper/SysRoleMenuMapper.java +++ b/muyu-modules/muyu-system/src/main/java/com/muyu/system/mapper/SysRoleMenuMapper.java @@ -1,6 +1,7 @@ package com.muyu.system.mapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.muyu.system.domain.SysRoleMenu; import java.util.List; @@ -10,7 +11,7 @@ import java.util.List; * * @author muyu */ -public interface SysRoleMenuMapper { +public interface SysRoleMenuMapper extends BaseMapper { /** * 查询菜单使用数量 * diff --git a/muyu-modules/muyu-system/src/main/java/com/muyu/system/mapper/SysUserMapper.java b/muyu-modules/muyu-system/src/main/java/com/muyu/system/mapper/SysUserMapper.java index 3194e04..e037b34 100644 --- a/muyu-modules/muyu-system/src/main/java/com/muyu/system/mapper/SysUserMapper.java +++ b/muyu-modules/muyu-system/src/main/java/com/muyu/system/mapper/SysUserMapper.java @@ -1,5 +1,6 @@ package com.muyu.system.mapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.muyu.common.system.domain.SysUser; import org.apache.ibatis.annotations.Param; @@ -10,7 +11,7 @@ import java.util.List; * * @author muyu */ -public interface SysUserMapper { +public interface SysUserMapper extends BaseMapper { /** * 根据条件分页查询用户列表 * diff --git a/muyu-modules/muyu-system/src/main/java/com/muyu/system/mapper/SysUserPostMapper.java b/muyu-modules/muyu-system/src/main/java/com/muyu/system/mapper/SysUserPostMapper.java index d44c0a1..8d09a47 100644 --- a/muyu-modules/muyu-system/src/main/java/com/muyu/system/mapper/SysUserPostMapper.java +++ b/muyu-modules/muyu-system/src/main/java/com/muyu/system/mapper/SysUserPostMapper.java @@ -1,5 +1,6 @@ package com.muyu.system.mapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.muyu.system.domain.SysUserPost; import java.util.List; @@ -9,7 +10,7 @@ import java.util.List; * * @author muyu */ -public interface SysUserPostMapper { +public interface SysUserPostMapper extends BaseMapper { /** * 通过用户ID删除用户和岗位关联 * diff --git a/muyu-modules/muyu-system/src/main/java/com/muyu/system/mapper/SysUserRoleMapper.java b/muyu-modules/muyu-system/src/main/java/com/muyu/system/mapper/SysUserRoleMapper.java index ac2afe4..512adb8 100644 --- a/muyu-modules/muyu-system/src/main/java/com/muyu/system/mapper/SysUserRoleMapper.java +++ b/muyu-modules/muyu-system/src/main/java/com/muyu/system/mapper/SysUserRoleMapper.java @@ -1,5 +1,6 @@ package com.muyu.system.mapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.muyu.system.domain.SysUserRole; import org.apache.ibatis.annotations.Param; @@ -10,7 +11,7 @@ import java.util.List; * * @author muyu */ -public interface SysUserRoleMapper { +public interface SysUserRoleMapper extends BaseMapper { /** * 通过用户ID删除用户和角色关联 * diff --git a/muyu-modules/muyu-system/src/main/java/com/muyu/system/service/ISysConfigService.java b/muyu-modules/muyu-system/src/main/java/com/muyu/system/service/ISysConfigService.java deleted file mode 100644 index aa94ac6..0000000 --- a/muyu-modules/muyu-system/src/main/java/com/muyu/system/service/ISysConfigService.java +++ /dev/null @@ -1,88 +0,0 @@ -package com.muyu.system.service; - -import com.muyu.system.domain.SysConfig; - -import java.util.List; - -/** - * 参数配置 服务层 - * - * @author muyu - */ -public interface ISysConfigService { - /** - * 查询参数配置信息 - * - * @param configId 参数配置ID - * - * @return 参数配置信息 - */ - public SysConfig selectConfigById (Long configId); - - /** - * 根据键名查询参数配置信息 - * - * @param configKey 参数键名 - * - * @return 参数键值 - */ - public String selectConfigByKey (String configKey); - - /** - * 查询参数配置列表 - * - * @param config 参数配置信息 - * - * @return 参数配置集合 - */ - public List selectConfigList (SysConfig config); - - /** - * 新增参数配置 - * - * @param config 参数配置信息 - * - * @return 结果 - */ - public int insertConfig (SysConfig config); - - /** - * 修改参数配置 - * - * @param config 参数配置信息 - * - * @return 结果 - */ - public int updateConfig (SysConfig config); - - /** - * 批量删除参数信息 - * - * @param configIds 需要删除的参数ID - */ - public void deleteConfigByIds (Long[] configIds); - - /** - * 加载参数缓存数据 - */ - public void loadingConfigCache (); - - /** - * 清空参数缓存数据 - */ - public void clearConfigCache (); - - /** - * 重置参数缓存数据 - */ - public void resetConfigCache (); - - /** - * 校验参数键名是否唯一 - * - * @param config 参数信息 - * - * @return 结果 - */ - public boolean checkConfigKeyUnique (SysConfig config); -} diff --git a/muyu-modules/muyu-system/src/main/java/com/muyu/system/service/SysConfigPlusService.java b/muyu-modules/muyu-system/src/main/java/com/muyu/system/service/SysConfigService.java similarity index 87% rename from muyu-modules/muyu-system/src/main/java/com/muyu/system/service/SysConfigPlusService.java rename to muyu-modules/muyu-system/src/main/java/com/muyu/system/service/SysConfigService.java index d122d0d..f23d67e 100644 --- a/muyu-modules/muyu-system/src/main/java/com/muyu/system/service/SysConfigPlusService.java +++ b/muyu-modules/muyu-system/src/main/java/com/muyu/system/service/SysConfigService.java @@ -1,7 +1,6 @@ package com.muyu.system.service; import com.baomidou.mybatisplus.extension.service.IService; -import com.muyu.common.core.web.domain.BaseEntity; import com.muyu.system.domain.SysConfig; import java.util.List; @@ -11,7 +10,7 @@ import java.util.List; * @description: 配置plus业务层 * @Date 2023-11-13 上午 10:06 */ -public interface SysConfigPlusService extends IService { +public interface SysConfigService extends IService { List pageQuery (SysConfig config); /** diff --git a/muyu-modules/muyu-system/src/main/java/com/muyu/system/service/ISysDeptService.java b/muyu-modules/muyu-system/src/main/java/com/muyu/system/service/SysDeptService.java similarity index 95% rename from muyu-modules/muyu-system/src/main/java/com/muyu/system/service/ISysDeptService.java rename to muyu-modules/muyu-system/src/main/java/com/muyu/system/service/SysDeptService.java index 0849349..140cf91 100644 --- a/muyu-modules/muyu-system/src/main/java/com/muyu/system/service/ISysDeptService.java +++ b/muyu-modules/muyu-system/src/main/java/com/muyu/system/service/SysDeptService.java @@ -1,5 +1,6 @@ package com.muyu.system.service; +import com.baomidou.mybatisplus.extension.service.IService; import com.muyu.common.system.domain.SysDept; import com.muyu.system.domain.vo.TreeSelect; @@ -10,7 +11,7 @@ import java.util.List; * * @author muyu */ -public interface ISysDeptService { +public interface SysDeptService extends IService { /** * 查询部门管理数据 * diff --git a/muyu-modules/muyu-system/src/main/java/com/muyu/system/service/ISysDictDataService.java b/muyu-modules/muyu-system/src/main/java/com/muyu/system/service/SysDictDataService.java similarity index 91% rename from muyu-modules/muyu-system/src/main/java/com/muyu/system/service/ISysDictDataService.java rename to muyu-modules/muyu-system/src/main/java/com/muyu/system/service/SysDictDataService.java index 994ecdd..47aae4b 100644 --- a/muyu-modules/muyu-system/src/main/java/com/muyu/system/service/ISysDictDataService.java +++ b/muyu-modules/muyu-system/src/main/java/com/muyu/system/service/SysDictDataService.java @@ -1,5 +1,6 @@ package com.muyu.system.service; +import com.baomidou.mybatisplus.extension.service.IService; import com.muyu.common.system.domain.SysDictData; import java.util.List; @@ -9,7 +10,7 @@ import java.util.List; * * @author muyu */ -public interface ISysDictDataService { +public interface SysDictDataService extends IService { /** * 根据条件分页查询字典数据 * diff --git a/muyu-modules/muyu-system/src/main/java/com/muyu/system/service/ISysDictTypeService.java b/muyu-modules/muyu-system/src/main/java/com/muyu/system/service/SysDictTypeService.java similarity index 94% rename from muyu-modules/muyu-system/src/main/java/com/muyu/system/service/ISysDictTypeService.java rename to muyu-modules/muyu-system/src/main/java/com/muyu/system/service/SysDictTypeService.java index 990a2da..1b3212d 100644 --- a/muyu-modules/muyu-system/src/main/java/com/muyu/system/service/ISysDictTypeService.java +++ b/muyu-modules/muyu-system/src/main/java/com/muyu/system/service/SysDictTypeService.java @@ -1,5 +1,6 @@ package com.muyu.system.service; +import com.baomidou.mybatisplus.extension.service.IService; import com.muyu.common.system.domain.SysDictData; import com.muyu.common.system.domain.SysDictType; @@ -10,7 +11,7 @@ import java.util.List; * * @author muyu */ -public interface ISysDictTypeService { +public interface SysDictTypeService extends IService { /** * 根据条件分页查询字典类型 * diff --git a/muyu-modules/muyu-system/src/main/java/com/muyu/system/service/ISysLogininforService.java b/muyu-modules/muyu-system/src/main/java/com/muyu/system/service/SysLogininforService.java similarity index 86% rename from muyu-modules/muyu-system/src/main/java/com/muyu/system/service/ISysLogininforService.java rename to muyu-modules/muyu-system/src/main/java/com/muyu/system/service/SysLogininforService.java index b67f6b9..bb3031e 100644 --- a/muyu-modules/muyu-system/src/main/java/com/muyu/system/service/ISysLogininforService.java +++ b/muyu-modules/muyu-system/src/main/java/com/muyu/system/service/SysLogininforService.java @@ -1,5 +1,6 @@ package com.muyu.system.service; +import com.baomidou.mybatisplus.extension.service.IService; import com.muyu.common.system.domain.SysLogininfor; import java.util.List; @@ -9,7 +10,7 @@ import java.util.List; * * @author muyu */ -public interface ISysLogininforService { +public interface SysLogininforService extends IService { /** * 新增系统登录日志 * diff --git a/muyu-modules/muyu-system/src/main/java/com/muyu/system/service/ISysMenuService.java b/muyu-modules/muyu-system/src/main/java/com/muyu/system/service/SysMenuService.java similarity index 96% rename from muyu-modules/muyu-system/src/main/java/com/muyu/system/service/ISysMenuService.java rename to muyu-modules/muyu-system/src/main/java/com/muyu/system/service/SysMenuService.java index 0989608..29bfb07 100644 --- a/muyu-modules/muyu-system/src/main/java/com/muyu/system/service/ISysMenuService.java +++ b/muyu-modules/muyu-system/src/main/java/com/muyu/system/service/SysMenuService.java @@ -1,5 +1,6 @@ package com.muyu.system.service; +import com.baomidou.mybatisplus.extension.service.IService; import com.muyu.system.domain.SysMenu; import com.muyu.system.domain.vo.RouterVo; import com.muyu.system.domain.vo.TreeSelect; @@ -12,7 +13,7 @@ import java.util.Set; * * @author muyu */ -public interface ISysMenuService { +public interface SysMenuService extends IService { /** * 根据用户查询系统菜单列表 * diff --git a/muyu-modules/muyu-system/src/main/java/com/muyu/system/service/ISysNoticeService.java b/muyu-modules/muyu-system/src/main/java/com/muyu/system/service/SysNoticeService.java similarity index 90% rename from muyu-modules/muyu-system/src/main/java/com/muyu/system/service/ISysNoticeService.java rename to muyu-modules/muyu-system/src/main/java/com/muyu/system/service/SysNoticeService.java index 0db98f7..a1afe02 100644 --- a/muyu-modules/muyu-system/src/main/java/com/muyu/system/service/ISysNoticeService.java +++ b/muyu-modules/muyu-system/src/main/java/com/muyu/system/service/SysNoticeService.java @@ -1,5 +1,6 @@ package com.muyu.system.service; +import com.baomidou.mybatisplus.extension.service.IService; import com.muyu.system.domain.SysNotice; import java.util.List; @@ -9,7 +10,7 @@ import java.util.List; * * @author muyu */ -public interface ISysNoticeService { +public interface SysNoticeService extends IService { /** * 查询公告信息 * diff --git a/muyu-modules/muyu-system/src/main/java/com/muyu/system/service/ISysOperLogService.java b/muyu-modules/muyu-system/src/main/java/com/muyu/system/service/SysOperLogService.java similarity index 88% rename from muyu-modules/muyu-system/src/main/java/com/muyu/system/service/ISysOperLogService.java rename to muyu-modules/muyu-system/src/main/java/com/muyu/system/service/SysOperLogService.java index 8a82517..70b63ee 100644 --- a/muyu-modules/muyu-system/src/main/java/com/muyu/system/service/ISysOperLogService.java +++ b/muyu-modules/muyu-system/src/main/java/com/muyu/system/service/SysOperLogService.java @@ -1,5 +1,6 @@ package com.muyu.system.service; +import com.baomidou.mybatisplus.extension.service.IService; import com.muyu.common.system.domain.SysOperLog; import java.util.List; @@ -9,7 +10,7 @@ import java.util.List; * * @author muyu */ -public interface ISysOperLogService { +public interface SysOperLogService extends IService { /** * 新增操作日志 * diff --git a/muyu-modules/muyu-system/src/main/java/com/muyu/system/service/ISysPermissionService.java b/muyu-modules/muyu-system/src/main/java/com/muyu/system/service/SysPermissionService.java similarity index 92% rename from muyu-modules/muyu-system/src/main/java/com/muyu/system/service/ISysPermissionService.java rename to muyu-modules/muyu-system/src/main/java/com/muyu/system/service/SysPermissionService.java index 1c50576..02e9d14 100644 --- a/muyu-modules/muyu-system/src/main/java/com/muyu/system/service/ISysPermissionService.java +++ b/muyu-modules/muyu-system/src/main/java/com/muyu/system/service/SysPermissionService.java @@ -9,7 +9,7 @@ import java.util.Set; * * @author muyu */ -public interface ISysPermissionService { +public interface SysPermissionService { /** * 获取角色数据权限 * diff --git a/muyu-modules/muyu-system/src/main/java/com/muyu/system/service/ISysPostService.java b/muyu-modules/muyu-system/src/main/java/com/muyu/system/service/SysPostService.java similarity index 94% rename from muyu-modules/muyu-system/src/main/java/com/muyu/system/service/ISysPostService.java rename to muyu-modules/muyu-system/src/main/java/com/muyu/system/service/SysPostService.java index aa60f73..fbd8677 100644 --- a/muyu-modules/muyu-system/src/main/java/com/muyu/system/service/ISysPostService.java +++ b/muyu-modules/muyu-system/src/main/java/com/muyu/system/service/SysPostService.java @@ -1,5 +1,6 @@ package com.muyu.system.service; +import com.baomidou.mybatisplus.extension.service.IService; import com.muyu.system.domain.SysPost; import java.util.List; @@ -9,7 +10,7 @@ import java.util.List; * * @author muyu */ -public interface ISysPostService { +public interface SysPostService extends IService { /** * 查询岗位信息集合 * diff --git a/muyu-modules/muyu-system/src/main/java/com/muyu/system/service/ISysRoleService.java b/muyu-modules/muyu-system/src/main/java/com/muyu/system/service/SysRoleService.java similarity index 96% rename from muyu-modules/muyu-system/src/main/java/com/muyu/system/service/ISysRoleService.java rename to muyu-modules/muyu-system/src/main/java/com/muyu/system/service/SysRoleService.java index e6e3136..47009f8 100644 --- a/muyu-modules/muyu-system/src/main/java/com/muyu/system/service/ISysRoleService.java +++ b/muyu-modules/muyu-system/src/main/java/com/muyu/system/service/SysRoleService.java @@ -1,5 +1,6 @@ package com.muyu.system.service; +import com.baomidou.mybatisplus.extension.service.IService; import com.muyu.common.system.domain.SysRole; import com.muyu.system.domain.SysUserRole; @@ -11,7 +12,7 @@ import java.util.Set; * * @author muyu */ -public interface ISysRoleService { +public interface SysRoleService extends IService { /** * 根据条件分页查询角色数据 * diff --git a/muyu-modules/muyu-system/src/main/java/com/muyu/system/service/ISysUserOnlineService.java b/muyu-modules/muyu-system/src/main/java/com/muyu/system/service/SysUserOnlineService.java similarity index 92% rename from muyu-modules/muyu-system/src/main/java/com/muyu/system/service/ISysUserOnlineService.java rename to muyu-modules/muyu-system/src/main/java/com/muyu/system/service/SysUserOnlineService.java index 2382740..531735b 100644 --- a/muyu-modules/muyu-system/src/main/java/com/muyu/system/service/ISysUserOnlineService.java +++ b/muyu-modules/muyu-system/src/main/java/com/muyu/system/service/SysUserOnlineService.java @@ -1,5 +1,6 @@ package com.muyu.system.service; +import com.baomidou.mybatisplus.extension.service.IService; import com.muyu.common.system.domain.LoginUser; import com.muyu.system.domain.SysUserOnline; @@ -8,7 +9,7 @@ import com.muyu.system.domain.SysUserOnline; * * @author muyu */ -public interface ISysUserOnlineService { +public interface SysUserOnlineService { /** * 通过登录地址查询信息 * diff --git a/muyu-modules/muyu-system/src/main/java/com/muyu/system/service/ISysUserService.java b/muyu-modules/muyu-system/src/main/java/com/muyu/system/service/SysUserService.java similarity index 97% rename from muyu-modules/muyu-system/src/main/java/com/muyu/system/service/ISysUserService.java rename to muyu-modules/muyu-system/src/main/java/com/muyu/system/service/SysUserService.java index 5d82dd1..f4c6167 100644 --- a/muyu-modules/muyu-system/src/main/java/com/muyu/system/service/ISysUserService.java +++ b/muyu-modules/muyu-system/src/main/java/com/muyu/system/service/SysUserService.java @@ -1,5 +1,6 @@ package com.muyu.system.service; +import com.baomidou.mybatisplus.extension.service.IService; import com.muyu.common.system.domain.SysUser; import java.util.List; @@ -9,7 +10,7 @@ import java.util.List; * * @author muyu */ -public interface ISysUserService { +public interface SysUserService extends IService { /** * 根据条件分页查询用户列表 * diff --git a/muyu-modules/muyu-system/src/main/java/com/muyu/system/service/impl/SysConfigPlusServiceImpl.java b/muyu-modules/muyu-system/src/main/java/com/muyu/system/service/impl/SysConfigPlusServiceImpl.java deleted file mode 100644 index 497973b..0000000 --- a/muyu-modules/muyu-system/src/main/java/com/muyu/system/service/impl/SysConfigPlusServiceImpl.java +++ /dev/null @@ -1,114 +0,0 @@ -package com.muyu.system.service.impl; - -import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.muyu.common.core.constant.CacheConstants; -import com.muyu.common.core.utils.StringUtils; -import com.muyu.common.redis.service.RedisService; -import com.muyu.system.domain.SysConfig; -import com.muyu.system.mapper.SysConfigPlusMapper; -import com.muyu.system.service.SysConfigPlusService; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; -import org.springframework.util.Assert; - -import java.util.Collection; -import java.util.Date; -import java.util.List; -import java.util.Objects; - -/** - * @author DongZl - * @description: 配置plus业务实现层 - * @Date 2023-11-13 上午 10:06 - */ -@Service -public class SysConfigPlusServiceImpl extends ServiceImpl - implements SysConfigPlusService { - - @Autowired - private RedisService redisService; - - @Override - public List pageQuery (SysConfig config) { - LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); - if (StringUtils.isNotEmpty(config.getConfigName())){ - queryWrapper.like(SysConfig::getConfigName, config.getConfigName()); - } - if (StringUtils.isNotEmpty(config.getConfigType())){ - queryWrapper.like(SysConfig::getConfigType, config.getConfigType()); - } - if (StringUtils.isNotEmpty(config.getConfigKey())){ - queryWrapper.like(SysConfig::getConfigKey, config.getConfigKey()); - } - Object beginTime = config.getParams().get("beginTime"); - if (Objects.nonNull(beginTime) && beginTime instanceof Date beginDate){ - queryWrapper.gt(SysConfig::getCreateTime, beginDate); - } - Object endTime = config.getParams().get("endTime"); - if (Objects.nonNull(endTime) && endTime instanceof Date endDate){ - queryWrapper.lt(SysConfig::getCreateTime, endDate); - } - return this.list(queryWrapper); - } - - /** - * 通过Key进行查询值 - * - * @param configKey - * - * @return - */ - @Override - public String selectConfigByKey (String configKey) { - LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); - Assert.notNull(configKey, "key不可为空"); - queryWrapper.eq(SysConfig::getConfigKey, configKey); - SysConfig sysConfig = this.getOne(queryWrapper); - return sysConfig.getConfigValue(); - } - - @Override - public boolean checkConfigKeyUnique (SysConfig config) { - LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); - queryWrapper.eq(SysConfig::getConfigKey, config.getConfigKey()); - return this.count(queryWrapper) > 0; - } - - @Override - public void resetConfigCache () { - this.clearConfigCache(); - this.loadingConfigCache(); - } - - /** - * 清空参数缓存数据 - */ - @Override - public void clearConfigCache () { - Collection keys = redisService.keys(CacheConstants.SYS_CONFIG_KEY + "*"); - redisService.deleteObject(keys); - } - - /** - * 加载参数缓存数据 - */ - @Override - public void loadingConfigCache () { - List configsList = this.list(); - for (SysConfig config : configsList) { - redisService.setCacheObject(getCacheKey(config.getConfigKey()), config.getConfigValue()); - } - } - - /** - * 设置cache key - * - * @param configKey 参数键 - * - * @return 缓存键key - */ - private String getCacheKey (String configKey) { - return CacheConstants.SYS_CONFIG_KEY + configKey; - } -} diff --git a/muyu-modules/muyu-system/src/main/java/com/muyu/system/service/impl/SysConfigServiceImpl.java b/muyu-modules/muyu-system/src/main/java/com/muyu/system/service/impl/SysConfigServiceImpl.java index 53c8bb3..bc07cc8 100644 --- a/muyu-modules/muyu-system/src/main/java/com/muyu/system/service/impl/SysConfigServiceImpl.java +++ b/muyu-modules/muyu-system/src/main/java/com/muyu/system/service/impl/SysConfigServiceImpl.java @@ -1,154 +1,84 @@ package com.muyu.system.service.impl; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.muyu.common.core.constant.CacheConstants; -import com.muyu.common.core.constant.UserConstants; -import com.muyu.common.core.exception.ServiceException; -import com.muyu.common.core.text.Convert; import com.muyu.common.core.utils.StringUtils; import com.muyu.common.redis.service.RedisService; import com.muyu.system.domain.SysConfig; import com.muyu.system.mapper.SysConfigMapper; -import com.muyu.system.service.ISysConfigService; +import com.muyu.system.service.SysConfigService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import org.springframework.util.Assert; -import javax.annotation.PostConstruct; import java.util.Collection; +import java.util.Date; import java.util.List; +import java.util.Objects; /** - * 参数配置 服务层实现 - * - * @author muyu + * @author DongZl + * @description: 配置plus业务实现层 + * @Date 2023-11-13 上午 10:06 */ @Service -public class SysConfigServiceImpl implements ISysConfigService { - @Autowired - private SysConfigMapper configMapper; +public class SysConfigServiceImpl extends ServiceImpl + implements SysConfigService { @Autowired private RedisService redisService; - /** - * 项目启动时，初始化参数到缓存 - */ - @PostConstruct - public void init () { - loadingConfigCache(); - } - - /** - * 查询参数配置信息 - * - * @param configId 参数配置ID - * - * @return 参数配置信息 - */ @Override - public SysConfig selectConfigById (Long configId) { - SysConfig config = new SysConfig(); - config.setConfigId(configId); - return configMapper.selectConfig(config); + public List pageQuery (SysConfig config) { + LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); + if (StringUtils.isNotEmpty(config.getConfigName())){ + queryWrapper.like(SysConfig::getConfigName, config.getConfigName()); + } + if (StringUtils.isNotEmpty(config.getConfigType())){ + queryWrapper.like(SysConfig::getConfigType, config.getConfigType()); + } + if (StringUtils.isNotEmpty(config.getConfigKey())){ + queryWrapper.like(SysConfig::getConfigKey, config.getConfigKey()); + } + Object beginTime = config.getParams().get("beginTime"); + if (Objects.nonNull(beginTime) && beginTime instanceof Date beginDate){ + queryWrapper.gt(SysConfig::getCreateTime, beginDate); + } + Object endTime = config.getParams().get("endTime"); + if (Objects.nonNull(endTime) && endTime instanceof Date endDate){ + queryWrapper.lt(SysConfig::getCreateTime, endDate); + } + return this.list(queryWrapper); } /** - * 根据键名查询参数配置信息 + * 通过Key进行查询值 * - * @param configKey 参数key + * @param configKey * - * @return 参数键值 + * @return */ @Override public String selectConfigByKey (String configKey) { - String configValue = Convert.toStr(redisService.getCacheObject(getCacheKey(configKey))); - if (StringUtils.isNotEmpty(configValue)) { - return configValue; - } - SysConfig config = new SysConfig(); - config.setConfigKey(configKey); - SysConfig retConfig = configMapper.selectConfig(config); - if (StringUtils.isNotNull(retConfig)) { - redisService.setCacheObject(getCacheKey(configKey), retConfig.getConfigValue()); - return retConfig.getConfigValue(); - } - return StringUtils.EMPTY; + LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); + Assert.notNull(configKey, "key不可为空"); + queryWrapper.eq(SysConfig::getConfigKey, configKey); + SysConfig sysConfig = this.getOne(queryWrapper); + return sysConfig.getConfigValue(); } - /** - * 查询参数配置列表 - * - * @param config 参数配置信息 - * - * @return 参数配置集合 - */ @Override - public List selectConfigList (SysConfig config) { - return configMapper.selectConfigList(config); + public boolean checkConfigKeyUnique (SysConfig config) { + LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); + queryWrapper.eq(SysConfig::getConfigKey, config.getConfigKey()); + return this.count(queryWrapper) > 0; } - /** - * 新增参数配置 - * - * @param config 参数配置信息 - * - * @return 结果 - */ @Override - public int insertConfig (SysConfig config) { - int row = configMapper.insertConfig(config); - if (row > 0) { - redisService.setCacheObject(getCacheKey(config.getConfigKey()), config.getConfigValue()); - } - return row; - } - - /** - * 修改参数配置 - * - * @param config 参数配置信息 - * - * @return 结果 - */ - @Override - public int updateConfig (SysConfig config) { - SysConfig temp = configMapper.selectConfigById(config.getConfigId()); - if (!StringUtils.equals(temp.getConfigKey(), config.getConfigKey())) { - redisService.deleteObject(getCacheKey(temp.getConfigKey())); - } - - int row = configMapper.updateConfig(config); - if (row > 0) { - redisService.setCacheObject(getCacheKey(config.getConfigKey()), config.getConfigValue()); - } - return row; - } - - /** - * 批量删除参数信息 - * - * @param configIds 需要删除的参数ID - */ - @Override - public void deleteConfigByIds (Long[] configIds) { - for (Long configId : configIds) { - SysConfig config = selectConfigById(configId); - if (StringUtils.equals(UserConstants.YES, config.getConfigType())) { - throw new ServiceException(String.format("内置参数【%1$s】不能删除 ", config.getConfigKey())); - } - configMapper.deleteConfigById(configId); - redisService.deleteObject(getCacheKey(config.getConfigKey())); - } - } - - /** - * 加载参数缓存数据 - */ - @Override - public void loadingConfigCache () { - List configsList = configMapper.selectConfigList(new SysConfig()); - for (SysConfig config : configsList) { - redisService.setCacheObject(getCacheKey(config.getConfigKey()), config.getConfigValue()); - } + public void resetConfigCache () { + this.clearConfigCache(); + this.loadingConfigCache(); } /** @@ -161,29 +91,14 @@ public class SysConfigServiceImpl implements ISysConfigService { } /** - * 重置参数缓存数据 + * 加载参数缓存数据 */ @Override - public void resetConfigCache () { - clearConfigCache(); - loadingConfigCache(); - } - - /** - * 校验参数键名是否唯一 - * - * @param config 参数配置信息 - * - * @return 结果 - */ - @Override - public boolean checkConfigKeyUnique (SysConfig config) { - Long configId = StringUtils.isNull(config.getConfigId()) ? -1L : config.getConfigId(); - SysConfig info = configMapper.checkConfigKeyUnique(config.getConfigKey()); - if (StringUtils.isNotNull(info) && info.getConfigId().longValue() != configId.longValue()) { - return UserConstants.NOT_UNIQUE; + public void loadingConfigCache () { + List configsList = this.list(); + for (SysConfig config : configsList) { + redisService.setCacheObject(getCacheKey(config.getConfigKey()), config.getConfigValue()); } - return UserConstants.UNIQUE; } /** diff --git a/muyu-modules/muyu-system/src/main/java/com/muyu/system/service/impl/SysDeptServiceImpl.java b/muyu-modules/muyu-system/src/main/java/com/muyu/system/service/impl/SysDeptServiceImpl.java index 86e6b9f..a55301b 100644 --- a/muyu-modules/muyu-system/src/main/java/com/muyu/system/service/impl/SysDeptServiceImpl.java +++ b/muyu-modules/muyu-system/src/main/java/com/muyu/system/service/impl/SysDeptServiceImpl.java @@ -1,5 +1,6 @@ package com.muyu.system.service.impl; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.muyu.common.core.constant.UserConstants; import com.muyu.common.core.exception.ServiceException; import com.muyu.common.core.text.Convert; @@ -13,7 +14,7 @@ import com.muyu.common.system.domain.SysUser; import com.muyu.system.domain.vo.TreeSelect; import com.muyu.system.mapper.SysDeptMapper; import com.muyu.system.mapper.SysRoleMapper; -import com.muyu.system.service.ISysDeptService; +import com.muyu.system.service.SysDeptService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -28,7 +29,7 @@ import java.util.stream.Collectors; * @author muyu */ @Service -public class SysDeptServiceImpl implements ISysDeptService { +public class SysDeptServiceImpl extends ServiceImpl implements SysDeptService { @Autowired private SysDeptMapper deptMapper; diff --git a/muyu-modules/muyu-system/src/main/java/com/muyu/system/service/impl/SysDictDataServiceImpl.java b/muyu-modules/muyu-system/src/main/java/com/muyu/system/service/impl/SysDictDataServiceImpl.java index 298282a..777ffbd 100644 --- a/muyu-modules/muyu-system/src/main/java/com/muyu/system/service/impl/SysDictDataServiceImpl.java +++ b/muyu-modules/muyu-system/src/main/java/com/muyu/system/service/impl/SysDictDataServiceImpl.java @@ -1,9 +1,10 @@ package com.muyu.system.service.impl; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.muyu.common.security.utils.DictUtils; import com.muyu.common.system.domain.SysDictData; import com.muyu.system.mapper.SysDictDataMapper; -import com.muyu.system.service.ISysDictDataService; +import com.muyu.system.service.SysDictDataService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -15,7 +16,7 @@ import java.util.List; * @author muyu */ @Service -public class SysDictDataServiceImpl implements ISysDictDataService { +public class SysDictDataServiceImpl extends ServiceImpl implements SysDictDataService { @Autowired private SysDictDataMapper dictDataMapper; diff --git a/muyu-modules/muyu-system/src/main/java/com/muyu/system/service/impl/SysDictTypeServiceImpl.java b/muyu-modules/muyu-system/src/main/java/com/muyu/system/service/impl/SysDictTypeServiceImpl.java index 33778b2..4117411 100644 --- a/muyu-modules/muyu-system/src/main/java/com/muyu/system/service/impl/SysDictTypeServiceImpl.java +++ b/muyu-modules/muyu-system/src/main/java/com/muyu/system/service/impl/SysDictTypeServiceImpl.java @@ -1,5 +1,6 @@ package com.muyu.system.service.impl; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.muyu.common.core.constant.UserConstants; import com.muyu.common.core.exception.ServiceException; import com.muyu.common.core.utils.StringUtils; @@ -8,7 +9,7 @@ import com.muyu.common.system.domain.SysDictData; import com.muyu.common.system.domain.SysDictType; import com.muyu.system.mapper.SysDictDataMapper; import com.muyu.system.mapper.SysDictTypeMapper; -import com.muyu.system.service.ISysDictTypeService; +import com.muyu.system.service.SysDictTypeService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -25,7 +26,7 @@ import java.util.stream.Collectors; * @author muyu */ @Service -public class SysDictTypeServiceImpl implements ISysDictTypeService { +public class SysDictTypeServiceImpl extends ServiceImpl implements SysDictTypeService { @Autowired private SysDictTypeMapper dictTypeMapper; diff --git a/muyu-modules/muyu-system/src/main/java/com/muyu/system/service/impl/SysLogininforServiceImpl.java b/muyu-modules/muyu-system/src/main/java/com/muyu/system/service/impl/SysLogininforServiceImpl.java index a20eeb9..1a7c7a0 100644 --- a/muyu-modules/muyu-system/src/main/java/com/muyu/system/service/impl/SysLogininforServiceImpl.java +++ b/muyu-modules/muyu-system/src/main/java/com/muyu/system/service/impl/SysLogininforServiceImpl.java @@ -1,8 +1,9 @@ package com.muyu.system.service.impl; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.muyu.common.system.domain.SysLogininfor; import com.muyu.system.mapper.SysLogininforMapper; -import com.muyu.system.service.ISysLogininforService; +import com.muyu.system.service.SysLogininforService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -14,7 +15,7 @@ import java.util.List; * @author muyu */ @Service -public class SysLogininforServiceImpl implements ISysLogininforService { +public class SysLogininforServiceImpl extends ServiceImpl implements SysLogininforService { @Autowired private SysLogininforMapper logininforMapper; diff --git a/muyu-modules/muyu-system/src/main/java/com/muyu/system/service/impl/SysMenuServiceImpl.java b/muyu-modules/muyu-system/src/main/java/com/muyu/system/service/impl/SysMenuServiceImpl.java index a589e61..e4e2ec8 100644 --- a/muyu-modules/muyu-system/src/main/java/com/muyu/system/service/impl/SysMenuServiceImpl.java +++ b/muyu-modules/muyu-system/src/main/java/com/muyu/system/service/impl/SysMenuServiceImpl.java @@ -1,5 +1,6 @@ package com.muyu.system.service.impl; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.muyu.common.core.constant.Constants; import com.muyu.common.core.constant.UserConstants; import com.muyu.common.core.utils.StringUtils; @@ -13,7 +14,7 @@ import com.muyu.system.domain.vo.TreeSelect; import com.muyu.system.mapper.SysMenuMapper; import com.muyu.system.mapper.SysRoleMapper; import com.muyu.system.mapper.SysRoleMenuMapper; -import com.muyu.system.service.ISysMenuService; +import com.muyu.system.service.SysMenuService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -26,7 +27,7 @@ import java.util.stream.Collectors; * @author muyu */ @Service -public class SysMenuServiceImpl implements ISysMenuService { +public class SysMenuServiceImpl extends ServiceImpl implements SysMenuService { public static final String PREMISSION_STRING = "perms[\"{0}\"]"; @Autowired diff --git a/muyu-modules/muyu-system/src/main/java/com/muyu/system/service/impl/SysNoticeServiceImpl.java b/muyu-modules/muyu-system/src/main/java/com/muyu/system/service/impl/SysNoticeServiceImpl.java index a63f337..8c0c8d5 100644 --- a/muyu-modules/muyu-system/src/main/java/com/muyu/system/service/impl/SysNoticeServiceImpl.java +++ b/muyu-modules/muyu-system/src/main/java/com/muyu/system/service/impl/SysNoticeServiceImpl.java @@ -1,8 +1,9 @@ package com.muyu.system.service.impl; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.muyu.system.domain.SysNotice; import com.muyu.system.mapper.SysNoticeMapper; -import com.muyu.system.service.ISysNoticeService; +import com.muyu.system.service.SysNoticeService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -14,7 +15,7 @@ import java.util.List; * @author muyu */ @Service -public class SysNoticeServiceImpl implements ISysNoticeService { +public class SysNoticeServiceImpl extends ServiceImpl implements SysNoticeService { @Autowired private SysNoticeMapper noticeMapper; diff --git a/muyu-modules/muyu-system/src/main/java/com/muyu/system/service/impl/SysOperLogServiceImpl.java b/muyu-modules/muyu-system/src/main/java/com/muyu/system/service/impl/SysOperLogServiceImpl.java index f376543..24e7d39 100644 --- a/muyu-modules/muyu-system/src/main/java/com/muyu/system/service/impl/SysOperLogServiceImpl.java +++ b/muyu-modules/muyu-system/src/main/java/com/muyu/system/service/impl/SysOperLogServiceImpl.java @@ -1,8 +1,9 @@ package com.muyu.system.service.impl; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.muyu.common.system.domain.SysOperLog; import com.muyu.system.mapper.SysOperLogMapper; -import com.muyu.system.service.ISysOperLogService; +import com.muyu.system.service.SysOperLogService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -14,7 +15,7 @@ import java.util.List; * @author muyu */ @Service -public class SysOperLogServiceImpl implements ISysOperLogService { +public class SysOperLogServiceImpl extends ServiceImpl implements SysOperLogService { @Autowired private SysOperLogMapper operLogMapper; diff --git a/muyu-modules/muyu-system/src/main/java/com/muyu/system/service/impl/SysPermissionServiceImpl.java b/muyu-modules/muyu-system/src/main/java/com/muyu/system/service/impl/SysPermissionServiceImpl.java index d48eae2..a8641a1 100644 --- a/muyu-modules/muyu-system/src/main/java/com/muyu/system/service/impl/SysPermissionServiceImpl.java +++ b/muyu-modules/muyu-system/src/main/java/com/muyu/system/service/impl/SysPermissionServiceImpl.java @@ -1,10 +1,11 @@ package com.muyu.system.service.impl; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.muyu.common.system.domain.SysRole; import com.muyu.common.system.domain.SysUser; -import com.muyu.system.service.ISysMenuService; -import com.muyu.system.service.ISysPermissionService; -import com.muyu.system.service.ISysRoleService; +import com.muyu.system.service.SysMenuService; +import com.muyu.system.service.SysPermissionService; +import com.muyu.system.service.SysRoleService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.util.CollectionUtils; @@ -19,12 +20,12 @@ import java.util.Set; * @author muyu */ @Service -public class SysPermissionServiceImpl implements ISysPermissionService { +public class SysPermissionServiceImpl implements SysPermissionService { @Autowired - private ISysRoleService roleService; + private SysRoleService roleService; @Autowired - private ISysMenuService menuService; + private SysMenuService menuService; /** * 获取角色数据权限 diff --git a/muyu-modules/muyu-system/src/main/java/com/muyu/system/service/impl/SysPostServiceImpl.java b/muyu-modules/muyu-system/src/main/java/com/muyu/system/service/impl/SysPostServiceImpl.java index 6a1a138..457ac5a 100644 --- a/muyu-modules/muyu-system/src/main/java/com/muyu/system/service/impl/SysPostServiceImpl.java +++ b/muyu-modules/muyu-system/src/main/java/com/muyu/system/service/impl/SysPostServiceImpl.java @@ -1,12 +1,13 @@ package com.muyu.system.service.impl; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.muyu.common.core.constant.UserConstants; import com.muyu.common.core.exception.ServiceException; import com.muyu.common.core.utils.StringUtils; import com.muyu.system.domain.SysPost; import com.muyu.system.mapper.SysPostMapper; import com.muyu.system.mapper.SysUserPostMapper; -import com.muyu.system.service.ISysPostService; +import com.muyu.system.service.SysPostService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -18,7 +19,7 @@ import java.util.List; * @author muyu */ @Service -public class SysPostServiceImpl implements ISysPostService { +public class SysPostServiceImpl extends ServiceImpl implements SysPostService { @Autowired private SysPostMapper postMapper; diff --git a/muyu-modules/muyu-system/src/main/java/com/muyu/system/service/impl/SysRoleServiceImpl.java b/muyu-modules/muyu-system/src/main/java/com/muyu/system/service/impl/SysRoleServiceImpl.java index 7146362..fa832da 100644 --- a/muyu-modules/muyu-system/src/main/java/com/muyu/system/service/impl/SysRoleServiceImpl.java +++ b/muyu-modules/muyu-system/src/main/java/com/muyu/system/service/impl/SysRoleServiceImpl.java @@ -1,5 +1,6 @@ package com.muyu.system.service.impl; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.muyu.common.core.constant.UserConstants; import com.muyu.common.core.exception.ServiceException; import com.muyu.common.core.utils.SpringUtils; @@ -15,7 +16,7 @@ import com.muyu.system.mapper.SysRoleDeptMapper; import com.muyu.system.mapper.SysRoleMapper; import com.muyu.system.mapper.SysRoleMenuMapper; import com.muyu.system.mapper.SysUserRoleMapper; -import com.muyu.system.service.ISysRoleService; +import com.muyu.system.service.SysRoleService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -28,7 +29,7 @@ import java.util.*; * @author muyu */ @Service -public class SysRoleServiceImpl implements ISysRoleService { +public class SysRoleServiceImpl extends ServiceImpl implements SysRoleService { @Autowired private SysRoleMapper roleMapper; diff --git a/muyu-modules/muyu-system/src/main/java/com/muyu/system/service/impl/SysUserOnlineServiceImpl.java b/muyu-modules/muyu-system/src/main/java/com/muyu/system/service/impl/SysUserOnlineServiceImpl.java index 97db6cb..8ede754 100644 --- a/muyu-modules/muyu-system/src/main/java/com/muyu/system/service/impl/SysUserOnlineServiceImpl.java +++ b/muyu-modules/muyu-system/src/main/java/com/muyu/system/service/impl/SysUserOnlineServiceImpl.java @@ -1,9 +1,10 @@ package com.muyu.system.service.impl; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.muyu.common.core.utils.StringUtils; import com.muyu.common.system.domain.LoginUser; import com.muyu.system.domain.SysUserOnline; -import com.muyu.system.service.ISysUserOnlineService; +import com.muyu.system.service.SysUserOnlineService; import org.springframework.stereotype.Service; /** @@ -12,7 +13,7 @@ import org.springframework.stereotype.Service; * @author muyu */ @Service -public class SysUserOnlineServiceImpl implements ISysUserOnlineService { +public class SysUserOnlineServiceImpl implements SysUserOnlineService { /** * 通过登录地址查询信息 * diff --git a/muyu-modules/muyu-system/src/main/java/com/muyu/system/service/impl/SysUserServiceImpl.java b/muyu-modules/muyu-system/src/main/java/com/muyu/system/service/impl/SysUserServiceImpl.java index fc68e64..ab88e1c 100644 --- a/muyu-modules/muyu-system/src/main/java/com/muyu/system/service/impl/SysUserServiceImpl.java +++ b/muyu-modules/muyu-system/src/main/java/com/muyu/system/service/impl/SysUserServiceImpl.java @@ -1,5 +1,6 @@ package com.muyu.system.service.impl; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.muyu.common.core.constant.UserConstants; import com.muyu.common.core.exception.ServiceException; import com.muyu.common.core.utils.SpringUtils; @@ -13,8 +14,8 @@ import com.muyu.system.domain.SysPost; import com.muyu.system.domain.SysUserPost; import com.muyu.system.domain.SysUserRole; import com.muyu.system.mapper.*; -import com.muyu.system.service.ISysConfigService; -import com.muyu.system.service.ISysUserService; +import com.muyu.system.service.SysUserService; +import com.muyu.system.service.SysConfigService; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; @@ -33,7 +34,7 @@ import java.util.stream.Collectors; * @author muyu */ @Service -public class SysUserServiceImpl implements ISysUserService { +public class SysUserServiceImpl extends ServiceImpl implements SysUserService { private static final Logger log = LoggerFactory.getLogger(SysUserServiceImpl.class); @Autowired protected Validator validator; @@ -48,7 +49,7 @@ public class SysUserServiceImpl implements ISysUserService { @Autowired private SysUserPostMapper userPostMapper; @Autowired - private ISysConfigService configService; + private SysConfigService configService; /** * 根据条件分页查询用户列表