diff --git a/pig-codegen/src/main/java/com/pig4cloud/pig/codegen/config/MybatisPlusConfigurer.java b/pig-codegen/src/main/java/com/pig4cloud/pig/codegen/config/MybatisPlusConfiguration.java similarity index 89% rename from pig-codegen/src/main/java/com/pig4cloud/pig/codegen/config/MybatisPlusConfigurer.java rename to pig-codegen/src/main/java/com/pig4cloud/pig/codegen/config/MybatisPlusConfiguration.java index 49a26aa6..a328390d 100755 --- a/pig-codegen/src/main/java/com/pig4cloud/pig/codegen/config/MybatisPlusConfigurer.java +++ b/pig-codegen/src/main/java/com/pig4cloud/pig/codegen/config/MybatisPlusConfiguration.java @@ -17,7 +17,6 @@ package com.pig4cloud.pig.codegen.config; import com.baomidou.mybatisplus.extension.plugins.PaginationInterceptor; -import org.mybatis.spring.annotation.MapperScan; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; @@ -26,8 +25,7 @@ import org.springframework.context.annotation.Configuration; * @date 2019/2/1 */ @Configuration -@MapperScan("com.pig4cloud.pig.codegen.mapper") -public class MybatisPlusConfigurer { +public class MybatisPlusConfiguration { /** * 分页插件 * diff --git a/pig-codegen/src/main/java/com/pig4cloud/pig/codegen/mapper/SysGeneratorMapper.java b/pig-codegen/src/main/java/com/pig4cloud/pig/codegen/mapper/SysGeneratorMapper.java index 0101b48d..9e5454d1 100755 --- a/pig-codegen/src/main/java/com/pig4cloud/pig/codegen/mapper/SysGeneratorMapper.java +++ b/pig-codegen/src/main/java/com/pig4cloud/pig/codegen/mapper/SysGeneratorMapper.java @@ -18,6 +18,7 @@ package com.pig4cloud.pig.codegen.mapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; import java.util.List; @@ -29,6 +30,7 @@ import java.util.Map; * @author lengleng * @date 2019/2/1 */ +@Mapper public interface SysGeneratorMapper { /** diff --git a/pig-upms/pig-upms-biz/src/main/java/com/pig4cloud/pig/admin/config/MybatisPlusConfigurer.java b/pig-upms/pig-upms-biz/src/main/java/com/pig4cloud/pig/admin/config/MybatisPlusConfiguration.java similarity index 91% rename from pig-upms/pig-upms-biz/src/main/java/com/pig4cloud/pig/admin/config/MybatisPlusConfigurer.java rename to pig-upms/pig-upms-biz/src/main/java/com/pig4cloud/pig/admin/config/MybatisPlusConfiguration.java index f5b77bd9..03fb9e85 100755 --- a/pig-upms/pig-upms-biz/src/main/java/com/pig4cloud/pig/admin/config/MybatisPlusConfigurer.java +++ b/pig-upms/pig-upms-biz/src/main/java/com/pig4cloud/pig/admin/config/MybatisPlusConfiguration.java @@ -18,7 +18,6 @@ package com.pig4cloud.pig.admin.config; import com.baomidou.mybatisplus.extension.plugins.PaginationInterceptor; import com.pig4cloud.pig.common.core.mybatis.DataScopeInterceptor; -import org.mybatis.spring.annotation.MapperScan; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; @@ -27,8 +26,7 @@ import org.springframework.context.annotation.Configuration; * @date 2019/2/1 */ @Configuration -@MapperScan("com.pig4cloud.pig.admin.mapper") -public class MybatisPlusConfigurer { +public class MybatisPlusConfiguration { /** * 分页插件 * diff --git a/pig-upms/pig-upms-biz/src/main/java/com/pig4cloud/pig/admin/mapper/SysDeptMapper.java b/pig-upms/pig-upms-biz/src/main/java/com/pig4cloud/pig/admin/mapper/SysDeptMapper.java index 248df7fe..cc8fdbce 100644 --- a/pig-upms/pig-upms-biz/src/main/java/com/pig4cloud/pig/admin/mapper/SysDeptMapper.java +++ b/pig-upms/pig-upms-biz/src/main/java/com/pig4cloud/pig/admin/mapper/SysDeptMapper.java @@ -18,6 +18,7 @@ package com.pig4cloud.pig.admin.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.pig4cloud.pig.admin.api.entity.SysDept; +import org.apache.ibatis.annotations.Mapper; import java.util.List; @@ -29,6 +30,7 @@ import java.util.List; * @author lengleng * @since 2019/2/1 */ +@Mapper public interface SysDeptMapper extends BaseMapper { /** diff --git a/pig-upms/pig-upms-biz/src/main/java/com/pig4cloud/pig/admin/mapper/SysDeptRelationMapper.java b/pig-upms/pig-upms-biz/src/main/java/com/pig4cloud/pig/admin/mapper/SysDeptRelationMapper.java index 8e923805..2638c717 100644 --- a/pig-upms/pig-upms-biz/src/main/java/com/pig4cloud/pig/admin/mapper/SysDeptRelationMapper.java +++ b/pig-upms/pig-upms-biz/src/main/java/com/pig4cloud/pig/admin/mapper/SysDeptRelationMapper.java @@ -18,6 +18,7 @@ package com.pig4cloud.pig.admin.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.pig4cloud.pig.admin.api.entity.SysDeptRelation; +import org.apache.ibatis.annotations.Mapper; /** *

@@ -27,6 +28,7 @@ import com.pig4cloud.pig.admin.api.entity.SysDeptRelation; * @author lengleng * @since 2019/2/1 */ +@Mapper public interface SysDeptRelationMapper extends BaseMapper { /** * 删除部门关系表数据 diff --git a/pig-upms/pig-upms-biz/src/main/java/com/pig4cloud/pig/admin/mapper/SysDictMapper.java b/pig-upms/pig-upms-biz/src/main/java/com/pig4cloud/pig/admin/mapper/SysDictMapper.java index 14af75ec..e29462cd 100644 --- a/pig-upms/pig-upms-biz/src/main/java/com/pig4cloud/pig/admin/mapper/SysDictMapper.java +++ b/pig-upms/pig-upms-biz/src/main/java/com/pig4cloud/pig/admin/mapper/SysDictMapper.java @@ -18,6 +18,7 @@ package com.pig4cloud.pig.admin.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.pig4cloud.pig.admin.api.entity.SysDict; +import org.apache.ibatis.annotations.Mapper; /** *

@@ -27,6 +28,7 @@ import com.pig4cloud.pig.admin.api.entity.SysDict; * @author lengleng * @since 2019/2/1 */ +@Mapper public interface SysDictMapper extends BaseMapper { } diff --git a/pig-upms/pig-upms-biz/src/main/java/com/pig4cloud/pig/admin/mapper/SysLogMapper.java b/pig-upms/pig-upms-biz/src/main/java/com/pig4cloud/pig/admin/mapper/SysLogMapper.java index 5910ea13..049182d1 100644 --- a/pig-upms/pig-upms-biz/src/main/java/com/pig4cloud/pig/admin/mapper/SysLogMapper.java +++ b/pig-upms/pig-upms-biz/src/main/java/com/pig4cloud/pig/admin/mapper/SysLogMapper.java @@ -18,6 +18,7 @@ package com.pig4cloud.pig.admin.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.pig4cloud.pig.admin.api.entity.SysLog; +import org.apache.ibatis.annotations.Mapper; /** *

@@ -27,5 +28,6 @@ import com.pig4cloud.pig.admin.api.entity.SysLog; * @author lengleng * @since 2019/2/1 */ +@Mapper public interface SysLogMapper extends BaseMapper { } diff --git a/pig-upms/pig-upms-biz/src/main/java/com/pig4cloud/pig/admin/mapper/SysMenuMapper.java b/pig-upms/pig-upms-biz/src/main/java/com/pig4cloud/pig/admin/mapper/SysMenuMapper.java index ffa60597..87db6790 100644 --- a/pig-upms/pig-upms-biz/src/main/java/com/pig4cloud/pig/admin/mapper/SysMenuMapper.java +++ b/pig-upms/pig-upms-biz/src/main/java/com/pig4cloud/pig/admin/mapper/SysMenuMapper.java @@ -19,6 +19,7 @@ package com.pig4cloud.pig.admin.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.pig4cloud.pig.admin.api.entity.SysMenu; import com.pig4cloud.pig.admin.api.vo.MenuVO; +import org.apache.ibatis.annotations.Mapper; import java.util.List; @@ -30,6 +31,7 @@ import java.util.List; * @author lengleng * @since 2019/2/1 */ +@Mapper public interface SysMenuMapper extends BaseMapper { /** diff --git a/pig-upms/pig-upms-biz/src/main/java/com/pig4cloud/pig/admin/mapper/SysOauthClientDetailsMapper.java b/pig-upms/pig-upms-biz/src/main/java/com/pig4cloud/pig/admin/mapper/SysOauthClientDetailsMapper.java index bfd4ffa2..f1bcd047 100644 --- a/pig-upms/pig-upms-biz/src/main/java/com/pig4cloud/pig/admin/mapper/SysOauthClientDetailsMapper.java +++ b/pig-upms/pig-upms-biz/src/main/java/com/pig4cloud/pig/admin/mapper/SysOauthClientDetailsMapper.java @@ -19,6 +19,7 @@ package com.pig4cloud.pig.admin.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.pig4cloud.pig.admin.api.entity.SysOauthClientDetails; +import org.apache.ibatis.annotations.Mapper; /** *

@@ -28,6 +29,7 @@ import com.pig4cloud.pig.admin.api.entity.SysOauthClientDetails; * @author lengleng * @since 2019/2/1 */ +@Mapper public interface SysOauthClientDetailsMapper extends BaseMapper { } diff --git a/pig-upms/pig-upms-biz/src/main/java/com/pig4cloud/pig/admin/mapper/SysRoleMapper.java b/pig-upms/pig-upms-biz/src/main/java/com/pig4cloud/pig/admin/mapper/SysRoleMapper.java index e4055100..06879c37 100644 --- a/pig-upms/pig-upms-biz/src/main/java/com/pig4cloud/pig/admin/mapper/SysRoleMapper.java +++ b/pig-upms/pig-upms-biz/src/main/java/com/pig4cloud/pig/admin/mapper/SysRoleMapper.java @@ -18,6 +18,7 @@ package com.pig4cloud.pig.admin.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.pig4cloud.pig.admin.api.entity.SysRole; +import org.apache.ibatis.annotations.Mapper; import java.util.List; @@ -29,6 +30,7 @@ import java.util.List; * @author lengleng * @since 2019/2/1 */ +@Mapper public interface SysRoleMapper extends BaseMapper { /** * 通过用户ID,查询角色信息 diff --git a/pig-upms/pig-upms-biz/src/main/java/com/pig4cloud/pig/admin/mapper/SysRoleMenuMapper.java b/pig-upms/pig-upms-biz/src/main/java/com/pig4cloud/pig/admin/mapper/SysRoleMenuMapper.java index 56aa71df..c8dd1a46 100644 --- a/pig-upms/pig-upms-biz/src/main/java/com/pig4cloud/pig/admin/mapper/SysRoleMenuMapper.java +++ b/pig-upms/pig-upms-biz/src/main/java/com/pig4cloud/pig/admin/mapper/SysRoleMenuMapper.java @@ -19,6 +19,7 @@ package com.pig4cloud.pig.admin.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.pig4cloud.pig.admin.api.entity.SysRoleMenu; +import org.apache.ibatis.annotations.Mapper; /** *

@@ -28,6 +29,7 @@ import com.pig4cloud.pig.admin.api.entity.SysRoleMenu; * @author lengleng * @since 2019/2/1 */ +@Mapper public interface SysRoleMenuMapper extends BaseMapper { } diff --git a/pig-upms/pig-upms-biz/src/main/java/com/pig4cloud/pig/admin/mapper/SysUserMapper.java b/pig-upms/pig-upms-biz/src/main/java/com/pig4cloud/pig/admin/mapper/SysUserMapper.java index 3fc30a9f..11ab896b 100644 --- a/pig-upms/pig-upms-biz/src/main/java/com/pig4cloud/pig/admin/mapper/SysUserMapper.java +++ b/pig-upms/pig-upms-biz/src/main/java/com/pig4cloud/pig/admin/mapper/SysUserMapper.java @@ -22,6 +22,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.pig4cloud.pig.admin.api.dto.UserDTO; import com.pig4cloud.pig.admin.api.entity.SysUser; import com.pig4cloud.pig.admin.api.vo.UserVO; +import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; import java.util.List; @@ -34,6 +35,7 @@ import java.util.List; * @author lengleng * @since 2019/2/1 */ +@Mapper public interface SysUserMapper extends BaseMapper { /** * 通过用户名查询用户信息(含有角色信息) diff --git a/pig-upms/pig-upms-biz/src/main/java/com/pig4cloud/pig/admin/mapper/SysUserRoleMapper.java b/pig-upms/pig-upms-biz/src/main/java/com/pig4cloud/pig/admin/mapper/SysUserRoleMapper.java index 6fa85e00..fa48384c 100644 --- a/pig-upms/pig-upms-biz/src/main/java/com/pig4cloud/pig/admin/mapper/SysUserRoleMapper.java +++ b/pig-upms/pig-upms-biz/src/main/java/com/pig4cloud/pig/admin/mapper/SysUserRoleMapper.java @@ -19,6 +19,7 @@ package com.pig4cloud.pig.admin.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.pig4cloud.pig.admin.api.entity.SysUserRole; +import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; /** @@ -29,6 +30,7 @@ import org.apache.ibatis.annotations.Param; * @author lengleng * @since 2019/2/1 */ +@Mapper public interface SysUserRoleMapper extends BaseMapper { /** * 根据用户Id删除该用户的角色关系