wezone
/
Ry-master
10
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

add 增加增强Mapper 重写业务适配

This commit is contained in:
疯狂的狮子li 2021-05-14 13:01:18 +08:00
parent 51efddcfb0
commit 6067cb1797
22 changed files with 84 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
ruoyi-common/src/main/java/com/ruoyi/common/core/page/BaseMapperPlus.java Normal file
View File

@ -0,0 +1,12 @@
package com.ruoyi.common.core.page;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
/**
* 自定义 Mapper 接口, 实现 自定义扩展
*
* @author Lion Li
* @since 2021-05-13
*/
public interface BaseMapperPlus<T> extends BaseMapper<T> {
}

4
ruoyi-generator/src/main/java/com/ruoyi/generator/mapper/GenTableColumnMapper.java
View File

@ -1,6 +1,6 @@
package com.ruoyi.generator.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.ruoyi.common.core.page.BaseMapperPlus;
import com.ruoyi.generator.domain.GenTableColumn;
import java.util.List;
@ -10,7 +10,7 @@ import java.util.List;
*
* @author ruoyi
*/
public interface GenTableColumnMapper extends BaseMapper<GenTableColumn> {
public interface GenTableColumnMapper extends BaseMapperPlus<GenTableColumn> {
/**
* 根据表名称查询列信息
*

4
ruoyi-generator/src/main/java/com/ruoyi/generator/mapper/GenTableMapper.java
View File

@ -1,7 +1,7 @@
package com.ruoyi.generator.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.common.core.page.BaseMapperPlus;
import com.ruoyi.generator.domain.GenTable;
import org.apache.ibatis.annotations.Param;
@ -12,7 +12,7 @@ import java.util.List;
*
* @author ruoyi
*/
public interface GenTableMapper extends BaseMapper<GenTable> {
public interface GenTableMapper extends BaseMapperPlus<GenTable> {
Page<GenTable> selectPageGenTableList(@Param("page") Page<GenTable> page, @Param("genTable") GenTable genTable);

4
ruoyi-generator/src/main/resources/vm/java/mapper.java.vm
View File

@ -1,7 +1,7 @@
package ${packageName}.mapper;
import ${packageName}.domain.${ClassName};
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.ruoyi.common.core.page.BaseMapperPlus;
/**
* ${functionName}Mapper接口
@ -9,6 +9,6 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
* @author ${author}
* @date ${datetime}
*/
public interface ${ClassName}Mapper extends BaseMapper<${ClassName}> {
public interface ${ClassName}Mapper extends BaseMapperPlus<${ClassName}> {
}

4
ruoyi-quartz/src/main/java/com/ruoyi/quartz/mapper/SysJobLogMapper.java
View File

@ -1,6 +1,6 @@
package com.ruoyi.quartz.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.ruoyi.common.core.page.BaseMapperPlus;
import com.ruoyi.quartz.domain.SysJobLog;
/**
@ -8,6 +8,6 @@ import com.ruoyi.quartz.domain.SysJobLog;
*
* @author ruoyi
*/
public interface SysJobLogMapper extends BaseMapper<SysJobLog> {
public interface SysJobLogMapper extends BaseMapperPlus<SysJobLog> {
}

4
ruoyi-quartz/src/main/java/com/ruoyi/quartz/mapper/SysJobMapper.java
View File

@ -1,6 +1,6 @@
package com.ruoyi.quartz.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.ruoyi.common.core.page.BaseMapperPlus;
import com.ruoyi.quartz.domain.SysJob;
/**
@ -8,6 +8,6 @@ import com.ruoyi.quartz.domain.SysJob;
*
* @author ruoyi
*/
public interface SysJobMapper extends BaseMapper<SysJob> {
public interface SysJobMapper extends BaseMapperPlus<SysJob> {
}

4
ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysConfigMapper.java
View File

@ -1,6 +1,6 @@
package com.ruoyi.system.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.ruoyi.common.core.page.BaseMapperPlus;
import com.ruoyi.system.domain.SysConfig;
/**
@ -8,6 +8,6 @@ import com.ruoyi.system.domain.SysConfig;
*
* @author ruoyi
*/
public interface SysConfigMapper extends BaseMapper<SysConfig> {
public interface SysConfigMapper extends BaseMapperPlus<SysConfig> {
}

4
ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysDeptMapper.java
View File

@ -1,7 +1,7 @@
package com.ruoyi.system.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.ruoyi.common.core.domain.entity.SysDept;
import com.ruoyi.common.core.page.BaseMapperPlus;
import org.apache.ibatis.annotations.Param;
import java.util.List;
@ -11,7 +11,7 @@ import java.util.List;
*
* @author ruoyi
*/
public interface SysDeptMapper extends BaseMapper<SysDept> {
public interface SysDeptMapper extends BaseMapperPlus<SysDept> {
/**
* 查询部门管理数据

4
ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysDictDataMapper.java
View File

@ -1,13 +1,13 @@
package com.ruoyi.system.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.ruoyi.common.core.domain.entity.SysDictData;
import com.ruoyi.common.core.page.BaseMapperPlus;
/**
* 字典表 数据层
*
* @author ruoyi
*/
public interface SysDictDataMapper extends BaseMapper<SysDictData> {
public interface SysDictDataMapper extends BaseMapperPlus<SysDictData> {
}

4
ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysDictTypeMapper.java
View File

@ -1,13 +1,13 @@
package com.ruoyi.system.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.ruoyi.common.core.domain.entity.SysDictType;
import com.ruoyi.common.core.page.BaseMapperPlus;
/**
* 字典表 数据层
*
* @author ruoyi
*/
public interface SysDictTypeMapper extends BaseMapper<SysDictType> {
public interface SysDictTypeMapper extends BaseMapperPlus<SysDictType> {
}

4
ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysLogininforMapper.java
View File

@ -1,6 +1,6 @@
package com.ruoyi.system.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.ruoyi.common.core.page.BaseMapperPlus;
import com.ruoyi.system.domain.SysLogininfor;
/**
@ -8,6 +8,6 @@ import com.ruoyi.system.domain.SysLogininfor;
*
* @author ruoyi
*/
public interface SysLogininforMapper extends BaseMapper<SysLogininfor> {
public interface SysLogininforMapper extends BaseMapperPlus<SysLogininfor> {
}

4
ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysMenuMapper.java
View File

@ -1,7 +1,7 @@
package com.ruoyi.system.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.ruoyi.common.core.domain.entity.SysMenu;
import com.ruoyi.common.core.page.BaseMapperPlus;
import org.apache.ibatis.annotations.Param;
import java.util.List;
@ -11,7 +11,7 @@ import java.util.List;
*
* @author ruoyi
*/
public interface SysMenuMapper extends BaseMapper<SysMenu> {
public interface SysMenuMapper extends BaseMapperPlus<SysMenu> {
/**
* 根据用户所有权限

4
ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysNoticeMapper.java
View File

@ -1,6 +1,6 @@
package com.ruoyi.system.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.ruoyi.common.core.page.BaseMapperPlus;
import com.ruoyi.system.domain.SysNotice;
/**
@ -8,6 +8,6 @@ import com.ruoyi.system.domain.SysNotice;
*
* @author ruoyi
*/
public interface SysNoticeMapper extends BaseMapper<SysNotice> {
public interface SysNoticeMapper extends BaseMapperPlus<SysNotice> {
}

4
ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysOperLogMapper.java
View File

@ -1,6 +1,6 @@
package com.ruoyi.system.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.ruoyi.common.core.page.BaseMapperPlus;
import com.ruoyi.system.domain.SysOperLog;
/**
@ -8,6 +8,6 @@ import com.ruoyi.system.domain.SysOperLog;
*
* @author ruoyi
*/
public interface SysOperLogMapper extends BaseMapper<SysOperLog> {
public interface SysOperLogMapper extends BaseMapperPlus<SysOperLog> {
}

4
ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysPostMapper.java
View File

@ -1,6 +1,6 @@
package com.ruoyi.system.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.ruoyi.common.core.page.BaseMapperPlus;
import com.ruoyi.system.domain.SysPost;
import java.util.List;
@ -10,7 +10,7 @@ import java.util.List;
*
* @author ruoyi
*/
public interface SysPostMapper extends BaseMapper<SysPost> {
public interface SysPostMapper extends BaseMapperPlus<SysPost> {
/**
* 根据用户ID获取岗位选择框列表

4
ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysRoleDeptMapper.java
View File

@ -1,6 +1,6 @@
package com.ruoyi.system.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.ruoyi.common.core.page.BaseMapperPlus;
import com.ruoyi.system.domain.SysRoleDept;
/**
@ -8,6 +8,6 @@ import com.ruoyi.system.domain.SysRoleDept;
*
* @author ruoyi
*/
public interface SysRoleDeptMapper extends BaseMapper<SysRoleDept> {
public interface SysRoleDeptMapper extends BaseMapperPlus<SysRoleDept> {
}

4
ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysRoleMapper.java
View File

@ -1,8 +1,8 @@
package com.ruoyi.system.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.common.core.domain.entity.SysRole;
import com.ruoyi.common.core.page.BaseMapperPlus;
import org.apache.ibatis.annotations.Param;
import java.util.List;
@ -12,7 +12,7 @@ import java.util.List;
*
* @author ruoyi
*/
public interface SysRoleMapper extends BaseMapper<SysRole> {
public interface SysRoleMapper extends BaseMapperPlus<SysRole> {
Page<SysRole> selectPageRoleList(@Param("page") Page<SysRole> page, @Param("role") SysRole role);

4
ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysRoleMenuMapper.java
View File

@ -1,6 +1,6 @@
package com.ruoyi.system.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.ruoyi.common.core.page.BaseMapperPlus;
import com.ruoyi.system.domain.SysRoleMenu;
/**
@ -8,6 +8,6 @@ import com.ruoyi.system.domain.SysRoleMenu;
*
* @author ruoyi
*/
public interface SysRoleMenuMapper extends BaseMapper<SysRoleMenu> {
public interface SysRoleMenuMapper extends BaseMapperPlus<SysRoleMenu> {
}

4
ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysUserMapper.java
View File

@ -1,8 +1,8 @@
package com.ruoyi.system.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.common.core.domain.entity.SysUser;
import com.ruoyi.common.core.page.BaseMapperPlus;
import org.apache.ibatis.annotations.Param;
import java.util.List;
@ -12,7 +12,7 @@ import java.util.List;
*
* @author ruoyi
*/
public interface SysUserMapper extends BaseMapper<SysUser> {
public interface SysUserMapper extends BaseMapperPlus<SysUser> {
Page<SysUser> selectPageUserList(@Param("page") Page<SysUser> page, @Param("user") SysUser user);

4
ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysUserPostMapper.java
View File

@ -1,6 +1,6 @@
package com.ruoyi.system.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.ruoyi.common.core.page.BaseMapperPlus;
import com.ruoyi.system.domain.SysUserPost;
/**
@ -8,6 +8,6 @@ import com.ruoyi.system.domain.SysUserPost;
*
* @author ruoyi
*/
public interface SysUserPostMapper extends BaseMapper<SysUserPost> {
public interface SysUserPostMapper extends BaseMapperPlus<SysUserPost> {
}

4
ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysUserRoleMapper.java
View File

@ -1,6 +1,6 @@
package com.ruoyi.system.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.ruoyi.common.core.page.BaseMapperPlus;
import com.ruoyi.system.domain.SysUserRole;
/**
@ -8,6 +8,6 @@ import com.ruoyi.system.domain.SysUserRole;
*
* @author ruoyi
*/
public interface SysUserRoleMapper extends BaseMapper<SysUserRole> {
public interface SysUserRoleMapper extends BaseMapperPlus<SysUserRole> {
}

34
ruoyi-ui/src/views/index.vue
View File

@ -4,7 +4,20 @@
<el-col :sm="24" :lg="12" style="padding-left: 20px">
<h2>RuoYi-Vue-Plus后台管理框架</h2>
<p>
基于RuoYi-Vue集成 Lombok+Mybatis-Plus+Undertow+knife4j+Hutool+Feign 重写所有原生业务 定期与RuoYi-Vue同步
基于 RuoYi-Vue 集成 Mybatis-Plus Lombok Hutool 等便捷开发工具 适配重写相关业务 便于开发 定期与 RuoYi-Vue 同步
* 前端开发框架 Vue、Element UI
* 后端开发框架 Spring Boot、Redis
* 容器框架 Undertow 基于 Netty 的高性能容器
* 权限认证框架 Spring Security、Jwt，支持多终端认证系统
* 关系数据库 MySQL 适配 8.X
* 缓存数据库 Redis 适配 6.X
* 数据库开发框架 Mybatis-Plus 快速 CRUD 增加开发效率 插件化支持各类需求
* 网络框架 Feign、OkHttp3 接口化管理 HTTP 请求
* 工具类框架 Hutool、Lombok 减少代码冗余 增加安全性
* 监控框架 spring-boot-admin 全方位服务监控
* 校验框架 validation 增强接口安全性 严谨性
* 文档框架 knife4j 美化接口文档
* 代码生成器可以一键生成前后端代码
</p>
<p>
<b>当前版本:</b> <span>v{{ version }}</span>
@ -66,6 +79,23 @@
<span>更新日志</span>
</div>
<el-collapse accordion>
<el-collapse-item title="v1.0.2 - 2021-5-13">
<ol>
<li>update 更新整合打包文档 重新排版</li>
<li>fix vue与boot整合打包与admin页面路由冲突</li>
</ol>
</el-collapse-item>
<el-collapse-item title="v1.0.1 - 2021-5-11">
<ol>
<li>update 更新banner</li>
<li>update 配置转移到 yml 文件 统一管理</li>
<li>update 上传媒体类型添加视频格式</li>
<li>update 树级结构更新子节点使用replaceFirst</li>
<li>update 删除操作日志记录日志</li>
<li>fix 修正导入表权限标识</li>
<li>fix 文件上传时报错</li>
</ol>
</el-collapse-item>
<el-collapse-item title="v1.0.0 - 2021-5-10">
<ol>
<li>RuoYi-Vue-Plus 后台管理系统正式发布</li>
@ -96,7 +126,7 @@ export default {
data() {
return {
// 版本号
version: "1.0.0",
version: "1.0.2",
};
},
methods: {