From 828bd9b85e0d26ffaec94fe6909d450763c1e475 Mon Sep 17 00:00:00 2001 From: zhujj Date: Fri, 30 Nov 2018 17:11:47 +0800 Subject: [PATCH] =?UTF-8?q?=E9=87=8D=E6=9E=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/resources/static/ruoyi/js/ry-ui.js | 1 + .../com/ruoyi/framework/util/EntityUtils.java | 4 +- .../web/base/AbstractBaseService.java | 105 +++++++++++++--- .../web/base/AbstractBaseServiceImpl.java | 44 +++---- .../ruoyi/framework/web/base/MyMapper.java | 25 ++++ .../ruoyi/system/mapper/SysConfigMapper.java | 4 +- .../ruoyi/system/mapper/SysDeptMapper.java | 3 +- .../system/mapper/SysDictDataMapper.java | 3 +- .../system/mapper/SysDictTypeMapper.java | 4 +- .../system/mapper/SysLogininforMapper.java | 4 +- .../ruoyi/system/mapper/SysMenuMapper.java | 4 +- .../ruoyi/system/mapper/SysNoticeMapper.java | 4 +- .../ruoyi/system/mapper/SysOperLogMapper.java | 4 +- .../ruoyi/system/mapper/SysPostMapper.java | 4 +- .../system/mapper/SysRoleDeptMapper.java | 4 +- .../ruoyi/system/mapper/SysRoleMapper.java | 4 +- .../system/mapper/SysRoleMenuMapper.java | 4 +- .../ruoyi/system/mapper/SysUserMapper.java | 6 +- .../system/mapper/SysUserOnlineMapper.java | 4 +- .../system/mapper/SysUserPostMapper.java | 4 +- .../system/mapper/SysUserRoleMapper.java | 4 +- .../agile/controller/GenTableController.java | 20 +-- .../java/com/ruoyi/agile/domain/GenTable.java | 3 + .../agile/mapper/GenTableColumnMapper.java | 8 +- .../ruoyi/agile/mapper/GenTableMapper.java | 56 ++------- .../ruoyi/agile/service/IGenTableService.java | 45 +------ .../service/impl/GenTableServiceImpl.java | 70 +---------- .../com/ruoyi/generator/mapper/GenMapper.java | 4 +- .../resources/mapper/agile/GenTableMapper.xml | 119 ------------------ .../templates/agile/genTable/genTable.html | 2 +- 30 files changed, 224 insertions(+), 346 deletions(-) create mode 100644 ruoyi-framework/src/main/java/com/ruoyi/framework/web/base/MyMapper.java diff --git a/ruoyi-admin/src/main/resources/static/ruoyi/js/ry-ui.js b/ruoyi-admin/src/main/resources/static/ruoyi/js/ry-ui.js index f015f1a83..37e40d3ae 100644 --- a/ruoyi-admin/src/main/resources/static/ruoyi/js/ry-ui.js +++ b/ruoyi-admin/src/main/resources/static/ruoyi/js/ry-ui.js @@ -31,6 +31,7 @@ pageNumber: 1, // 初始化加载第一页，默认第一页 pageSize: 10, // 每页的记录行数（*） pageList: [10, 25, 50], // 可供选择的每页的行数（*） + clickToSelect: true, // 点击行选中 iconSize: 'outline', // 图标大小：undefined默认的按钮尺寸 xs超小按钮sm小按钮lg大按钮 toolbar: '#toolbar', // 指定工作栏 sidePagination: "server", // 启用服务端分页 diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/util/EntityUtils.java b/ruoyi-framework/src/main/java/com/ruoyi/framework/util/EntityUtils.java index 6be47cfbc..0c76cfba3 100644 --- a/ruoyi-framework/src/main/java/com/ruoyi/framework/util/EntityUtils.java +++ b/ruoyi-framework/src/main/java/com/ruoyi/framework/util/EntityUtils.java @@ -61,9 +61,7 @@ public class EntityUtils { try { Method[] methods = entity.getClass().getMethods(); for(Method m : methods){ - if(m.getName().equals("setCreateBy")){ - m.invoke(entity, ShiroUtils.getUserId()); - }else if(m.getName().equals("setUpdateBy")){ + if(m.getName().equals("setUpdateBy")){ m.invoke(entity, ShiroUtils.getUserId()); } } diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/web/base/AbstractBaseService.java b/ruoyi-framework/src/main/java/com/ruoyi/framework/web/base/AbstractBaseService.java index b67c58336..d32e5b40c 100644 --- a/ruoyi-framework/src/main/java/com/ruoyi/framework/web/base/AbstractBaseService.java +++ b/ruoyi-framework/src/main/java/com/ruoyi/framework/web/base/AbstractBaseService.java @@ -9,46 +9,113 @@ import java.util.List; * Version 1.0.0 */ public abstract interface AbstractBaseService { - + /** + * 查询单条数据信息 + * 保证条件使数据唯一 + * @param entity + * @return + */ public T selectOne(T entity); - + /** + * 查询单条数据信息 + * @param id 代码 + * @return + */ public T selectById(Object id); + /** + * 单表分页查询 + * @param entity + * @return + */ + public List selectListByPage(T entity); + /** + * 查询数据集合 + * @param entity + * @return + */ public List selectList(T entity) ; - + /** + * 查询所有数据集合 + * @return + */ public List selectListAll(); - + /** + * 查询数据量 + * @param entity + * @return + */ public Long selectCount(T entity); + /** + * 保存 + * @param entity + * @return + */ + public int insert(T entity); - public void insert(T entity); + /** + * 保存不为null的数据 + * @param entity + * @return + */ + public int insertSelective(T entity); + /** + * 删除符合条件的数据 + * @param entity + * @return + */ + public int delete(T entity) ; - public void insertSelective(T entity); + /** + * 根据编码ID删除 + * @param id + * @return + */ + public int deleteById(Object id); + /** + * 根据id集合删除 + * ids 例如 '1','2' + * @param ids + * @return + */ + public int deleteByIds(String ids); - public void delete(T entity) ; + /** + * 根据编码ID全部字段更新 + * 包含（NULL） + * @param entity + * @return + */ + public int updateById(T entity) ; + /** + * 根据编码ID更新 + * 不包含（NULL） + * @param entity + * @return + */ + public int updateSelectiveById(T entity); - public void deleteById(Object id); - - - public void updateById(T entity) ; - - - public void updateSelectiveById(T entity); - + /** + * 自定义模板查询 + * @param example + * @return + */ public List selectByExample(Object example); - + /** + * 自定义模板查询数量 + * @param example + * @return + */ public int selectCountByExample(Object example); - - - public List selectByQuery(T entity) ; /** * 设置请求分页数据 */ diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/web/base/AbstractBaseServiceImpl.java b/ruoyi-framework/src/main/java/com/ruoyi/framework/web/base/AbstractBaseServiceImpl.java index 32d254a7f..23c811c26 100644 --- a/ruoyi-framework/src/main/java/com/ruoyi/framework/web/base/AbstractBaseServiceImpl.java +++ b/ruoyi-framework/src/main/java/com/ruoyi/framework/web/base/AbstractBaseServiceImpl.java @@ -16,7 +16,7 @@ import java.util.List; * Time: 15:13 * Version 1.0.0 */ -public abstract class AbstractBaseServiceImpl, T> implements AbstractBaseService{ +public abstract class AbstractBaseServiceImpl, T> implements AbstractBaseService{ @Autowired protected M mapper; public void setMapper(M mapper) { @@ -33,6 +33,11 @@ public abstract class AbstractBaseServiceImpl, T> implements return mapper.selectByPrimaryKey(id); } + @Override + public List selectListByPage(T entity) { + startPage(); + return mapper.select(entity); + } @Override public List selectList(T entity) { @@ -53,43 +58,45 @@ public abstract class AbstractBaseServiceImpl, T> implements @Override - public void insert(T entity) { + public int insert(T entity) { EntityUtils.setCreatAndUpdatInfo(entity); - mapper.insert(entity); + return mapper.insert(entity); } @Override - public void insertSelective(T entity) { + public int insertSelective(T entity) { EntityUtils.setCreatAndUpdatInfo(entity); - mapper.insertSelective(entity); + return mapper.insertSelective(entity); } @Override - public void delete(T entity) { - mapper.delete(entity); + public int delete(T entity) { + return mapper.delete(entity); } @Override - public void deleteById(Object id) { - mapper.deleteByPrimaryKey(id); + public int deleteById(Object id) { + return mapper.deleteByPrimaryKey(id); } - @Override - public void updateById(T entity) { + public int deleteByIds(String ids) { + return mapper.deleteByIds(ids); + } + @Override + public int updateById(T entity) { EntityUtils.setUpdatedInfo(entity); - mapper.updateByPrimaryKey(entity); + return mapper.updateByPrimaryKey(entity); } @Override - public void updateSelectiveById(T entity) { + public int updateSelectiveById(T entity) { EntityUtils.setUpdatedInfo(entity); - mapper.updateByPrimaryKeySelective(entity); - + return mapper.updateByPrimaryKeySelective(entity); } @Override @@ -102,13 +109,6 @@ public abstract class AbstractBaseServiceImpl, T> implements return mapper.selectCountByExample(example); } - - - @Override - public List selectByQuery(T entity) { - startPage(); - return mapper.select(entity); - } /** * 设置请求分页数据 */ diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/web/base/MyMapper.java b/ruoyi-framework/src/main/java/com/ruoyi/framework/web/base/MyMapper.java new file mode 100644 index 000000000..2b9a5d05e --- /dev/null +++ b/ruoyi-framework/src/main/java/com/ruoyi/framework/web/base/MyMapper.java @@ -0,0 +1,25 @@ +package com.ruoyi.framework.web.base; + +/** + * Created by Administrator on 2017/8/4. + */ + +import tk.mybatis.mapper.common.ConditionMapper; +import tk.mybatis.mapper.common.IdsMapper; +import tk.mybatis.mapper.common.Mapper; +import tk.mybatis.mapper.common.MySqlMapper; + +/** + * 被继承的Mapper，一般业务Mapper继承它 + * + * @author admin + * @since 2017年8月22日11:50:27 + */ +public interface MyMapper extends Mapper, + MySqlMapper, + ConditionMapper, + IdsMapper { + + //TODO + //FIXME 特别注意，该接口不能被扫描到，否则会出错 +} \ No newline at end of file diff --git a/ruoyi-framework/src/main/java/com/ruoyi/system/mapper/SysConfigMapper.java b/ruoyi-framework/src/main/java/com/ruoyi/system/mapper/SysConfigMapper.java index 3d1847d04..6c4bc3ee1 100644 --- a/ruoyi-framework/src/main/java/com/ruoyi/system/mapper/SysConfigMapper.java +++ b/ruoyi-framework/src/main/java/com/ruoyi/system/mapper/SysConfigMapper.java @@ -1,6 +1,8 @@ package com.ruoyi.system.mapper; import java.util.List; + +import com.ruoyi.framework.web.base.MyMapper; import com.ruoyi.system.domain.SysConfig; import tk.mybatis.mapper.common.Mapper; @@ -9,7 +11,7 @@ import tk.mybatis.mapper.common.Mapper; * * @author ruoyi */ -public interface SysConfigMapper extends Mapper +public interface SysConfigMapper extends MyMapper { /** * 查询参数配置信息 diff --git a/ruoyi-framework/src/main/java/com/ruoyi/system/mapper/SysDeptMapper.java b/ruoyi-framework/src/main/java/com/ruoyi/system/mapper/SysDeptMapper.java index b365bb61d..f56930434 100644 --- a/ruoyi-framework/src/main/java/com/ruoyi/system/mapper/SysDeptMapper.java +++ b/ruoyi-framework/src/main/java/com/ruoyi/system/mapper/SysDeptMapper.java @@ -2,6 +2,7 @@ package com.ruoyi.system.mapper; import java.util.List; +import com.ruoyi.framework.web.base.MyMapper; import com.ruoyi.system.domain.SysConfig; import org.apache.ibatis.annotations.Param; import com.ruoyi.system.domain.SysDept; @@ -12,7 +13,7 @@ import tk.mybatis.mapper.common.Mapper; * * @author ruoyi */ -public interface SysDeptMapper extends Mapper +public interface SysDeptMapper extends MyMapper { /** * 查询部门人数 diff --git a/ruoyi-framework/src/main/java/com/ruoyi/system/mapper/SysDictDataMapper.java b/ruoyi-framework/src/main/java/com/ruoyi/system/mapper/SysDictDataMapper.java index d0ae3db67..4bfbe35e9 100644 --- a/ruoyi-framework/src/main/java/com/ruoyi/system/mapper/SysDictDataMapper.java +++ b/ruoyi-framework/src/main/java/com/ruoyi/system/mapper/SysDictDataMapper.java @@ -2,6 +2,7 @@ package com.ruoyi.system.mapper; import java.util.List; +import com.ruoyi.framework.web.base.MyMapper; import com.ruoyi.system.domain.SysDept; import org.apache.ibatis.annotations.Param; import com.ruoyi.system.domain.SysDictData; @@ -12,7 +13,7 @@ import tk.mybatis.mapper.common.Mapper; * * @author ruoyi */ -public interface SysDictDataMapper extends Mapper +public interface SysDictDataMapper extends MyMapper { /** * 根据条件分页查询字典数据 diff --git a/ruoyi-framework/src/main/java/com/ruoyi/system/mapper/SysDictTypeMapper.java b/ruoyi-framework/src/main/java/com/ruoyi/system/mapper/SysDictTypeMapper.java index 6a9ef71b5..fa66aaa04 100644 --- a/ruoyi-framework/src/main/java/com/ruoyi/system/mapper/SysDictTypeMapper.java +++ b/ruoyi-framework/src/main/java/com/ruoyi/system/mapper/SysDictTypeMapper.java @@ -1,6 +1,8 @@ package com.ruoyi.system.mapper; import java.util.List; + +import com.ruoyi.framework.web.base.MyMapper; import org.apache.ibatis.annotations.Mapper; import com.ruoyi.system.domain.SysDictType; @@ -10,7 +12,7 @@ import com.ruoyi.system.domain.SysDictType; * @author ruoyi */ @Mapper -public interface SysDictTypeMapper extends tk.mybatis.mapper.common.Mapper +public interface SysDictTypeMapper extends MyMapper { /** * 根据条件分页查询字典类型 diff --git a/ruoyi-framework/src/main/java/com/ruoyi/system/mapper/SysLogininforMapper.java b/ruoyi-framework/src/main/java/com/ruoyi/system/mapper/SysLogininforMapper.java index fc70b92ab..286eaf584 100644 --- a/ruoyi-framework/src/main/java/com/ruoyi/system/mapper/SysLogininforMapper.java +++ b/ruoyi-framework/src/main/java/com/ruoyi/system/mapper/SysLogininforMapper.java @@ -1,6 +1,8 @@ package com.ruoyi.system.mapper; import java.util.List; + +import com.ruoyi.framework.web.base.MyMapper; import com.ruoyi.system.domain.SysLogininfor; import tk.mybatis.mapper.common.Mapper; @@ -9,7 +11,7 @@ import tk.mybatis.mapper.common.Mapper; * * @author ruoyi */ -public interface SysLogininforMapper extends Mapper +public interface SysLogininforMapper extends MyMapper { /** * 新增系统登录日志 diff --git a/ruoyi-framework/src/main/java/com/ruoyi/system/mapper/SysMenuMapper.java b/ruoyi-framework/src/main/java/com/ruoyi/system/mapper/SysMenuMapper.java index 98163d966..ae290406e 100644 --- a/ruoyi-framework/src/main/java/com/ruoyi/system/mapper/SysMenuMapper.java +++ b/ruoyi-framework/src/main/java/com/ruoyi/system/mapper/SysMenuMapper.java @@ -1,6 +1,8 @@ package com.ruoyi.system.mapper; import java.util.List; + +import com.ruoyi.framework.web.base.MyMapper; import org.apache.ibatis.annotations.Param; import com.ruoyi.system.domain.SysMenu; import tk.mybatis.mapper.common.Mapper; @@ -10,7 +12,7 @@ import tk.mybatis.mapper.common.Mapper; * * @author ruoyi */ -public interface SysMenuMapper extends Mapper +public interface SysMenuMapper extends MyMapper { /** * 查询系统所有菜单（含按钮） diff --git a/ruoyi-framework/src/main/java/com/ruoyi/system/mapper/SysNoticeMapper.java b/ruoyi-framework/src/main/java/com/ruoyi/system/mapper/SysNoticeMapper.java index 28c20bbe3..dcd7b2647 100644 --- a/ruoyi-framework/src/main/java/com/ruoyi/system/mapper/SysNoticeMapper.java +++ b/ruoyi-framework/src/main/java/com/ruoyi/system/mapper/SysNoticeMapper.java @@ -1,6 +1,8 @@ package com.ruoyi.system.mapper; import java.util.List; + +import com.ruoyi.framework.web.base.MyMapper; import com.ruoyi.system.domain.SysNotice; import tk.mybatis.mapper.common.Mapper; @@ -9,7 +11,7 @@ import tk.mybatis.mapper.common.Mapper; * * @author ruoyi */ -public interface SysNoticeMapper extends Mapper +public interface SysNoticeMapper extends MyMapper { /** * 查询公告信息 diff --git a/ruoyi-framework/src/main/java/com/ruoyi/system/mapper/SysOperLogMapper.java b/ruoyi-framework/src/main/java/com/ruoyi/system/mapper/SysOperLogMapper.java index c808c5199..8935a1b5c 100644 --- a/ruoyi-framework/src/main/java/com/ruoyi/system/mapper/SysOperLogMapper.java +++ b/ruoyi-framework/src/main/java/com/ruoyi/system/mapper/SysOperLogMapper.java @@ -1,6 +1,8 @@ package com.ruoyi.system.mapper; import java.util.List; + +import com.ruoyi.framework.web.base.MyMapper; import com.ruoyi.system.domain.SysOperLog; import tk.mybatis.mapper.common.Mapper; @@ -9,7 +11,7 @@ import tk.mybatis.mapper.common.Mapper; * * @author ruoyi */ -public interface SysOperLogMapper extends Mapper +public interface SysOperLogMapper extends MyMapper { /** * 新增操作日志 diff --git a/ruoyi-framework/src/main/java/com/ruoyi/system/mapper/SysPostMapper.java b/ruoyi-framework/src/main/java/com/ruoyi/system/mapper/SysPostMapper.java index 226e8a501..054c5bc2a 100644 --- a/ruoyi-framework/src/main/java/com/ruoyi/system/mapper/SysPostMapper.java +++ b/ruoyi-framework/src/main/java/com/ruoyi/system/mapper/SysPostMapper.java @@ -1,6 +1,8 @@ package com.ruoyi.system.mapper; import java.util.List; + +import com.ruoyi.framework.web.base.MyMapper; import com.ruoyi.system.domain.SysPost; import tk.mybatis.mapper.common.Mapper; @@ -9,7 +11,7 @@ import tk.mybatis.mapper.common.Mapper; * * @author ruoyi */ -public interface SysPostMapper extends Mapper +public interface SysPostMapper extends MyMapper { /** * 查询岗位数据集合 diff --git a/ruoyi-framework/src/main/java/com/ruoyi/system/mapper/SysRoleDeptMapper.java b/ruoyi-framework/src/main/java/com/ruoyi/system/mapper/SysRoleDeptMapper.java index a3199831a..e152f6aa1 100644 --- a/ruoyi-framework/src/main/java/com/ruoyi/system/mapper/SysRoleDeptMapper.java +++ b/ruoyi-framework/src/main/java/com/ruoyi/system/mapper/SysRoleDeptMapper.java @@ -1,6 +1,8 @@ package com.ruoyi.system.mapper; import java.util.List; + +import com.ruoyi.framework.web.base.MyMapper; import com.ruoyi.system.domain.SysRoleDept; import tk.mybatis.mapper.common.Mapper; @@ -9,7 +11,7 @@ import tk.mybatis.mapper.common.Mapper; * * @author ruoyi */ -public interface SysRoleDeptMapper extends Mapper +public interface SysRoleDeptMapper extends MyMapper { /** * 通过角色ID删除角色和部门关联 diff --git a/ruoyi-framework/src/main/java/com/ruoyi/system/mapper/SysRoleMapper.java b/ruoyi-framework/src/main/java/com/ruoyi/system/mapper/SysRoleMapper.java index 33fbc14d4..bdc8c65af 100644 --- a/ruoyi-framework/src/main/java/com/ruoyi/system/mapper/SysRoleMapper.java +++ b/ruoyi-framework/src/main/java/com/ruoyi/system/mapper/SysRoleMapper.java @@ -1,6 +1,8 @@ package com.ruoyi.system.mapper; import java.util.List; + +import com.ruoyi.framework.web.base.MyMapper; import com.ruoyi.system.domain.SysRole; import tk.mybatis.mapper.common.Mapper; @@ -9,7 +11,7 @@ import tk.mybatis.mapper.common.Mapper; * * @author ruoyi */ -public interface SysRoleMapper extends Mapper +public interface SysRoleMapper extends MyMapper { /** * 根据条件分页查询角色数据 diff --git a/ruoyi-framework/src/main/java/com/ruoyi/system/mapper/SysRoleMenuMapper.java b/ruoyi-framework/src/main/java/com/ruoyi/system/mapper/SysRoleMenuMapper.java index cbf392d75..9234faf58 100644 --- a/ruoyi-framework/src/main/java/com/ruoyi/system/mapper/SysRoleMenuMapper.java +++ b/ruoyi-framework/src/main/java/com/ruoyi/system/mapper/SysRoleMenuMapper.java @@ -1,6 +1,8 @@ package com.ruoyi.system.mapper; import java.util.List; + +import com.ruoyi.framework.web.base.MyMapper; import com.ruoyi.system.domain.SysRoleMenu; import tk.mybatis.mapper.common.Mapper; @@ -9,7 +11,7 @@ import tk.mybatis.mapper.common.Mapper; * * @author ruoyi */ -public interface SysRoleMenuMapper extends Mapper +public interface SysRoleMenuMapper extends MyMapper { /** * 通过角色ID删除角色和菜单关联 diff --git a/ruoyi-framework/src/main/java/com/ruoyi/system/mapper/SysUserMapper.java b/ruoyi-framework/src/main/java/com/ruoyi/system/mapper/SysUserMapper.java index cab38534e..753c1bf80 100644 --- a/ruoyi-framework/src/main/java/com/ruoyi/system/mapper/SysUserMapper.java +++ b/ruoyi-framework/src/main/java/com/ruoyi/system/mapper/SysUserMapper.java @@ -1,6 +1,8 @@ package com.ruoyi.system.mapper; import java.util.List; + +import com.ruoyi.framework.web.base.MyMapper; import com.ruoyi.system.domain.SysUser; import tk.mybatis.mapper.common.Mapper; @@ -9,12 +11,12 @@ import tk.mybatis.mapper.common.Mapper; * * @author ruoyi */ -public interface SysUserMapper extends Mapper +public interface SysUserMapper extends MyMapper { /** * 根据条件分页查询用户对象 * - * @param user 用户信息 + * @param sysUser 用户信息 * @return 用户信息集合信息 */ public List selectUserList(SysUser sysUser); diff --git a/ruoyi-framework/src/main/java/com/ruoyi/system/mapper/SysUserOnlineMapper.java b/ruoyi-framework/src/main/java/com/ruoyi/system/mapper/SysUserOnlineMapper.java index 43e8671c1..52050205d 100644 --- a/ruoyi-framework/src/main/java/com/ruoyi/system/mapper/SysUserOnlineMapper.java +++ b/ruoyi-framework/src/main/java/com/ruoyi/system/mapper/SysUserOnlineMapper.java @@ -1,6 +1,8 @@ package com.ruoyi.system.mapper; import java.util.List; + +import com.ruoyi.framework.web.base.MyMapper; import com.ruoyi.system.domain.SysUserOnline; import tk.mybatis.mapper.common.Mapper; @@ -9,7 +11,7 @@ import tk.mybatis.mapper.common.Mapper; * * @author ruoyi */ -public interface SysUserOnlineMapper extends Mapper +public interface SysUserOnlineMapper extends MyMapper { /** * 通过会话序号查询信息 diff --git a/ruoyi-framework/src/main/java/com/ruoyi/system/mapper/SysUserPostMapper.java b/ruoyi-framework/src/main/java/com/ruoyi/system/mapper/SysUserPostMapper.java index 9de998901..b3a32e7ca 100644 --- a/ruoyi-framework/src/main/java/com/ruoyi/system/mapper/SysUserPostMapper.java +++ b/ruoyi-framework/src/main/java/com/ruoyi/system/mapper/SysUserPostMapper.java @@ -1,6 +1,8 @@ package com.ruoyi.system.mapper; import java.util.List; + +import com.ruoyi.framework.web.base.MyMapper; import com.ruoyi.system.domain.SysUserPost; import tk.mybatis.mapper.common.Mapper; @@ -9,7 +11,7 @@ import tk.mybatis.mapper.common.Mapper; * * @author ruoyi */ -public interface SysUserPostMapper extends Mapper +public interface SysUserPostMapper extends MyMapper { /** * 通过用户ID删除用户和岗位关联 diff --git a/ruoyi-framework/src/main/java/com/ruoyi/system/mapper/SysUserRoleMapper.java b/ruoyi-framework/src/main/java/com/ruoyi/system/mapper/SysUserRoleMapper.java index 72e64878b..21e5732d2 100644 --- a/ruoyi-framework/src/main/java/com/ruoyi/system/mapper/SysUserRoleMapper.java +++ b/ruoyi-framework/src/main/java/com/ruoyi/system/mapper/SysUserRoleMapper.java @@ -1,6 +1,8 @@ package com.ruoyi.system.mapper; import java.util.List; + +import com.ruoyi.framework.web.base.MyMapper; import com.ruoyi.system.domain.SysUserRole; import tk.mybatis.mapper.common.Mapper; @@ -9,7 +11,7 @@ import tk.mybatis.mapper.common.Mapper; * * @author ruoyi */ -public interface SysUserRoleMapper extends Mapper +public interface SysUserRoleMapper extends MyMapper { /** * 通过用户ID删除用户和角色关联 diff --git a/ruoyi-generator/src/main/java/com/ruoyi/agile/controller/GenTableController.java b/ruoyi-generator/src/main/java/com/ruoyi/agile/controller/GenTableController.java index b653fd6ae..0e062f722 100644 --- a/ruoyi-generator/src/main/java/com/ruoyi/agile/controller/GenTableController.java +++ b/ruoyi-generator/src/main/java/com/ruoyi/agile/controller/GenTableController.java @@ -22,7 +22,7 @@ import com.ruoyi.common.utils.ExcelUtil; * @author zhujj * @date 2018-11-29 */ -@RestController +@Controller @RequestMapping("/agile/genTable") public class GenTableController extends BaseController { private String prefix = "agile/genTable"; @@ -43,7 +43,7 @@ public class GenTableController extends BaseController { @PostMapping("/list") @ResponseBody public TableDataInfo list(GenTable genTable) { - List list = genTableService.selectGenTableList(genTable); + List list = genTableService.selectListByPage(genTable); return getDataTable(list); } @@ -55,7 +55,7 @@ public class GenTableController extends BaseController { @PostMapping("/export") @ResponseBody public AjaxResult export(GenTable genTable) { - List list = genTableService.selectGenTableList(genTable); + List list = genTableService.selectList(genTable); ExcelUtil util = new ExcelUtil(GenTable.class); return util.exportExcel(list, "genTable"); } @@ -77,15 +77,15 @@ public class GenTableController extends BaseController { @ResponseBody public AjaxResult addSave(GenTable genTable) { - return toAjax(genTableService.insertGenTable(genTable)); + return toAjax(genTableService.insert(genTable)); } /** * 修改代码生成 */ @GetMapping("/edit/{tableName}") - public String edit(@PathVariable("tableName") String tableName, ModelMap mmap) { - GenTable genTable = genTableService.selectGenTableById(tableName); + public String edit(@PathVariable("id") String id, ModelMap mmap) { + GenTable genTable = genTableService.selectById(id); mmap.put("genTable", genTable); return prefix + "/edit"; } @@ -98,7 +98,7 @@ public class GenTableController extends BaseController { @PostMapping("/edit") @ResponseBody public AjaxResult editSave(GenTable genTable) { - return toAjax(genTableService.updateGenTable(genTable)); + return toAjax(genTableService.updateById(genTable)); } /** @@ -109,8 +109,10 @@ public class GenTableController extends BaseController { @PostMapping("/remove") @ResponseBody public AjaxResult remove(String ids) { - - return toAjax(genTableService.deleteGenTableByIds(ids)); + genTableService.deleteByIds(ids); +// return toAjax(genTableService.deleteGenTableByIds(ids)); + return null; } + } diff --git a/ruoyi-generator/src/main/java/com/ruoyi/agile/domain/GenTable.java b/ruoyi-generator/src/main/java/com/ruoyi/agile/domain/GenTable.java index c72ab5ef5..a83867066 100644 --- a/ruoyi-generator/src/main/java/com/ruoyi/agile/domain/GenTable.java +++ b/ruoyi-generator/src/main/java/com/ruoyi/agile/domain/GenTable.java @@ -3,6 +3,8 @@ package com.ruoyi.agile.domain; import org.apache.commons.lang3.builder.ToStringBuilder; import org.apache.commons.lang3.builder.ToStringStyle; import com.ruoyi.common.base.BaseEntity; + +import javax.persistence.Id; import java.util.Date; /** @@ -16,6 +18,7 @@ public class GenTable extends BaseEntity private static final long serialVersionUID = 1L; /** 编码 */ + @Id private Integer id; /** 表名 */ private String tableName; diff --git a/ruoyi-generator/src/main/java/com/ruoyi/agile/mapper/GenTableColumnMapper.java b/ruoyi-generator/src/main/java/com/ruoyi/agile/mapper/GenTableColumnMapper.java index 511167b57..51aac75bd 100644 --- a/ruoyi-generator/src/main/java/com/ruoyi/agile/mapper/GenTableColumnMapper.java +++ b/ruoyi-generator/src/main/java/com/ruoyi/agile/mapper/GenTableColumnMapper.java @@ -1,7 +1,11 @@ package com.ruoyi.agile.mapper; import com.ruoyi.agile.domain.GenTableColumn; -import java.util.List; +import com.ruoyi.framework.web.base.MyMapper; +import com.ruoyi.generator.domain.TableInfo; +import tk.mybatis.mapper.common.Mapper; + +import java.util.List; /** * 代码生成列 数据层 @@ -9,7 +13,7 @@ import java.util.List; * @author zhujj * @date 2018-11-29 */ -public interface GenTableColumnMapper +public interface GenTableColumnMapper extends MyMapper { /** * 查询代码生成列信息 diff --git a/ruoyi-generator/src/main/java/com/ruoyi/agile/mapper/GenTableMapper.java b/ruoyi-generator/src/main/java/com/ruoyi/agile/mapper/GenTableMapper.java index 9bbc02125..59271789e 100644 --- a/ruoyi-generator/src/main/java/com/ruoyi/agile/mapper/GenTableMapper.java +++ b/ruoyi-generator/src/main/java/com/ruoyi/agile/mapper/GenTableMapper.java @@ -1,7 +1,11 @@ package com.ruoyi.agile.mapper; import com.ruoyi.agile.domain.GenTable; -import java.util.List; +import com.ruoyi.framework.web.base.MyMapper; +import com.ruoyi.generator.domain.TableInfo; +import tk.mybatis.mapper.common.Mapper; + +import java.util.List; /** * 代码生成 数据层 @@ -9,54 +13,8 @@ import java.util.List; * @author zhujj * @date 2018-11-29 */ -public interface GenTableMapper +public interface GenTableMapper extends MyMapper { - /** - * 查询代码生成信息 - * - * @param tableName 代码生成ID - * @return 代码生成信息 - */ - public GenTable selectGenTableById(String tableName); - - /** - * 查询代码生成列表 - * - * @param genTable 代码生成信息 - * @return 代码生成集合 - */ - public List selectGenTableList(GenTable genTable); - - /** - * 新增代码生成 - * - * @param genTable 代码生成信息 - * @return 结果 - */ - public int insertGenTable(GenTable genTable); - - /** - * 修改代码生成 - * - * @param genTable 代码生成信息 - * @return 结果 - */ - public int updateGenTable(GenTable genTable); - - /** - * 删除代码生成 - * - * @param tableName 代码生成ID - * @return 结果 - */ - public int deleteGenTableById(String tableName); - - /** - * 批量删除代码生成 - * - * @param tableNames 需要删除的数据ID - * @return 结果 - */ - public int deleteGenTableByIds(String[] tableNames); + } \ No newline at end of file diff --git a/ruoyi-generator/src/main/java/com/ruoyi/agile/service/IGenTableService.java b/ruoyi-generator/src/main/java/com/ruoyi/agile/service/IGenTableService.java index 89fca8291..7abbc113c 100644 --- a/ruoyi-generator/src/main/java/com/ruoyi/agile/service/IGenTableService.java +++ b/ruoyi-generator/src/main/java/com/ruoyi/agile/service/IGenTableService.java @@ -1,6 +1,9 @@ package com.ruoyi.agile.service; import com.ruoyi.agile.domain.GenTable; +import com.ruoyi.framework.web.base.AbstractBaseService; +import com.ruoyi.generator.domain.TableInfo; + import java.util.List; /** @@ -9,46 +12,8 @@ import java.util.List; * @author zhujj * @date 2018-11-29 */ -public interface IGenTableService +public interface IGenTableService extends AbstractBaseService { - /** - * 查询代码生成信息 - * - * @param tableName 代码生成ID - * @return 代码生成信息 - */ - public GenTable selectGenTableById(String tableName); - - /** - * 查询代码生成列表 - * - * @param genTable 代码生成信息 - * @return 代码生成集合 - */ - public List selectGenTableList(GenTable genTable); - - /** - * 新增代码生成 - * - * @param genTable 代码生成信息 - * @return 结果 - */ - public int insertGenTable(GenTable genTable); - - /** - * 修改代码生成 - * - * @param genTable 代码生成信息 - * @return 结果 - */ - public int updateGenTable(GenTable genTable); - - /** - * 删除代码生成信息 - * - * @param ids 需要删除的数据ID - * @return 结果 - */ - public int deleteGenTableByIds(String ids); + } diff --git a/ruoyi-generator/src/main/java/com/ruoyi/agile/service/impl/GenTableServiceImpl.java b/ruoyi-generator/src/main/java/com/ruoyi/agile/service/impl/GenTableServiceImpl.java index 74f5a277c..0d3e726cf 100644 --- a/ruoyi-generator/src/main/java/com/ruoyi/agile/service/impl/GenTableServiceImpl.java +++ b/ruoyi-generator/src/main/java/com/ruoyi/agile/service/impl/GenTableServiceImpl.java @@ -1,6 +1,10 @@ package com.ruoyi.agile.service.impl; import java.util.List; + +import com.ruoyi.framework.web.base.AbstractBaseServiceImpl; +import com.ruoyi.generator.domain.TableInfo; +import com.ruoyi.generator.mapper.GenMapper; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import com.ruoyi.agile.mapper.GenTableMapper; @@ -10,74 +14,12 @@ import com.ruoyi.common.support.Convert; /** * 代码生成 服务层实现 - * + * * @author zhujj * @date 2018-11-29 */ @Service -public class GenTableServiceImpl implements IGenTableService -{ - @Autowired - private GenTableMapper genTableMapper; +public class GenTableServiceImpl extends AbstractBaseServiceImpl implements IGenTableService { - /** - * 查询代码生成信息 - * - * @param tableName 代码生成ID - * @return 代码生成信息 - */ - @Override - public GenTable selectGenTableById(String tableName) - { - return genTableMapper.selectGenTableById(tableName); - } - - /** - * 查询代码生成列表 - * - * @param genTable 代码生成信息 - * @return 代码生成集合 - */ - @Override - public List selectGenTableList(GenTable genTable) - { - return genTableMapper.selectGenTableList(genTable); - } - - /** - * 新增代码生成 - * - * @param genTable 代码生成信息 - * @return 结果 - */ - @Override - public int insertGenTable(GenTable genTable) - { - return genTableMapper.insertGenTable(genTable); - } - - /** - * 修改代码生成 - * - * @param genTable 代码生成信息 - * @return 结果 - */ - @Override - public int updateGenTable(GenTable genTable) - { - return genTableMapper.updateGenTable(genTable); - } - /** - * 删除代码生成对象 - * - * @param ids 需要删除的数据ID - * @return 结果 - */ - @Override - public int deleteGenTableByIds(String ids) - { - return genTableMapper.deleteGenTableByIds(Convert.toStrArray(ids)); - } - } diff --git a/ruoyi-generator/src/main/java/com/ruoyi/generator/mapper/GenMapper.java b/ruoyi-generator/src/main/java/com/ruoyi/generator/mapper/GenMapper.java index d11b47b4e..f7d190aee 100644 --- a/ruoyi-generator/src/main/java/com/ruoyi/generator/mapper/GenMapper.java +++ b/ruoyi-generator/src/main/java/com/ruoyi/generator/mapper/GenMapper.java @@ -1,6 +1,8 @@ package com.ruoyi.generator.mapper; import java.util.List; + +import com.ruoyi.framework.web.base.MyMapper; import com.ruoyi.generator.domain.ColumnInfo; import com.ruoyi.generator.domain.TableInfo; import tk.mybatis.mapper.common.Mapper; @@ -10,7 +12,7 @@ import tk.mybatis.mapper.common.Mapper; * * @author ruoyi */ -public interface GenMapper extends Mapper +public interface GenMapper extends MyMapper { /** * 查询ry数据库表信息 diff --git a/ruoyi-generator/src/main/resources/mapper/agile/GenTableMapper.xml b/ruoyi-generator/src/main/resources/mapper/agile/GenTableMapper.xml index a3d2fe48a..8e7ce3ad1 100644 --- a/ruoyi-generator/src/main/resources/mapper/agile/GenTableMapper.xml +++ b/ruoyi-generator/src/main/resources/mapper/agile/GenTableMapper.xml @@ -31,125 +31,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" select id, table_name, class_name, comments, parent_table_name, parent_table_fk_name, data_source_name, tpl_category, package_name, module_name, sub_module_name, function_name, function_name_simple, function_author, gen_base_dir, options, create_by, create_date, update_by, update_date, remarks from gen_table - - - - - - - insert into gen_table - - id, - table_name, - class_name, - comments, - parent_table_name, - parent_table_fk_name, - data_source_name, - tpl_category, - package_name, - module_name, - sub_module_name, - function_name, - function_name_simple, - function_author, - gen_base_dir, - options, - create_by, - create_date, - update_by, - update_date, - remarks, - - - #{id}, - #{tableName}, - #{className}, - #{comments}, - #{parentTableName}, - #{parentTableFkName}, - #{dataSourceName}, - #{tplCategory}, - #{packageName}, - #{moduleName}, - #{subModuleName}, - #{functionName}, - #{functionNameSimple}, - #{functionAuthor}, - #{genBaseDir}, - #{options}, - #{createBy}, - #{createDate}, - #{updateBy}, - #{updateDate}, - #{remarks}, - - - - - update gen_table - - table_name = #{tableName}, - class_name = #{className}, - comments = #{comments}, - parent_table_name = #{parentTableName}, - parent_table_fk_name = #{parentTableFkName}, - data_source_name = #{dataSourceName}, - tpl_category = #{tplCategory}, - package_name = #{packageName}, - module_name = #{moduleName}, - sub_module_name = #{subModuleName}, - function_name = #{functionName}, - function_name_simple = #{functionNameSimple}, - function_author = #{functionAuthor}, - gen_base_dir = #{genBaseDir}, - options = #{options}, - create_by = #{createBy}, - create_date = #{createDate}, - update_by = #{updateBy}, - update_date = #{updateDate}, - remarks = #{remarks}, - - where id = #{id} - - - delete from gen_table where id = #{id} - - - - delete from gen_table where id in - - #{id} - - \ No newline at end of file diff --git a/ruoyi-generator/src/main/resources/templates/agile/genTable/genTable.html b/ruoyi-generator/src/main/resources/templates/agile/genTable/genTable.html index 6279cf18b..2715e201b 100644 --- a/ruoyi-generator/src/main/resources/templates/agile/genTable/genTable.html +++ b/ruoyi-generator/src/main/resources/templates/agile/genTable/genTable.html @@ -52,7 +52,7 @@ $(function() { var options = { - url: prefix + "/list", + url: prefix + "/page", createUrl: prefix + "/add", updateUrl: prefix + "/edit/{id}", removeUrl: prefix + "/remove",