diff --git a/pigx-common/pigx-common-data/src/main/java/com/pig4cloud/pigx/common/data/datascope/DataScopeSqlInjector.java b/pigx-common/pigx-common-data/src/main/java/com/pig4cloud/pigx/common/data/datascope/DataScopeSqlInjector.java index 58a44aeb7..9ccf7f1f7 100644 --- a/pigx-common/pigx-common-data/src/main/java/com/pig4cloud/pigx/common/data/datascope/DataScopeSqlInjector.java +++ b/pigx-common/pigx-common-data/src/main/java/com/pig4cloud/pigx/common/data/datascope/DataScopeSqlInjector.java @@ -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; } diff --git a/pigx-common/pigx-common-data/src/main/java/com/pig4cloud/pigx/common/data/datascope/DataScopeMapper.java b/pigx-common/pigx-common-data/src/main/java/com/pig4cloud/pigx/common/data/datascope/PigxBaseMapper.java similarity index 82% rename from pigx-common/pigx-common-data/src/main/java/com/pig4cloud/pigx/common/data/datascope/DataScopeMapper.java rename to pigx-common/pigx-common-data/src/main/java/com/pig4cloud/pigx/common/data/datascope/PigxBaseMapper.java index c14f2a42c..9c3e28f16 100644 --- a/pigx-common/pigx-common-data/src/main/java/com/pig4cloud/pigx/common/data/datascope/DataScopeMapper.java +++ b/pigx-common/pigx-common-data/src/main/java/com/pig4cloud/pigx/common/data/datascope/PigxBaseMapper.java @@ -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 extends BaseMapper { +public interface PigxBaseMapper extends BaseMapper { /** * 根据 entity 条件，查询全部记录 @@ -42,4 +42,11 @@ public interface DataScopeMapper extends BaseMapper { */ Integer selectCountByScope(@Param(Constants.WRAPPER) Wrapper queryWrapper, DataScope scope); + /** + * 批量插入 仅适用于 mysql + * @param entityList 实体列表 + * @return 影响行数 + */ + Integer insertBatchSomeColumn(List entityList); + } diff --git a/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/mapper/SysDeptMapper.java b/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/mapper/SysDeptMapper.java index bf32f7df0..e50fb1848 100644 --- a/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/mapper/SysDeptMapper.java +++ b/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/mapper/SysDeptMapper.java @@ -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 { +public interface SysDeptMapper extends PigxBaseMapper { } diff --git a/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/mapper/SysDeptRelationMapper.java b/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/mapper/SysDeptRelationMapper.java index de75977df..4b7a6f956 100644 --- a/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/mapper/SysDeptRelationMapper.java +++ b/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/mapper/SysDeptRelationMapper.java @@ -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 { +public interface SysDeptRelationMapper extends PigxBaseMapper { /** * 删除部门关系表数据 diff --git a/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/mapper/SysDictItemMapper.java b/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/mapper/SysDictItemMapper.java index 5b942a6ce..5d7dd738c 100755 --- a/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/mapper/SysDictItemMapper.java +++ b/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/mapper/SysDictItemMapper.java @@ -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 { +public interface SysDictItemMapper extends PigxBaseMapper { } diff --git a/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/mapper/SysDictMapper.java b/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/mapper/SysDictMapper.java index 318460179..4af6ffb4a 100644 --- a/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/mapper/SysDictMapper.java +++ b/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/mapper/SysDictMapper.java @@ -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 { +public interface SysDictMapper extends PigxBaseMapper { } diff --git a/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/mapper/SysFileMapper.java b/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/mapper/SysFileMapper.java index d8f4140aa..680c89624 100644 --- a/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/mapper/SysFileMapper.java +++ b/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/mapper/SysFileMapper.java @@ -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 { +public interface SysFileMapper extends PigxBaseMapper { } diff --git a/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/mapper/SysLogMapper.java b/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/mapper/SysLogMapper.java index 523e0f74f..d6d84f549 100644 --- a/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/mapper/SysLogMapper.java +++ b/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/mapper/SysLogMapper.java @@ -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 { +public interface SysLogMapper extends PigxBaseMapper { } diff --git a/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/mapper/SysMenuMapper.java b/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/mapper/SysMenuMapper.java index c2baeb7f1..98cf57667 100644 --- a/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/mapper/SysMenuMapper.java +++ b/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/mapper/SysMenuMapper.java @@ -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 { +public interface SysMenuMapper extends PigxBaseMapper { /** * 通过角色编号查询菜单 diff --git a/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/mapper/SysOauthClientDetailsMapper.java b/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/mapper/SysOauthClientDetailsMapper.java index 883345d90..6e8201873 100644 --- a/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/mapper/SysOauthClientDetailsMapper.java +++ b/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/mapper/SysOauthClientDetailsMapper.java @@ -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 { +public interface SysOauthClientDetailsMapper extends PigxBaseMapper { } diff --git a/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/mapper/SysPublicParamMapper.java b/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/mapper/SysPublicParamMapper.java index 8fce8c9aa..24c167c61 100644 --- a/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/mapper/SysPublicParamMapper.java +++ b/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/mapper/SysPublicParamMapper.java @@ -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 { +public interface SysPublicParamMapper extends PigxBaseMapper { } diff --git a/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/mapper/SysRoleMapper.java b/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/mapper/SysRoleMapper.java index a52223f3c..4989814a6 100644 --- a/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/mapper/SysRoleMapper.java +++ b/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/mapper/SysRoleMapper.java @@ -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 { +public interface SysRoleMapper extends PigxBaseMapper { /** * 通过用户ID，查询角色信息 diff --git a/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/mapper/SysRoleMenuMapper.java b/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/mapper/SysRoleMenuMapper.java index a5c91f008..a51573d48 100644 --- a/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/mapper/SysRoleMenuMapper.java +++ b/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/mapper/SysRoleMenuMapper.java @@ -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 { +public interface SysRoleMenuMapper extends PigxBaseMapper { } diff --git a/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/mapper/SysRouteConfMapper.java b/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/mapper/SysRouteConfMapper.java index 73527d2c0..d7e869a48 100755 --- a/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/mapper/SysRouteConfMapper.java +++ b/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/mapper/SysRouteConfMapper.java @@ -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 { +public interface SysRouteConfMapper extends PigxBaseMapper { } diff --git a/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/mapper/SysSocialDetailsMapper.java b/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/mapper/SysSocialDetailsMapper.java index 56d97f349..ff606f46b 100755 --- a/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/mapper/SysSocialDetailsMapper.java +++ b/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/mapper/SysSocialDetailsMapper.java @@ -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 { +public interface SysSocialDetailsMapper extends PigxBaseMapper { } diff --git a/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/mapper/SysTenantMapper.java b/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/mapper/SysTenantMapper.java index e8ef8af7e..9a1f0b893 100755 --- a/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/mapper/SysTenantMapper.java +++ b/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/mapper/SysTenantMapper.java @@ -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 { +public interface SysTenantMapper extends PigxBaseMapper { } diff --git a/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/mapper/SysUserMapper.java b/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/mapper/SysUserMapper.java index 1854965b6..90f8dbaa4 100644 --- a/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/mapper/SysUserMapper.java +++ b/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/mapper/SysUserMapper.java @@ -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 { +public interface SysUserMapper extends PigxBaseMapper { /** * 通过用户名查询用户信息（含有角色信息） diff --git a/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/mapper/SysUserRoleMapper.java b/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/mapper/SysUserRoleMapper.java index 503d04b92..794387d65 100644 --- a/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/mapper/SysUserRoleMapper.java +++ b/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/mapper/SysUserRoleMapper.java @@ -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 { +public interface SysUserRoleMapper extends PigxBaseMapper { /** * 根据用户Id删除该用户的角色关系 diff --git a/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/service/impl/SysDeptRelationServiceImpl.java b/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/service/impl/SysDeptRelationServiceImpl.java index 2f1828330..d109ff911 100644 --- a/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/service/impl/SysDeptRelationServiceImpl.java +++ b/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/service/impl/SysDeptRelationServiceImpl.java @@ -63,7 +63,7 @@ public class SysDeptRelationServiceImpl extends ServiceImpl impleme log.setCreateBy(pre.getUser()); return log; }).collect(Collectors.toList()); - return this.saveBatch(sysLogs); + baseMapper.insertBatchSomeColumn(sysLogs); + return Boolean.TRUE; } } diff --git a/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/service/impl/SysRoleMenuServiceImpl.java b/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/service/impl/SysRoleMenuServiceImpl.java index c989929e5..1192167a7 100644 --- a/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/service/impl/SysRoleMenuServiceImpl.java +++ b/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/service/impl/SysRoleMenuServiceImpl.java @@ -74,7 +74,9 @@ public class SysRoleMenuServiceImpl extends ServiceImpl { // 查询系统内置字典 - 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.lambdaQuery().in(SysDictItem::getDictId, dictIdList))); + dictItemList.addAll(dictItemMapper + .selectList(Wrappers.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 newMenuList = menuService.list(); + List newMenuList = menuMapper.selectList(Wrappers.emptyWrapper()); // 查询全部菜单,构造角色菜单关系 List collect = newMenuList.stream().map(menu -> { @@ -169,19 +170,20 @@ public class SysTenantServiceImpl extends ServiceImpl 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 childrenList = node.getChildren().stream().map(treeNode -> (MenuTree) treeNode) .collect(Collectors.toList()); diff --git a/pigx-visual/pigx-codegen/src/main/java/com/pig4cloud/pigx/codegen/mapper/GenDatasourceConfMapper.java b/pigx-visual/pigx-codegen/src/main/java/com/pig4cloud/pigx/codegen/mapper/GenDatasourceConfMapper.java index d5ce7707e..7bbaf77bb 100755 --- a/pigx-visual/pigx-codegen/src/main/java/com/pig4cloud/pigx/codegen/mapper/GenDatasourceConfMapper.java +++ b/pigx-visual/pigx-codegen/src/main/java/com/pig4cloud/pigx/codegen/mapper/GenDatasourceConfMapper.java @@ -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 { +public interface GenDatasourceConfMapper extends PigxBaseMapper { } diff --git a/pigx-visual/pigx-codegen/src/main/java/com/pig4cloud/pigx/codegen/mapper/GenFormConfMapper.java b/pigx-visual/pigx-codegen/src/main/java/com/pig4cloud/pigx/codegen/mapper/GenFormConfMapper.java index d9e0d1b57..2525d00b4 100755 --- a/pigx-visual/pigx-codegen/src/main/java/com/pig4cloud/pigx/codegen/mapper/GenFormConfMapper.java +++ b/pigx-visual/pigx-codegen/src/main/java/com/pig4cloud/pigx/codegen/mapper/GenFormConfMapper.java @@ -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 { +public interface GenFormConfMapper extends PigxBaseMapper { } diff --git a/pigx-visual/pigx-codegen/src/main/java/com/pig4cloud/pigx/codegen/mapper/GenTableColumnMapper.java b/pigx-visual/pigx-codegen/src/main/java/com/pig4cloud/pigx/codegen/mapper/GenTableColumnMapper.java index f707fc3d4..3567d6e39 100644 --- a/pigx-visual/pigx-codegen/src/main/java/com/pig4cloud/pigx/codegen/mapper/GenTableColumnMapper.java +++ b/pigx-visual/pigx-codegen/src/main/java/com/pig4cloud/pigx/codegen/mapper/GenTableColumnMapper.java @@ -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 { +public interface GenTableColumnMapper extends PigxBaseMapper { /** * 分页查询表分页信息 diff --git a/pigx-visual/pigx-codegen/src/main/resources/template/Mapper.java.vm b/pigx-visual/pigx-codegen/src/main/resources/template/Mapper.java.vm index d5f3d3937..766eb05a6 100755 --- a/pigx-visual/pigx-codegen/src/main/resources/template/Mapper.java.vm +++ b/pigx-visual/pigx-codegen/src/main/resources/template/Mapper.java.vm @@ -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}> { } diff --git a/pigx-visual/pigx-daemon-quartz/src/main/java/com/pig4cloud/pigx/daemon/quartz/mapper/SysJobLogMapper.java b/pigx-visual/pigx-daemon-quartz/src/main/java/com/pig4cloud/pigx/daemon/quartz/mapper/SysJobLogMapper.java index ea9181c1b..42f8c7baf 100644 --- a/pigx-visual/pigx-daemon-quartz/src/main/java/com/pig4cloud/pigx/daemon/quartz/mapper/SysJobLogMapper.java +++ b/pigx-visual/pigx-daemon-quartz/src/main/java/com/pig4cloud/pigx/daemon/quartz/mapper/SysJobLogMapper.java @@ -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 { +public interface SysJobLogMapper extends PigxBaseMapper { } diff --git a/pigx-visual/pigx-daemon-quartz/src/main/java/com/pig4cloud/pigx/daemon/quartz/mapper/SysJobMapper.java b/pigx-visual/pigx-daemon-quartz/src/main/java/com/pig4cloud/pigx/daemon/quartz/mapper/SysJobMapper.java index 475edc918..ff5479c1a 100644 --- a/pigx-visual/pigx-daemon-quartz/src/main/java/com/pig4cloud/pigx/daemon/quartz/mapper/SysJobMapper.java +++ b/pigx-visual/pigx-daemon-quartz/src/main/java/com/pig4cloud/pigx/daemon/quartz/mapper/SysJobMapper.java @@ -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 { +public interface SysJobMapper extends PigxBaseMapper { } diff --git a/pigx-visual/pigx-mp-platform/src/main/java/com/pig4cloud/pigx/mp/mapper/WxAccountFansMapper.java b/pigx-visual/pigx-mp-platform/src/main/java/com/pig4cloud/pigx/mp/mapper/WxAccountFansMapper.java index 723072783..6bd6102b2 100755 --- a/pigx-visual/pigx-mp-platform/src/main/java/com/pig4cloud/pigx/mp/mapper/WxAccountFansMapper.java +++ b/pigx-visual/pigx-mp-platform/src/main/java/com/pig4cloud/pigx/mp/mapper/WxAccountFansMapper.java @@ -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 { +public interface WxAccountFansMapper extends PigxBaseMapper { } diff --git a/pigx-visual/pigx-mp-platform/src/main/java/com/pig4cloud/pigx/mp/mapper/WxAccountMapper.java b/pigx-visual/pigx-mp-platform/src/main/java/com/pig4cloud/pigx/mp/mapper/WxAccountMapper.java index 011dd1cc4..7df9af160 100755 --- a/pigx-visual/pigx-mp-platform/src/main/java/com/pig4cloud/pigx/mp/mapper/WxAccountMapper.java +++ b/pigx-visual/pigx-mp-platform/src/main/java/com/pig4cloud/pigx/mp/mapper/WxAccountMapper.java @@ -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 { +public interface WxAccountMapper extends PigxBaseMapper { } diff --git a/pigx-visual/pigx-mp-platform/src/main/java/com/pig4cloud/pigx/mp/mapper/WxAutoReplyMapper.java b/pigx-visual/pigx-mp-platform/src/main/java/com/pig4cloud/pigx/mp/mapper/WxAutoReplyMapper.java index cfcab240b..ffa2ea1c4 100644 --- a/pigx-visual/pigx-mp-platform/src/main/java/com/pig4cloud/pigx/mp/mapper/WxAutoReplyMapper.java +++ b/pigx-visual/pigx-mp-platform/src/main/java/com/pig4cloud/pigx/mp/mapper/WxAutoReplyMapper.java @@ -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 { +public interface WxAutoReplyMapper extends PigxBaseMapper { } diff --git a/pigx-visual/pigx-mp-platform/src/main/java/com/pig4cloud/pigx/mp/mapper/WxFansMsgResMapper.java b/pigx-visual/pigx-mp-platform/src/main/java/com/pig4cloud/pigx/mp/mapper/WxFansMsgResMapper.java index 8a21ccfe5..34f3f2de3 100755 --- a/pigx-visual/pigx-mp-platform/src/main/java/com/pig4cloud/pigx/mp/mapper/WxFansMsgResMapper.java +++ b/pigx-visual/pigx-mp-platform/src/main/java/com/pig4cloud/pigx/mp/mapper/WxFansMsgResMapper.java @@ -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 { +public interface WxFansMsgResMapper extends PigxBaseMapper { } diff --git a/pigx-visual/pigx-mp-platform/src/main/java/com/pig4cloud/pigx/mp/mapper/WxMenuMapper.java b/pigx-visual/pigx-mp-platform/src/main/java/com/pig4cloud/pigx/mp/mapper/WxMenuMapper.java index facf5174d..0931af743 100755 --- a/pigx-visual/pigx-mp-platform/src/main/java/com/pig4cloud/pigx/mp/mapper/WxMenuMapper.java +++ b/pigx-visual/pigx-mp-platform/src/main/java/com/pig4cloud/pigx/mp/mapper/WxMenuMapper.java @@ -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 { +public interface WxMenuMapper extends PigxBaseMapper { } diff --git a/pigx-visual/pigx-mp-platform/src/main/java/com/pig4cloud/pigx/mp/mapper/WxMsgMapper.java b/pigx-visual/pigx-mp-platform/src/main/java/com/pig4cloud/pigx/mp/mapper/WxMsgMapper.java index e1065e52c..cb480f023 100644 --- a/pigx-visual/pigx-mp-platform/src/main/java/com/pig4cloud/pigx/mp/mapper/WxMsgMapper.java +++ b/pigx-visual/pigx-mp-platform/src/main/java/com/pig4cloud/pigx/mp/mapper/WxMsgMapper.java @@ -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 { +public interface WxMsgMapper extends PigxBaseMapper { } diff --git a/pigx-visual/pigx-oa-platform/src/main/java/com/pig4cloud/pigx/act/mapper/LeaveBillMapper.java b/pigx-visual/pigx-oa-platform/src/main/java/com/pig4cloud/pigx/act/mapper/LeaveBillMapper.java index a44951773..4bd316295 100755 --- a/pigx-visual/pigx-oa-platform/src/main/java/com/pig4cloud/pigx/act/mapper/LeaveBillMapper.java +++ b/pigx-visual/pigx-oa-platform/src/main/java/com/pig4cloud/pigx/act/mapper/LeaveBillMapper.java @@ -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 { +public interface LeaveBillMapper extends PigxBaseMapper { } diff --git a/pigx-visual/pigx-pay-platform/src/main/java/com/pig4cloud/pigx/pay/mapper/PayChannelMapper.java b/pigx-visual/pigx-pay-platform/src/main/java/com/pig4cloud/pigx/pay/mapper/PayChannelMapper.java index 8886d65b4..183c801e6 100755 --- a/pigx-visual/pigx-pay-platform/src/main/java/com/pig4cloud/pigx/pay/mapper/PayChannelMapper.java +++ b/pigx-visual/pigx-pay-platform/src/main/java/com/pig4cloud/pigx/pay/mapper/PayChannelMapper.java @@ -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 { +public interface PayChannelMapper extends PigxBaseMapper { } diff --git a/pigx-visual/pigx-pay-platform/src/main/java/com/pig4cloud/pigx/pay/mapper/PayGoodsOrderMapper.java b/pigx-visual/pigx-pay-platform/src/main/java/com/pig4cloud/pigx/pay/mapper/PayGoodsOrderMapper.java index 9e9a2c500..ac73f1873 100755 --- a/pigx-visual/pigx-pay-platform/src/main/java/com/pig4cloud/pigx/pay/mapper/PayGoodsOrderMapper.java +++ b/pigx-visual/pigx-pay-platform/src/main/java/com/pig4cloud/pigx/pay/mapper/PayGoodsOrderMapper.java @@ -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 { +public interface PayGoodsOrderMapper extends PigxBaseMapper { } diff --git a/pigx-visual/pigx-pay-platform/src/main/java/com/pig4cloud/pigx/pay/mapper/PayNotifyRecordMapper.java b/pigx-visual/pigx-pay-platform/src/main/java/com/pig4cloud/pigx/pay/mapper/PayNotifyRecordMapper.java index d803b2755..c07105b94 100755 --- a/pigx-visual/pigx-pay-platform/src/main/java/com/pig4cloud/pigx/pay/mapper/PayNotifyRecordMapper.java +++ b/pigx-visual/pigx-pay-platform/src/main/java/com/pig4cloud/pigx/pay/mapper/PayNotifyRecordMapper.java @@ -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 { +public interface PayNotifyRecordMapper extends PigxBaseMapper { } diff --git a/pigx-visual/pigx-pay-platform/src/main/java/com/pig4cloud/pigx/pay/mapper/PayRefundOrderMapper.java b/pigx-visual/pigx-pay-platform/src/main/java/com/pig4cloud/pigx/pay/mapper/PayRefundOrderMapper.java index b7f66688c..cb67e6b31 100755 --- a/pigx-visual/pigx-pay-platform/src/main/java/com/pig4cloud/pigx/pay/mapper/PayRefundOrderMapper.java +++ b/pigx-visual/pigx-pay-platform/src/main/java/com/pig4cloud/pigx/pay/mapper/PayRefundOrderMapper.java @@ -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 { +public interface PayRefundOrderMapper extends PigxBaseMapper { } diff --git a/pigx-visual/pigx-pay-platform/src/main/java/com/pig4cloud/pigx/pay/mapper/PayTradeOrderMapper.java b/pigx-visual/pigx-pay-platform/src/main/java/com/pig4cloud/pigx/pay/mapper/PayTradeOrderMapper.java index 38cb16782..f0574ee9d 100755 --- a/pigx-visual/pigx-pay-platform/src/main/java/com/pig4cloud/pigx/pay/mapper/PayTradeOrderMapper.java +++ b/pigx-visual/pigx-pay-platform/src/main/java/com/pig4cloud/pigx/pay/mapper/PayTradeOrderMapper.java @@ -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 { +public interface PayTradeOrderMapper extends PigxBaseMapper { }