mirror of
http://git.pig4cloud.com/pig/pigx.git
synced 2026-11-08 04:39:00 +08:00
✨ Introducing new features. #1628 PigxBaseMapper 优化MyBatisPlus 的批量插入和支持数据权限
This commit is contained in:
1 parent
cf0db9c132
commit
2eeb49f08b
41 files changed
+117
-103
No files matched your search
+2
@@ -2,6 +2,7 @@ package com.pig4cloud.pigx.common.data.datascope;
|
||||
|
||||
import com.baomidou.mybatisplus.core.injector.AbstractMethod;
|
||||
import com.baomidou.mybatisplus.core.injector.DefaultSqlInjector;
|
||||
import com.baomidou.mybatisplus.extension.injector.methods.InsertBatchSomeColumn;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
@@ -19,6 +20,7 @@ public class DataScopeSqlInjector extends DefaultSqlInjector {
|
||||
methodList.add(new SelectListByScope());
|
||||
methodList.add(new SelectPageByScope());
|
||||
methodList.add(new SelectCountByScope());
|
||||
methodList.add(new InsertBatchSomeColumn());
|
||||
return methodList;
|
||||
}
|
||||
|
||||
|
||||
+9
-2
@@ -9,12 +9,12 @@ import org.apache.ibatis.annotations.Param;
|
||||
import java.util.List;
|
||||
|
||||
/**
|
||||
* 若使用数据权限 Mapper继承此类
|
||||
* 扩展通用 Mapper,支持数据权限 和批量插入
|
||||
*
|
||||
* @author lengleng
|
||||
* @date 2020-06-17
|
||||
*/
|
||||
public interface DataScopeMapper<T> extends BaseMapper<T> {
|
||||
public interface PigxBaseMapper<T> extends BaseMapper<T> {
|
||||
|
||||
/**
|
||||
* 根据 entity 条件,查询全部记录
|
||||
@@ -42,4 +42,11 @@ public interface DataScopeMapper<T> extends BaseMapper<T> {
|
||||
*/
|
||||
Integer selectCountByScope(@Param(Constants.WRAPPER) Wrapper<T> queryWrapper, DataScope scope);
|
||||
|
||||
/**
|
||||
* 批量插入 仅适用于 mysql
|
||||
* @param entityList 实体列表
|
||||
* @return 影响行数
|
||||
*/
|
||||
Integer insertBatchSomeColumn(List<T> entityList);
|
||||
|
||||
}
|
||||
+2
-2
@@ -20,7 +20,7 @@
|
||||
package com.pig4cloud.pigx.admin.mapper;
|
||||
|
||||
import com.pig4cloud.pigx.admin.api.entity.SysDept;
|
||||
import com.pig4cloud.pigx.common.data.datascope.DataScopeMapper;
|
||||
import com.pig4cloud.pigx.common.data.datascope.PigxBaseMapper;
|
||||
import org.apache.ibatis.annotations.Mapper;
|
||||
|
||||
/**
|
||||
@@ -32,6 +32,6 @@ import org.apache.ibatis.annotations.Mapper;
|
||||
* @since 2018-01-20
|
||||
*/
|
||||
@Mapper
|
||||
public interface SysDeptMapper extends DataScopeMapper<SysDept> {
|
||||
public interface SysDeptMapper extends PigxBaseMapper<SysDept> {
|
||||
|
||||
}
|
||||
+2
-2
@@ -19,8 +19,8 @@
|
||||
|
||||
package com.pig4cloud.pigx.admin.mapper;
|
||||
|
||||
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
|
||||
import com.pig4cloud.pigx.admin.api.entity.SysDeptRelation;
|
||||
import com.pig4cloud.pigx.common.data.datascope.PigxBaseMapper;
|
||||
import org.apache.ibatis.annotations.Mapper;
|
||||
|
||||
/**
|
||||
@@ -32,7 +32,7 @@ import org.apache.ibatis.annotations.Mapper;
|
||||
* @since 2018-02-12
|
||||
*/
|
||||
@Mapper
|
||||
public interface SysDeptRelationMapper extends BaseMapper<SysDeptRelation> {
|
||||
public interface SysDeptRelationMapper extends PigxBaseMapper<SysDeptRelation> {
|
||||
|
||||
/**
|
||||
* 删除部门关系表数据
|
||||
|
||||
+2
-2
@@ -16,8 +16,8 @@
|
||||
*/
|
||||
package com.pig4cloud.pigx.admin.mapper;
|
||||
|
||||
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
|
||||
import com.pig4cloud.pigx.admin.api.entity.SysDictItem;
|
||||
import com.pig4cloud.pigx.common.data.datascope.PigxBaseMapper;
|
||||
import org.apache.ibatis.annotations.Mapper;
|
||||
|
||||
/**
|
||||
@@ -27,6 +27,6 @@ import org.apache.ibatis.annotations.Mapper;
|
||||
* @date 2019/03/19
|
||||
*/
|
||||
@Mapper
|
||||
public interface SysDictItemMapper extends BaseMapper<SysDictItem> {
|
||||
public interface SysDictItemMapper extends PigxBaseMapper<SysDictItem> {
|
||||
|
||||
}
|
||||
+2
-2
@@ -19,8 +19,8 @@
|
||||
|
||||
package com.pig4cloud.pigx.admin.mapper;
|
||||
|
||||
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
|
||||
import com.pig4cloud.pigx.admin.api.entity.SysDict;
|
||||
import com.pig4cloud.pigx.common.data.datascope.PigxBaseMapper;
|
||||
import org.apache.ibatis.annotations.Mapper;
|
||||
|
||||
/**
|
||||
@@ -32,6 +32,6 @@ import org.apache.ibatis.annotations.Mapper;
|
||||
* @since 2017-11-19
|
||||
*/
|
||||
@Mapper
|
||||
public interface SysDictMapper extends BaseMapper<SysDict> {
|
||||
public interface SysDictMapper extends PigxBaseMapper<SysDict> {
|
||||
|
||||
}
|
||||
+2
-2
@@ -17,8 +17,8 @@
|
||||
|
||||
package com.pig4cloud.pigx.admin.mapper;
|
||||
|
||||
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
|
||||
import com.pig4cloud.pigx.admin.api.entity.SysFile;
|
||||
import com.pig4cloud.pigx.common.data.datascope.PigxBaseMapper;
|
||||
import org.apache.ibatis.annotations.Mapper;
|
||||
|
||||
/**
|
||||
@@ -28,6 +28,6 @@ import org.apache.ibatis.annotations.Mapper;
|
||||
* @date 2019-06-18 17:18:42
|
||||
*/
|
||||
@Mapper
|
||||
public interface SysFileMapper extends BaseMapper<SysFile> {
|
||||
public interface SysFileMapper extends PigxBaseMapper<SysFile> {
|
||||
|
||||
}
|
||||
+2
-2
@@ -19,8 +19,8 @@
|
||||
|
||||
package com.pig4cloud.pigx.admin.mapper;
|
||||
|
||||
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
|
||||
import com.pig4cloud.pigx.admin.api.entity.SysLog;
|
||||
import com.pig4cloud.pigx.common.data.datascope.PigxBaseMapper;
|
||||
import org.apache.ibatis.annotations.Mapper;
|
||||
|
||||
/**
|
||||
@@ -32,6 +32,6 @@ import org.apache.ibatis.annotations.Mapper;
|
||||
* @since 2017-11-20
|
||||
*/
|
||||
@Mapper
|
||||
public interface SysLogMapper extends BaseMapper<SysLog> {
|
||||
public interface SysLogMapper extends PigxBaseMapper<SysLog> {
|
||||
|
||||
}
|
||||
+2
-2
@@ -19,9 +19,9 @@
|
||||
|
||||
package com.pig4cloud.pigx.admin.mapper;
|
||||
|
||||
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
|
||||
import com.pig4cloud.pigx.admin.api.entity.SysMenu;
|
||||
import com.pig4cloud.pigx.admin.api.vo.MenuVO;
|
||||
import com.pig4cloud.pigx.common.data.datascope.PigxBaseMapper;
|
||||
import org.apache.ibatis.annotations.Mapper;
|
||||
|
||||
import java.util.List;
|
||||
@@ -35,7 +35,7 @@ import java.util.List;
|
||||
* @since 2017-10-29
|
||||
*/
|
||||
@Mapper
|
||||
public interface SysMenuMapper extends BaseMapper<SysMenu> {
|
||||
public interface SysMenuMapper extends PigxBaseMapper<SysMenu> {
|
||||
|
||||
/**
|
||||
* 通过角色编号查询菜单
|
||||
|
||||
+2
-2
@@ -19,8 +19,8 @@
|
||||
|
||||
package com.pig4cloud.pigx.admin.mapper;
|
||||
|
||||
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
|
||||
import com.pig4cloud.pigx.admin.api.entity.SysOauthClientDetails;
|
||||
import com.pig4cloud.pigx.common.data.datascope.PigxBaseMapper;
|
||||
import org.apache.ibatis.annotations.Mapper;
|
||||
|
||||
/**
|
||||
@@ -32,6 +32,6 @@ import org.apache.ibatis.annotations.Mapper;
|
||||
* @since 2018-05-15
|
||||
*/
|
||||
@Mapper
|
||||
public interface SysOauthClientDetailsMapper extends BaseMapper<SysOauthClientDetails> {
|
||||
public interface SysOauthClientDetailsMapper extends PigxBaseMapper<SysOauthClientDetails> {
|
||||
|
||||
}
|
||||
+2
-2
@@ -16,8 +16,8 @@
|
||||
*/
|
||||
package com.pig4cloud.pigx.admin.mapper;
|
||||
|
||||
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
|
||||
import com.pig4cloud.pigx.admin.api.entity.SysPublicParam;
|
||||
import com.pig4cloud.pigx.common.data.datascope.PigxBaseMapper;
|
||||
import org.apache.ibatis.annotations.Mapper;
|
||||
|
||||
/**
|
||||
@@ -27,6 +27,6 @@ import org.apache.ibatis.annotations.Mapper;
|
||||
* @date 2019-04-29
|
||||
*/
|
||||
@Mapper
|
||||
public interface SysPublicParamMapper extends BaseMapper<SysPublicParam> {
|
||||
public interface SysPublicParamMapper extends PigxBaseMapper<SysPublicParam> {
|
||||
|
||||
}
|
||||
+2
-2
@@ -19,8 +19,8 @@
|
||||
|
||||
package com.pig4cloud.pigx.admin.mapper;
|
||||
|
||||
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
|
||||
import com.pig4cloud.pigx.admin.api.entity.SysRole;
|
||||
import com.pig4cloud.pigx.common.data.datascope.PigxBaseMapper;
|
||||
import org.apache.ibatis.annotations.Mapper;
|
||||
|
||||
import java.util.List;
|
||||
@@ -34,7 +34,7 @@ import java.util.List;
|
||||
* @since 2017-10-29
|
||||
*/
|
||||
@Mapper
|
||||
public interface SysRoleMapper extends BaseMapper<SysRole> {
|
||||
public interface SysRoleMapper extends PigxBaseMapper<SysRole> {
|
||||
|
||||
/**
|
||||
* 通过用户ID,查询角色信息
|
||||
|
||||
+2
-2
@@ -19,8 +19,8 @@
|
||||
|
||||
package com.pig4cloud.pigx.admin.mapper;
|
||||
|
||||
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
|
||||
import com.pig4cloud.pigx.admin.api.entity.SysRoleMenu;
|
||||
import com.pig4cloud.pigx.common.data.datascope.PigxBaseMapper;
|
||||
import org.apache.ibatis.annotations.Mapper;
|
||||
|
||||
/**
|
||||
@@ -32,6 +32,6 @@ import org.apache.ibatis.annotations.Mapper;
|
||||
* @since 2017-10-29
|
||||
*/
|
||||
@Mapper
|
||||
public interface SysRoleMenuMapper extends BaseMapper<SysRoleMenu> {
|
||||
public interface SysRoleMenuMapper extends PigxBaseMapper<SysRoleMenu> {
|
||||
|
||||
}
|
||||
+2
-2
@@ -17,8 +17,8 @@
|
||||
|
||||
package com.pig4cloud.pigx.admin.mapper;
|
||||
|
||||
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
|
||||
import com.pig4cloud.pigx.admin.api.entity.SysRouteConf;
|
||||
import com.pig4cloud.pigx.common.data.datascope.PigxBaseMapper;
|
||||
import org.apache.ibatis.annotations.Mapper;
|
||||
|
||||
/**
|
||||
@@ -28,6 +28,6 @@ import org.apache.ibatis.annotations.Mapper;
|
||||
* @date 2018-11-06 10:17:18
|
||||
*/
|
||||
@Mapper
|
||||
public interface SysRouteConfMapper extends BaseMapper<SysRouteConf> {
|
||||
public interface SysRouteConfMapper extends PigxBaseMapper<SysRouteConf> {
|
||||
|
||||
}
|
||||
+2
-2
@@ -17,8 +17,8 @@
|
||||
|
||||
package com.pig4cloud.pigx.admin.mapper;
|
||||
|
||||
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
|
||||
import com.pig4cloud.pigx.admin.api.entity.SysSocialDetails;
|
||||
import com.pig4cloud.pigx.common.data.datascope.PigxBaseMapper;
|
||||
import org.apache.ibatis.annotations.Mapper;
|
||||
|
||||
/**
|
||||
@@ -28,6 +28,6 @@ import org.apache.ibatis.annotations.Mapper;
|
||||
* @date 2018-08-16 21:30:41
|
||||
*/
|
||||
@Mapper
|
||||
public interface SysSocialDetailsMapper extends BaseMapper<SysSocialDetails> {
|
||||
public interface SysSocialDetailsMapper extends PigxBaseMapper<SysSocialDetails> {
|
||||
|
||||
}
|
||||
+2
-2
@@ -17,8 +17,8 @@
|
||||
|
||||
package com.pig4cloud.pigx.admin.mapper;
|
||||
|
||||
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
|
||||
import com.pig4cloud.pigx.admin.api.entity.SysTenant;
|
||||
import com.pig4cloud.pigx.common.data.datascope.PigxBaseMapper;
|
||||
import org.apache.ibatis.annotations.Mapper;
|
||||
|
||||
/**
|
||||
@@ -28,6 +28,6 @@ import org.apache.ibatis.annotations.Mapper;
|
||||
* @date 2019-05-15 15:55:41
|
||||
*/
|
||||
@Mapper
|
||||
public interface SysTenantMapper extends BaseMapper<SysTenant> {
|
||||
public interface SysTenantMapper extends PigxBaseMapper<SysTenant> {
|
||||
|
||||
}
|
||||
+2
-2
@@ -25,7 +25,7 @@ import com.pig4cloud.pigx.admin.api.dto.UserDTO;
|
||||
import com.pig4cloud.pigx.admin.api.entity.SysUser;
|
||||
import com.pig4cloud.pigx.admin.api.vo.UserVO;
|
||||
import com.pig4cloud.pigx.common.data.datascope.DataScope;
|
||||
import com.pig4cloud.pigx.common.data.datascope.DataScopeMapper;
|
||||
import com.pig4cloud.pigx.common.data.datascope.PigxBaseMapper;
|
||||
import org.apache.ibatis.annotations.Mapper;
|
||||
import org.apache.ibatis.annotations.Param;
|
||||
|
||||
@@ -40,7 +40,7 @@ import java.util.List;
|
||||
* @since 2017-10-29
|
||||
*/
|
||||
@Mapper
|
||||
public interface SysUserMapper extends DataScopeMapper<SysUser> {
|
||||
public interface SysUserMapper extends PigxBaseMapper<SysUser> {
|
||||
|
||||
/**
|
||||
* 通过用户名查询用户信息(含有角色信息)
|
||||
|
||||
+2
-2
@@ -19,8 +19,8 @@
|
||||
|
||||
package com.pig4cloud.pigx.admin.mapper;
|
||||
|
||||
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
|
||||
import com.pig4cloud.pigx.admin.api.entity.SysUserRole;
|
||||
import com.pig4cloud.pigx.common.data.datascope.PigxBaseMapper;
|
||||
import org.apache.ibatis.annotations.Mapper;
|
||||
import org.apache.ibatis.annotations.Param;
|
||||
|
||||
@@ -33,7 +33,7 @@ import org.apache.ibatis.annotations.Param;
|
||||
* @since 2017-10-29
|
||||
*/
|
||||
@Mapper
|
||||
public interface SysUserRoleMapper extends BaseMapper<SysUserRole> {
|
||||
public interface SysUserRoleMapper extends PigxBaseMapper<SysUserRole> {
|
||||
|
||||
/**
|
||||
* 根据用户Id删除该用户的角色关系
|
||||
|
||||
+1
-1
@@ -63,7 +63,7 @@ public class SysDeptRelationServiceImpl extends ServiceImpl<SysDeptRelationMappe
|
||||
return relation;
|
||||
}).collect(Collectors.toList());
|
||||
if (CollUtil.isNotEmpty(relationList)) {
|
||||
this.saveBatch(relationList);
|
||||
baseMapper.insertBatchSomeColumn(relationList);
|
||||
}
|
||||
|
||||
// 自己也要维护到关系表中
|
||||
|
||||
+2
-1
@@ -60,7 +60,8 @@ public class SysLogServiceImpl extends ServiceImpl<SysLogMapper, SysLog> impleme
|
||||
log.setCreateBy(pre.getUser());
|
||||
return log;
|
||||
}).collect(Collectors.toList());
|
||||
return this.saveBatch(sysLogs);
|
||||
baseMapper.insertBatchSomeColumn(sysLogs);
|
||||
return Boolean.TRUE;
|
||||
}
|
||||
|
||||
}
|
||||
+3
-1
@@ -74,7 +74,9 @@ public class SysRoleMenuServiceImpl extends ServiceImpl<SysRoleMenuMapper, SysRo
|
||||
|
||||
// 清空userinfo
|
||||
cacheManager.getCache(CacheConstants.USER_DETAILS).clear();
|
||||
return this.saveBatch(roleMenuList);
|
||||
|
||||
baseMapper.insertBatchSomeColumn(roleMenuList);
|
||||
return Boolean.TRUE;
|
||||
}
|
||||
|
||||
}
|
||||
+1
-1
@@ -138,7 +138,7 @@ public class SysRouteConfServiceImpl extends ServiceImpl<SysRouteConfMapper, Sys
|
||||
routeConf.setUri(vo.getUri().toString());
|
||||
return routeConf;
|
||||
}).collect(Collectors.toList());
|
||||
this.saveBatch(routeConfList);
|
||||
baseMapper.insertBatchSomeColumn(routeConfList);
|
||||
log.debug("更新网关路由结束 ");
|
||||
|
||||
this.applicationEventPublisher.publishEvent(new RefreshRoutesEvent(this));
|
||||
|
||||
+31
-29
@@ -22,8 +22,9 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
|
||||
import com.pig4cloud.pigx.admin.api.dto.MenuTree;
|
||||
import com.pig4cloud.pigx.admin.api.entity.*;
|
||||
import com.pig4cloud.pigx.admin.api.vo.TreeUtil;
|
||||
import com.pig4cloud.pigx.admin.mapper.SysTenantMapper;
|
||||
import com.pig4cloud.pigx.admin.service.*;
|
||||
import com.pig4cloud.pigx.admin.mapper.*;
|
||||
import com.pig4cloud.pigx.admin.service.SysDeptRelationService;
|
||||
import com.pig4cloud.pigx.admin.service.SysTenantService;
|
||||
import com.pig4cloud.pigx.common.core.constant.CacheConstants;
|
||||
import com.pig4cloud.pigx.common.core.constant.CommonConstants;
|
||||
import com.pig4cloud.pigx.common.data.resolver.ParamResolver;
|
||||
@@ -53,27 +54,27 @@ public class SysTenantServiceImpl extends ServiceImpl<SysTenantMapper, SysTenant
|
||||
|
||||
private static final PasswordEncoder ENCODER = new BCryptPasswordEncoder();
|
||||
|
||||
private final SysOauthClientDetailsService clientServices;
|
||||
private final SysOauthClientDetailsMapper clientDetailsMapper;
|
||||
|
||||
private final SysDeptRelationService deptRelationService;
|
||||
|
||||
private final SysUserRoleService userRoleService;
|
||||
private final SysRoleMenuMapper roleMenuMapper;
|
||||
|
||||
private final SysRoleMenuService roleMenuService;
|
||||
private final SysDictItemMapper dictItemMapper;
|
||||
|
||||
private final SysDictItemService dictItemService;
|
||||
private final SysPublicParamMapper paramMapper;
|
||||
|
||||
private final SysPublicParamService paramService;
|
||||
private final SysUserRoleMapper userRoleMapper;
|
||||
|
||||
private final SysUserService userService;
|
||||
private final SysMenuMapper menuMapper;
|
||||
|
||||
private final SysRoleService roleService;
|
||||
private final SysDictMapper dictMapper;
|
||||
|
||||
private final SysMenuService menuService;
|
||||
private final SysDeptMapper deptMapper;
|
||||
|
||||
private final SysDeptService deptService;
|
||||
private final SysUserMapper userMapper;
|
||||
|
||||
private final SysDictService dictService;
|
||||
private final SysRoleMapper roleMapper;
|
||||
|
||||
/**
|
||||
* 获取正常状态租户
|
||||
@@ -118,17 +119,17 @@ public class SysTenantServiceImpl extends ServiceImpl<SysTenantMapper, SysTenant
|
||||
|
||||
TenantBroker.runAs(defaultId, (id) -> {
|
||||
// 查询系统内置字典
|
||||
dictList.addAll(dictService.list());
|
||||
dictList.addAll(dictMapper.selectList(Wrappers.emptyWrapper()));
|
||||
// 查询系统内置字典项目
|
||||
dictIdList.addAll(dictList.stream().map(SysDict::getId).collect(Collectors.toList()));
|
||||
dictItemList.addAll(
|
||||
dictItemService.list(Wrappers.<SysDictItem>lambdaQuery().in(SysDictItem::getDictId, dictIdList)));
|
||||
dictItemList.addAll(dictItemMapper
|
||||
.selectList(Wrappers.<SysDictItem>lambdaQuery().in(SysDictItem::getDictId, dictIdList)));
|
||||
// 查询当前租户菜单
|
||||
menuList.addAll(menuService.list());
|
||||
menuList.addAll(menuMapper.selectList(Wrappers.emptyWrapper()));
|
||||
// 查询客户端配置
|
||||
clientDetailsList.addAll(clientServices.list());
|
||||
clientDetailsList.addAll(clientDetailsMapper.selectList(Wrappers.emptyWrapper()));
|
||||
// 查询系统参数配置
|
||||
publicParamList.addAll(paramService.list());
|
||||
publicParamList.addAll(paramMapper.selectList(Wrappers.emptyWrapper()));
|
||||
});
|
||||
|
||||
// 保证插入租户为新的租户
|
||||
@@ -138,7 +139,7 @@ public class SysTenantServiceImpl extends ServiceImpl<SysTenantMapper, SysTenant
|
||||
SysDept dept = new SysDept();
|
||||
dept.setName(defaultDeptName);
|
||||
dept.setParentId(0);
|
||||
deptService.save(dept);
|
||||
deptMapper.insert(dept);
|
||||
// 维护部门关系
|
||||
deptRelationService.insertDeptRelation(dept);
|
||||
// 构造初始化用户
|
||||
@@ -146,21 +147,21 @@ public class SysTenantServiceImpl extends ServiceImpl<SysTenantMapper, SysTenant
|
||||
user.setUsername(defaultUsername);
|
||||
user.setPassword(ENCODER.encode(defaultPassword));
|
||||
user.setDeptId(dept.getDeptId());
|
||||
userService.save(user);
|
||||
userMapper.insert(user);
|
||||
// 构造新角色
|
||||
SysRole role = new SysRole();
|
||||
role.setRoleCode(defaultRoleCode);
|
||||
role.setRoleName(defaultRoleName);
|
||||
roleService.save(role);
|
||||
roleMapper.insert(role);
|
||||
// 用户角色关系
|
||||
SysUserRole userRole = new SysUserRole();
|
||||
userRole.setUserId(user.getUserId());
|
||||
userRole.setRoleId(role.getRoleId());
|
||||
userRoleService.save(userRole);
|
||||
userRoleMapper.insert(userRole);
|
||||
// 插入新的菜单
|
||||
saveTenantMenu(TreeUtil.buildTree(menuList, CommonConstants.MENU_TREE_ROOT_ID),
|
||||
CommonConstants.MENU_TREE_ROOT_ID);
|
||||
List<SysMenu> newMenuList = menuService.list();
|
||||
List<SysMenu> newMenuList = menuMapper.selectList(Wrappers.emptyWrapper());
|
||||
|
||||
// 查询全部菜单,构造角色菜单关系
|
||||
List<SysRoleMenu> collect = newMenuList.stream().map(menu -> {
|
||||
@@ -169,19 +170,20 @@ public class SysTenantServiceImpl extends ServiceImpl<SysTenantMapper, SysTenant
|
||||
roleMenu.setMenuId(menu.getMenuId());
|
||||
return roleMenu;
|
||||
}).collect(Collectors.toList());
|
||||
roleMenuService.saveBatch(collect);
|
||||
roleMenuMapper.insertBatchSomeColumn(collect);
|
||||
// 插入系统字典
|
||||
dictService.saveBatch(dictList);
|
||||
dictMapper.insertBatchSomeColumn(dictList);
|
||||
// 处理字典项最新关联的字典ID
|
||||
List<SysDictItem> itemList = dictList.stream().flatMap(dict -> dictItemList.stream()
|
||||
.filter(item -> item.getType().equals(dict.getType())).peek(item -> item.setDictId(dict.getId())))
|
||||
.collect(Collectors.toList());
|
||||
|
||||
// 插入客户端
|
||||
clientServices.saveBatch(clientDetailsList);
|
||||
clientDetailsMapper.insertBatchSomeColumn(clientDetailsList);
|
||||
// 插入系统配置
|
||||
paramService.saveBatch(publicParamList);
|
||||
return dictItemService.saveBatch(itemList);
|
||||
paramMapper.insertBatchSomeColumn(publicParamList);
|
||||
dictItemMapper.insertBatchSomeColumn(itemList);
|
||||
return Boolean.TRUE;
|
||||
}));
|
||||
|
||||
}
|
||||
@@ -196,7 +198,7 @@ public class SysTenantServiceImpl extends ServiceImpl<SysTenantMapper, SysTenant
|
||||
SysMenu menu = new SysMenu();
|
||||
BeanUtils.copyProperties(node, menu, "parentId");
|
||||
menu.setParentId(parent);
|
||||
menuService.save(menu);
|
||||
menuMapper.insert(menu);
|
||||
if (CollUtil.isNotEmpty(node.getChildren())) {
|
||||
List<MenuTree> childrenList = node.getChildren().stream().map(treeNode -> (MenuTree) treeNode)
|
||||
.collect(Collectors.toList());
|
||||
|
||||
+2
-2
@@ -16,8 +16,8 @@
|
||||
*/
|
||||
package com.pig4cloud.pigx.codegen.mapper;
|
||||
|
||||
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
|
||||
import com.pig4cloud.pigx.codegen.entity.GenDatasourceConf;
|
||||
import com.pig4cloud.pigx.common.data.datascope.PigxBaseMapper;
|
||||
import org.apache.ibatis.annotations.Mapper;
|
||||
|
||||
/**
|
||||
@@ -27,6 +27,6 @@ import org.apache.ibatis.annotations.Mapper;
|
||||
* @date 2019-03-31 16:00:20
|
||||
*/
|
||||
@Mapper
|
||||
public interface GenDatasourceConfMapper extends BaseMapper<GenDatasourceConf> {
|
||||
public interface GenDatasourceConfMapper extends PigxBaseMapper<GenDatasourceConf> {
|
||||
|
||||
}
|
||||
+2
-2
@@ -17,8 +17,8 @@
|
||||
|
||||
package com.pig4cloud.pigx.codegen.mapper;
|
||||
|
||||
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
|
||||
import com.pig4cloud.pigx.codegen.entity.GenFormConf;
|
||||
import com.pig4cloud.pigx.common.data.datascope.PigxBaseMapper;
|
||||
import org.apache.ibatis.annotations.Mapper;
|
||||
|
||||
/**
|
||||
@@ -28,6 +28,6 @@ import org.apache.ibatis.annotations.Mapper;
|
||||
* @date 2019-08-12 15:55:35
|
||||
*/
|
||||
@Mapper
|
||||
public interface GenFormConfMapper extends BaseMapper<GenFormConf> {
|
||||
public interface GenFormConfMapper extends PigxBaseMapper<GenFormConf> {
|
||||
|
||||
}
|
||||
+2
-2
@@ -1,10 +1,10 @@
|
||||
package com.pig4cloud.pigx.codegen.mapper;
|
||||
|
||||
import com.baomidou.dynamic.datasource.annotation.DS;
|
||||
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
|
||||
import com.baomidou.mybatisplus.core.metadata.IPage;
|
||||
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
||||
import com.pig4cloud.pigx.codegen.entity.ColumnEntity;
|
||||
import com.pig4cloud.pigx.common.data.datascope.PigxBaseMapper;
|
||||
import org.apache.ibatis.annotations.Mapper;
|
||||
import org.apache.ibatis.annotations.Param;
|
||||
|
||||
@@ -16,7 +16,7 @@ import java.util.Map;
|
||||
* @date 2020/5/18
|
||||
*/
|
||||
@Mapper
|
||||
public interface GenTableColumnMapper extends BaseMapper<ColumnEntity> {
|
||||
public interface GenTableColumnMapper extends PigxBaseMapper<ColumnEntity> {
|
||||
|
||||
/**
|
||||
* 分页查询表分页信息
|
||||
|
||||
@@ -17,7 +17,7 @@
|
||||
|
||||
package ${package}.${moduleName}.mapper;
|
||||
|
||||
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
|
||||
import com.pig4cloud.pigx.common.data.datascope.PigxBaseMapper;
|
||||
import ${package}.${moduleName}.entity.${className};
|
||||
import org.apache.ibatis.annotations.Mapper;
|
||||
|
||||
@@ -28,6 +28,6 @@ import org.apache.ibatis.annotations.Mapper;
|
||||
* @date ${datetime}
|
||||
*/
|
||||
@Mapper
|
||||
public interface ${className}Mapper extends BaseMapper<${className}> {
|
||||
public interface ${className}Mapper extends PigxBaseMapper<${className}> {
|
||||
|
||||
}
|
||||
+2
-2
@@ -17,7 +17,7 @@
|
||||
|
||||
package com.pig4cloud.pigx.daemon.quartz.mapper;
|
||||
|
||||
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
|
||||
import com.pig4cloud.pigx.common.data.datascope.PigxBaseMapper;
|
||||
import com.pig4cloud.pigx.daemon.quartz.entity.SysJobLog;
|
||||
import org.apache.ibatis.annotations.Mapper;
|
||||
|
||||
@@ -28,6 +28,6 @@ import org.apache.ibatis.annotations.Mapper;
|
||||
* @date 2019-01-27 13:40:20
|
||||
*/
|
||||
@Mapper
|
||||
public interface SysJobLogMapper extends BaseMapper<SysJobLog> {
|
||||
public interface SysJobLogMapper extends PigxBaseMapper<SysJobLog> {
|
||||
|
||||
}
|
||||
+2
-2
@@ -17,7 +17,7 @@
|
||||
|
||||
package com.pig4cloud.pigx.daemon.quartz.mapper;
|
||||
|
||||
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
|
||||
import com.pig4cloud.pigx.common.data.datascope.PigxBaseMapper;
|
||||
import com.pig4cloud.pigx.daemon.quartz.entity.SysJob;
|
||||
import org.apache.ibatis.annotations.Mapper;
|
||||
|
||||
@@ -28,6 +28,6 @@ import org.apache.ibatis.annotations.Mapper;
|
||||
* @date 2019-01-27 10:04:42
|
||||
*/
|
||||
@Mapper
|
||||
public interface SysJobMapper extends BaseMapper<SysJob> {
|
||||
public interface SysJobMapper extends PigxBaseMapper<SysJob> {
|
||||
|
||||
}
|
||||
+2
-2
@@ -16,7 +16,7 @@
|
||||
*/
|
||||
package com.pig4cloud.pigx.mp.mapper;
|
||||
|
||||
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
|
||||
import com.pig4cloud.pigx.common.data.datascope.PigxBaseMapper;
|
||||
import com.pig4cloud.pigx.mp.entity.WxAccountFans;
|
||||
import org.apache.ibatis.annotations.Mapper;
|
||||
|
||||
@@ -27,6 +27,6 @@ import org.apache.ibatis.annotations.Mapper;
|
||||
* @date 2019-03-26 22:08:08
|
||||
*/
|
||||
@Mapper
|
||||
public interface WxAccountFansMapper extends BaseMapper<WxAccountFans> {
|
||||
public interface WxAccountFansMapper extends PigxBaseMapper<WxAccountFans> {
|
||||
|
||||
}
|
||||
+2
-2
@@ -16,7 +16,7 @@
|
||||
*/
|
||||
package com.pig4cloud.pigx.mp.mapper;
|
||||
|
||||
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
|
||||
import com.pig4cloud.pigx.common.data.datascope.PigxBaseMapper;
|
||||
import com.pig4cloud.pigx.mp.entity.WxAccount;
|
||||
import org.apache.ibatis.annotations.Mapper;
|
||||
|
||||
@@ -27,6 +27,6 @@ import org.apache.ibatis.annotations.Mapper;
|
||||
* @date 2019-03-26 22:07:53
|
||||
*/
|
||||
@Mapper
|
||||
public interface WxAccountMapper extends BaseMapper<WxAccount> {
|
||||
public interface WxAccountMapper extends PigxBaseMapper<WxAccount> {
|
||||
|
||||
}
|
||||
+2
-2
@@ -1,6 +1,6 @@
|
||||
package com.pig4cloud.pigx.mp.mapper;
|
||||
|
||||
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
|
||||
import com.pig4cloud.pigx.common.data.datascope.PigxBaseMapper;
|
||||
import com.pig4cloud.pigx.mp.entity.WxAutoReply;
|
||||
import org.apache.ibatis.annotations.Mapper;
|
||||
|
||||
@@ -11,6 +11,6 @@ import org.apache.ibatis.annotations.Mapper;
|
||||
* @date 2019-04-18 15:40:39
|
||||
*/
|
||||
@Mapper
|
||||
public interface WxAutoReplyMapper extends BaseMapper<WxAutoReply> {
|
||||
public interface WxAutoReplyMapper extends PigxBaseMapper<WxAutoReply> {
|
||||
|
||||
}
|
||||
+2
-2
@@ -16,7 +16,7 @@
|
||||
*/
|
||||
package com.pig4cloud.pigx.mp.mapper;
|
||||
|
||||
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
|
||||
import com.pig4cloud.pigx.common.data.datascope.PigxBaseMapper;
|
||||
import com.pig4cloud.pigx.mp.entity.WxFansMsgRes;
|
||||
import org.apache.ibatis.annotations.Mapper;
|
||||
|
||||
@@ -27,6 +27,6 @@ import org.apache.ibatis.annotations.Mapper;
|
||||
* @date 2019-03-27 20:45:48
|
||||
*/
|
||||
@Mapper
|
||||
public interface WxFansMsgResMapper extends BaseMapper<WxFansMsgRes> {
|
||||
public interface WxFansMsgResMapper extends PigxBaseMapper<WxFansMsgRes> {
|
||||
|
||||
}
|
||||
+2
-2
@@ -16,7 +16,7 @@
|
||||
*/
|
||||
package com.pig4cloud.pigx.mp.mapper;
|
||||
|
||||
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
|
||||
import com.pig4cloud.pigx.common.data.datascope.PigxBaseMapper;
|
||||
import com.pig4cloud.pigx.mp.entity.WxMpMenu;
|
||||
import org.apache.ibatis.annotations.Mapper;
|
||||
|
||||
@@ -27,6 +27,6 @@ import org.apache.ibatis.annotations.Mapper;
|
||||
* @date 2019-03-27 20:45:18
|
||||
*/
|
||||
@Mapper
|
||||
public interface WxMenuMapper extends BaseMapper<WxMpMenu> {
|
||||
public interface WxMenuMapper extends PigxBaseMapper<WxMpMenu> {
|
||||
|
||||
}
|
||||
+2
-2
@@ -1,6 +1,6 @@
|
||||
package com.pig4cloud.pigx.mp.mapper;
|
||||
|
||||
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
|
||||
import com.pig4cloud.pigx.common.data.datascope.PigxBaseMapper;
|
||||
import com.pig4cloud.pigx.mp.entity.WxMsg;
|
||||
import org.apache.ibatis.annotations.Mapper;
|
||||
|
||||
@@ -11,6 +11,6 @@ import org.apache.ibatis.annotations.Mapper;
|
||||
* @date 2019-05-28 16:12:10
|
||||
*/
|
||||
@Mapper
|
||||
public interface WxMsgMapper extends BaseMapper<WxMsg> {
|
||||
public interface WxMsgMapper extends PigxBaseMapper<WxMsg> {
|
||||
|
||||
}
|
||||
+2
-2
@@ -1,7 +1,7 @@
|
||||
package com.pig4cloud.pigx.act.mapper;
|
||||
|
||||
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
|
||||
import com.pig4cloud.pigx.act.entity.LeaveBill;
|
||||
import com.pig4cloud.pigx.common.data.datascope.PigxBaseMapper;
|
||||
import org.apache.ibatis.annotations.Mapper;
|
||||
|
||||
/**
|
||||
@@ -11,6 +11,6 @@ import org.apache.ibatis.annotations.Mapper;
|
||||
* @date 2018-09-27 15:20:44
|
||||
*/
|
||||
@Mapper
|
||||
public interface LeaveBillMapper extends BaseMapper<LeaveBill> {
|
||||
public interface LeaveBillMapper extends PigxBaseMapper<LeaveBill> {
|
||||
|
||||
}
|
||||
+2
-2
@@ -17,7 +17,7 @@
|
||||
|
||||
package com.pig4cloud.pigx.pay.mapper;
|
||||
|
||||
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
|
||||
import com.pig4cloud.pigx.common.data.datascope.PigxBaseMapper;
|
||||
import com.pig4cloud.pigx.pay.entity.PayChannel;
|
||||
import org.apache.ibatis.annotations.Mapper;
|
||||
|
||||
@@ -28,6 +28,6 @@ import org.apache.ibatis.annotations.Mapper;
|
||||
* @date 2019-05-28 23:57:58
|
||||
*/
|
||||
@Mapper
|
||||
public interface PayChannelMapper extends BaseMapper<PayChannel> {
|
||||
public interface PayChannelMapper extends PigxBaseMapper<PayChannel> {
|
||||
|
||||
}
|
||||
+2
-2
@@ -17,7 +17,7 @@
|
||||
|
||||
package com.pig4cloud.pigx.pay.mapper;
|
||||
|
||||
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
|
||||
import com.pig4cloud.pigx.common.data.datascope.PigxBaseMapper;
|
||||
import com.pig4cloud.pigx.pay.entity.PayGoodsOrder;
|
||||
import org.apache.ibatis.annotations.Mapper;
|
||||
|
||||
@@ -28,6 +28,6 @@ import org.apache.ibatis.annotations.Mapper;
|
||||
* @date 2019-05-28 23:58:27
|
||||
*/
|
||||
@Mapper
|
||||
public interface PayGoodsOrderMapper extends BaseMapper<PayGoodsOrder> {
|
||||
public interface PayGoodsOrderMapper extends PigxBaseMapper<PayGoodsOrder> {
|
||||
|
||||
}
|
||||
+2
-2
@@ -17,7 +17,7 @@
|
||||
|
||||
package com.pig4cloud.pigx.pay.mapper;
|
||||
|
||||
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
|
||||
import com.pig4cloud.pigx.common.data.datascope.PigxBaseMapper;
|
||||
import com.pig4cloud.pigx.pay.entity.PayNotifyRecord;
|
||||
import org.apache.ibatis.annotations.Mapper;
|
||||
|
||||
@@ -28,6 +28,6 @@ import org.apache.ibatis.annotations.Mapper;
|
||||
* @date 2019-05-28 23:57:23
|
||||
*/
|
||||
@Mapper
|
||||
public interface PayNotifyRecordMapper extends BaseMapper<PayNotifyRecord> {
|
||||
public interface PayNotifyRecordMapper extends PigxBaseMapper<PayNotifyRecord> {
|
||||
|
||||
}
|
||||
+2
-2
@@ -17,7 +17,7 @@
|
||||
|
||||
package com.pig4cloud.pigx.pay.mapper;
|
||||
|
||||
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
|
||||
import com.pig4cloud.pigx.common.data.datascope.PigxBaseMapper;
|
||||
import com.pig4cloud.pigx.pay.entity.PayRefundOrder;
|
||||
import org.apache.ibatis.annotations.Mapper;
|
||||
|
||||
@@ -28,6 +28,6 @@ import org.apache.ibatis.annotations.Mapper;
|
||||
* @date 2019-05-28 23:58:11
|
||||
*/
|
||||
@Mapper
|
||||
public interface PayRefundOrderMapper extends BaseMapper<PayRefundOrder> {
|
||||
public interface PayRefundOrderMapper extends PigxBaseMapper<PayRefundOrder> {
|
||||
|
||||
}
|
||||
+2
-2
@@ -17,7 +17,7 @@
|
||||
|
||||
package com.pig4cloud.pigx.pay.mapper;
|
||||
|
||||
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
|
||||
import com.pig4cloud.pigx.common.data.datascope.PigxBaseMapper;
|
||||
import com.pig4cloud.pigx.pay.entity.PayTradeOrder;
|
||||
import org.apache.ibatis.annotations.Mapper;
|
||||
|
||||
@@ -28,6 +28,6 @@ import org.apache.ibatis.annotations.Mapper;
|
||||
* @date 2019-05-28 23:58:18
|
||||
*/
|
||||
@Mapper
|
||||
public interface PayTradeOrderMapper extends BaseMapper<PayTradeOrder> {
|
||||
public interface PayTradeOrderMapper extends PigxBaseMapper<PayTradeOrder> {
|
||||
|
||||
}
|
||||
Reference in new issue
Block a user