From 90d4fd8cf1db71cf51cfc2694290a9a4bc53344e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=96=AF=E7=8B=82=E7=9A=84=E7=8B=AE=E5=AD=90li?= <15040126243@163.com> Date: Sat, 24 Jul 2021 21:19:05 +0800 Subject: [PATCH] =?UTF-8?q?update=20[=E9=87=8D=E5=A4=A7=E6=94=B9=E5=8A=A8]?= =?UTF-8?q?=20=E9=87=8D=E5=86=99VO=E8=BD=AC=E6=8D=A2=20=E6=94=AF=E6=8C=81?= =?UTF-8?q?=E6=B7=B1=E6=8B=B7=E8=B4=9D=20=E5=B0=86VO=E7=B1=BB=E6=8A=BD?= =?UTF-8?q?=E8=B1=A1=E5=88=B0=20ServicePlus=20=E6=B3=9B=E5=9E=8B=E5=A4=84?= =?UTF-8?q?=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../core/mybatisplus/core/IServicePlus.java | 303 +++++------------- .../mybatisplus/core/ServicePlusImpl.java | 126 +++++++- .../ruoyi/demo/service/ITestDemoService.java | 2 +- .../ruoyi/demo/service/ITestTreeService.java | 2 +- .../service/impl/TestDemoServiceImpl.java | 8 +- .../service/impl/TestTreeServiceImpl.java | 6 +- .../service/GenTableColumnServiceImpl.java | 4 +- .../service/GenTableServiceImpl.java | 9 +- .../service/IGenTableColumnService.java | 4 +- .../generator/service/IGenTableService.java | 4 +- .../main/resources/vm/java/service.java.vm | 2 +- .../resources/vm/java/serviceImpl.java.vm | 8 +- .../ruoyi/system/service/ISysOssService.java | 2 +- .../service/impl/SysOssServiceImpl.java | 4 +- .../quartz/service/ISysJobLogService.java | 4 +- .../ruoyi/quartz/service/ISysJobService.java | 4 +- .../service/impl/SysJobLogServiceImpl.java | 4 +- .../service/impl/SysJobServiceImpl.java | 4 +- .../system/service/ISysConfigService.java | 4 +- .../ruoyi/system/service/ISysDeptService.java | 4 +- .../system/service/ISysDictDataService.java | 4 +- .../system/service/ISysDictTypeService.java | 4 +- .../system/service/ISysLogininforService.java | 4 +- .../ruoyi/system/service/ISysMenuService.java | 4 +- .../system/service/ISysNoticeService.java | 4 +- .../system/service/ISysOperLogService.java | 4 +- .../ruoyi/system/service/ISysPostService.java | 4 +- .../ruoyi/system/service/ISysRoleService.java | 5 +- .../ruoyi/system/service/ISysUserService.java | 4 +- .../service/impl/SysConfigServiceImpl.java | 5 +- .../service/impl/SysDeptServiceImpl.java | 4 +- .../service/impl/SysDictDataServiceImpl.java | 4 +- .../service/impl/SysDictTypeServiceImpl.java | 4 +- .../impl/SysLogininforServiceImpl.java | 4 +- .../service/impl/SysMenuServiceImpl.java | 4 +- .../service/impl/SysNoticeServiceImpl.java | 4 +- .../service/impl/SysOperLogServiceImpl.java | 4 +- .../service/impl/SysPostServiceImpl.java | 4 +- .../service/impl/SysRoleServiceImpl.java | 4 +- .../service/impl/SysUserServiceImpl.java | 4 +- 40 files changed, 295 insertions(+), 295 deletions(-) diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/core/mybatisplus/core/IServicePlus.java b/ruoyi-common/src/main/java/com/ruoyi/common/core/mybatisplus/core/IServicePlus.java index 21b0ecce..e2d9a3dd 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/core/mybatisplus/core/IServicePlus.java +++ b/ruoyi-common/src/main/java/com/ruoyi/common/core/mybatisplus/core/IServicePlus.java @@ -1,6 +1,6 @@ package com.ruoyi.common.core.mybatisplus.core; -import cn.hutool.core.bean.BeanUtil; +import cn.hutool.core.bean.copier.CopyOptions; import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.service.IService; @@ -11,7 +11,6 @@ import java.util.Collection; import java.util.List; import java.util.Map; import java.util.function.Function; -import java.util.stream.Collectors; /** * 自定义 Service 接口, 实现 数据库实体与 vo 对象转换返回 @@ -19,225 +18,99 @@ import java.util.stream.Collectors; * @author Lion Li * @since 2021-05-13 */ -public interface IServicePlus extends IService { +public interface IServicePlus extends IService { - /** - * 根据 ID 查询 - * - * @param kClass vo类型 - * @param id 主键ID - */ - default K getVoById(Serializable id, Class kClass) { - T t = getBaseMapper().selectById(id); - return BeanUtil.toBean(t, kClass); - } + K getVoById(Serializable id, CopyOptions copyOptions); - /** - * 根据 ID 查询 - * - * @param id 主键ID - * @param convertor 转换函数 - * @param vo类型 - */ - default K getVoById(Serializable id, Function convertor) { - T t = getBaseMapper().selectById(id); - return convertor.apply(t); - } - - /** - * 查询（根据ID 批量查询） - * - * @param kClass vo类型 - * @param idList 主键ID列表 - */ - default List listVoByIds(Collection idList, Class kClass) { - List list = getBaseMapper().selectBatchIds(idList); - if (list == null) { - return null; - } - return list.stream() - .map(any -> BeanUtil.toBean(any, kClass)) - .collect(Collectors.toList()); - } - - /** - * 查询（根据ID 批量查询） - * - * @param convertor 转换函数 - * @param idList 主键ID列表 - */ - default List listVoByIds(Collection idList, - Function, List> convertor) { - List list = getBaseMapper().selectBatchIds(idList); - if (list == null) { - return null; - } - return convertor.apply(list); - } - - /** - * 查询（根据 columnMap 条件） - * - * @param kClass vo类型 - * @param columnMap 表字段 map 对象 - */ - default List listVoByMap(Map columnMap, Class kClass) { - List list = getBaseMapper().selectByMap(columnMap); - if (list == null) { - return null; - } - return list.stream() - .map(any -> BeanUtil.toBean(any, kClass)) - .collect(Collectors.toList()); - } - - /** - * 查询（根据 columnMap 条件） - * - * @param convertor 转换函数 - * @param columnMap 表字段 map 对象 - */ - default List listVoByMap(Map columnMap, - Function, List> convertor) { - List list = getBaseMapper().selectByMap(columnMap); - if (list == null) { - return null; - } - return convertor.apply(list); - } - - /** - * 根据 Wrapper，查询一条记录
- *

结果集，如果是多个会抛出异常，随机取一条加上限制条件 wrapper.last("LIMIT 1")

- * - * @param kClass vo类型 - * @param queryWrapper 实体对象封装操作类 {@link com.baomidou.mybatisplus.core.conditions.query.QueryWrapper} - */ - default K getVoOne(Wrapper queryWrapper, Class kClass) { - return BeanUtil.toBean(getOne(queryWrapper, true), kClass); - } - - /** - * 根据 Wrapper，查询一条记录
- *

结果集，如果是多个会抛出异常，随机取一条加上限制条件 wrapper.last("LIMIT 1")

- * - * @param convertor 转换函数 - * @param queryWrapper 实体对象封装操作类 {@link com.baomidou.mybatisplus.core.conditions.query.QueryWrapper} - */ - default K getVoOne(Wrapper queryWrapper, Function convertor) { - return convertor.apply(getOne(queryWrapper, true)); - } - - /** - * 查询列表 - * - * @param kClass vo类型 - * @param queryWrapper 实体对象封装操作类 {@link com.baomidou.mybatisplus.core.conditions.query.QueryWrapper} - */ - default List listVo(Wrapper queryWrapper, Class kClass) { - List list = getBaseMapper().selectList(queryWrapper); - if (list == null) { - return null; - } - return list.stream() - .map(any -> BeanUtil.toBean(any, kClass)) - .collect(Collectors.toList()); - } - - /** - * 查询列表 - * - * @param convertor 转换函数 - * @param queryWrapper 实体对象封装操作类 {@link com.baomidou.mybatisplus.core.conditions.query.QueryWrapper} - */ - default List listVo(Wrapper queryWrapper, Function, List> convertor) { - List list = getBaseMapper().selectList(queryWrapper); - if (list == null) { - return null; - } - return convertor.apply(list); - } - - /** - * 查询所有 - * - * @param kClass vo类型 - * @see Wrappers#emptyWrapper() - */ - default List listVo(Class kClass) { - return listVo(Wrappers.emptyWrapper(), kClass); - } - - /** - * 查询所有 - * - * @param convertor 转换函数 - * @see Wrappers#emptyWrapper() - */ - default List listVo(Function, List> convertor) { - return listVo(Wrappers.emptyWrapper(), convertor); - } - - /** - * 翻页查询 - * - * @param page 翻页对象 - * @param queryWrapper 实体对象封装操作类 - */ - default PagePlus pageVo(PagePlus page, Wrapper queryWrapper, Class kClass) { - PagePlus result = getBaseMapper().selectPage(page, queryWrapper); - List volist = result.getRecords().stream() - .map(any -> BeanUtil.toBean(any, kClass)) - .collect(Collectors.toList()); - result.setRecordsVo(volist); - return result; - } - - /** - * 翻页查询 - * - * @param page 翻页对象 - * @param queryWrapper 实体对象封装操作类 - * @param convertor 转换函数 - */ - default PagePlus pageVo(PagePlus page, Wrapper queryWrapper, - Function, List> convertor) { - PagePlus result = getBaseMapper().selectPage(page, queryWrapper); - return result.setRecordsVo(convertor.apply(result.getRecords())); - } - - /** - * 无条件翻页查询 - * - * @param page 翻页对象 - */ - default PagePlus pageVo(PagePlus page, Class kClass) { - return pageVo(page, Wrappers.emptyWrapper(), kClass); - } - - /** - * 无条件翻页查询 - * - * @param page 翻页对象 - * @param convertor 转换函数 - */ - default PagePlus pageVo(PagePlus page, Function, List> convertor) { - return pageVo(page, Wrappers.emptyWrapper(), convertor); - } - - @Override - default boolean saveBatch(Collection entityList) { - return saveBatch(entityList, DEFAULT_BATCH_SIZE); + default K getVoById(Serializable id) { + return getVoById(id, new CopyOptions()); } - @Override - default boolean saveOrUpdateBatch(Collection entityList) { - return saveOrUpdateBatch(entityList, DEFAULT_BATCH_SIZE); + default K getVoById(Serializable id, Function convertor) { + return convertor.apply(getById(id)); } - @Override - default boolean updateBatchById(Collection entityList) { - return updateBatchById(entityList, DEFAULT_BATCH_SIZE); + List listVoByIds(Collection idList, CopyOptions copyOptions); + + default List listVoByIds(Collection idList) { + return listVoByIds(idList, new CopyOptions()); + } + + default List listVoByIds(Collection idList, + Function, List> convertor) { + List list = getBaseMapper().selectBatchIds(idList); + if (list == null) { + return null; + } + return convertor.apply(list); + } + + List listVoByMap(Map columnMap, CopyOptions copyOptions); + + default List listVoByMap(Map columnMap) { + return listVoByMap(columnMap, new CopyOptions()); + } + + + default List listVoByMap(Map columnMap, + Function, List> convertor) { + List list = getBaseMapper().selectByMap(columnMap); + if (list == null) { + return null; + } + return convertor.apply(list); + } + + K getVoOne(Wrapper queryWrapper, CopyOptions copyOptions); + + default K getVoOne(Wrapper queryWrapper) { + return getVoOne(queryWrapper, new CopyOptions()); + } + + default K getVoOne(Wrapper queryWrapper, Function convertor) { + return convertor.apply(getOne(queryWrapper, true)); + } + + List listVo(Wrapper queryWrapper, CopyOptions copyOptions); + + default List listVo(Wrapper queryWrapper) { + return listVo(queryWrapper, new CopyOptions()); + } + + default List listVo(Wrapper queryWrapper, Function, List> convertor) { + List list = getBaseMapper().selectList(queryWrapper); + if (list == null) { + return null; + } + return convertor.apply(list); + } + + default List listVo() { + return listVo(Wrappers.emptyWrapper()); + } + + default List listVo(Function, List> convertor) { + return listVo(Wrappers.emptyWrapper(), convertor); + } + + PagePlus pageVo(PagePlus page, Wrapper queryWrapper, CopyOptions copyOptions); + + default PagePlus pageVo(PagePlus page, Wrapper queryWrapper) { + return pageVo(page, queryWrapper, new CopyOptions()); + } + + default PagePlus pageVo(PagePlus page, Wrapper queryWrapper, + Function, List> convertor) { + PagePlus result = getBaseMapper().selectPage(page, queryWrapper); + return result.setRecordsVo(convertor.apply(result.getRecords())); + } + + default PagePlus pageVo(PagePlus page) { + return pageVo(page, Wrappers.emptyWrapper()); + } + + default PagePlus pageVo(PagePlus page, Function, List> convertor) { + return pageVo(page, Wrappers.emptyWrapper(), convertor); } boolean saveAll(Collection entityList); diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/core/mybatisplus/core/ServicePlusImpl.java b/ruoyi-common/src/main/java/com/ruoyi/common/core/mybatisplus/core/ServicePlusImpl.java index fb0998b7..0325431f 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/core/mybatisplus/core/ServicePlusImpl.java +++ b/ruoyi-common/src/main/java/com/ruoyi/common/core/mybatisplus/core/ServicePlusImpl.java @@ -1,12 +1,21 @@ package com.ruoyi.common.core.mybatisplus.core; +import cn.hutool.core.bean.copier.BeanCopier; +import cn.hutool.core.bean.copier.CopyOptions; +import cn.hutool.core.util.ReflectUtil; +import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.core.toolkit.ClassUtils; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.ruoyi.common.core.page.PagePlus; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.core.ResolvableType; +import java.io.Serializable; import java.util.Collection; +import java.util.List; +import java.util.Map; +import java.util.stream.Collectors; /** * IServicePlus 实现类 @@ -15,7 +24,7 @@ import java.util.Collection; */ @Slf4j @SuppressWarnings("unchecked") -public class ServicePlusImpl, T> extends ServiceImpl implements IServicePlus { +public class ServicePlusImpl, T, K> extends ServiceImpl implements IServicePlus { @Autowired protected M baseMapper; @@ -35,6 +44,12 @@ public class ServicePlusImpl, T> extends ServiceImpl protected Class mapperClass = currentMapperClass(); + protected Class voClass = currentVoClass(); + + public Class getVoClass() { + return voClass; + } + @Override protected Class currentMapperClass() { return (Class) this.getResolvableType().as(ServicePlusImpl.class).getGeneric(0).getType(); @@ -45,6 +60,10 @@ public class ServicePlusImpl, T> extends ServiceImpl return (Class) this.getResolvableType().as(ServicePlusImpl.class).getGeneric(1).getType(); } + protected Class currentVoClass() { + return (Class) this.getResolvableType().as(ServicePlusImpl.class).getGeneric(2).getType(); + } + @Override protected ResolvableType getResolvableType() { return ResolvableType.forClass(ClassUtils.getUserClass(getClass())); @@ -76,6 +95,21 @@ public class ServicePlusImpl, T> extends ServiceImpl return super.updateBatchById(entityList, batchSize); } + @Override + public boolean saveBatch(Collection entityList) { + return saveBatch(entityList, DEFAULT_BATCH_SIZE); + } + + @Override + public boolean saveOrUpdateBatch(Collection entityList) { + return saveOrUpdateBatch(entityList, DEFAULT_BATCH_SIZE); + } + + @Override + public boolean updateBatchById(Collection entityList) { + return updateBatchById(entityList, DEFAULT_BATCH_SIZE); + } + /** * 单sql批量插入( 全量填充 无视数据库默认值 ) * 适用于无脑插入 @@ -85,4 +119,94 @@ public class ServicePlusImpl, T> extends ServiceImpl return baseMapper.insertAll(entityList) == entityList.size(); } + /** + * 根据 ID 查询 + * + * @param id 主键ID + */ + @Override + public K getVoById(Serializable id, CopyOptions copyOptions) { + T t = getBaseMapper().selectById(id); + return oneVoCopy(t, copyOptions); + } + + /** + * 查询（根据ID 批量查询） + * + * @param idList 主键ID列表 + */ + @Override + public List listVoByIds(Collection idList, CopyOptions copyOptions) { + List list = getBaseMapper().selectBatchIds(idList); + if (list == null) { + return null; + } + return listVoCopy(list, copyOptions); + } + + /** + * 查询（根据 columnMap 条件） + * + * @param columnMap 表字段 map 对象 + */ + @Override + public List listVoByMap(Map columnMap, CopyOptions copyOptions) { + List list = getBaseMapper().selectByMap(columnMap); + if (list == null) { + return null; + } + return listVoCopy(list, copyOptions); + } + + /** + * 根据 Wrapper，查询一条记录
+ *

结果集，如果是多个会抛出异常，随机取一条加上限制条件 wrapper.last("LIMIT 1")

+ * + * @param queryWrapper 实体对象封装操作类 {@link com.baomidou.mybatisplus.core.conditions.query.QueryWrapper} + */ + @Override + public K getVoOne(Wrapper queryWrapper, CopyOptions copyOptions) { + T t = getOne(queryWrapper, true); + return oneVoCopy(t, copyOptions); + } + + /** + * 查询列表 + * + * @param queryWrapper 实体对象封装操作类 {@link com.baomidou.mybatisplus.core.conditions.query.QueryWrapper} + */ + @Override + public List listVo(Wrapper queryWrapper, CopyOptions copyOptions) { + List list = getBaseMapper().selectList(queryWrapper); + if (list == null) { + return null; + } + return listVoCopy(list, copyOptions); + } + + /** + * 翻页查询 + * + * @param page 翻页对象 + * @param queryWrapper 实体对象封装操作类 + */ + @Override + public PagePlus pageVo(PagePlus page, Wrapper queryWrapper, CopyOptions copyOptions) { + PagePlus result = getBaseMapper().selectPage(page, queryWrapper); + List volist = listVoCopy(result.getRecords(), copyOptions); + result.setRecordsVo(volist); + return result; + } + + private K oneVoCopy(T t, CopyOptions copyOptions) { + K k = ReflectUtil.newInstanceIfPossible(voClass); + return BeanCopier.create(t, k, copyOptions).copy(); + } + + private List listVoCopy(List list, CopyOptions copyOptions) { + return list.stream() + .map(any -> BeanCopier.create(any, ReflectUtil.newInstanceIfPossible(voClass), copyOptions).copy()) + .collect(Collectors.toList()); + } + } diff --git a/ruoyi-demo/src/main/java/com/ruoyi/demo/service/ITestDemoService.java b/ruoyi-demo/src/main/java/com/ruoyi/demo/service/ITestDemoService.java index 26767038..ded47f73 100644 --- a/ruoyi-demo/src/main/java/com/ruoyi/demo/service/ITestDemoService.java +++ b/ruoyi-demo/src/main/java/com/ruoyi/demo/service/ITestDemoService.java @@ -17,7 +17,7 @@ import java.util.List; * @author Lion Li * @date 2021-05-30 */ -public interface ITestDemoService extends IServicePlus { +public interface ITestDemoService extends IServicePlus { /** * 查询单个 diff --git a/ruoyi-demo/src/main/java/com/ruoyi/demo/service/ITestTreeService.java b/ruoyi-demo/src/main/java/com/ruoyi/demo/service/ITestTreeService.java index 6f7be37c..e27fda02 100644 --- a/ruoyi-demo/src/main/java/com/ruoyi/demo/service/ITestTreeService.java +++ b/ruoyi-demo/src/main/java/com/ruoyi/demo/service/ITestTreeService.java @@ -16,7 +16,7 @@ import java.util.List; * @author Lion Li * @date 2021-05-30 */ -public interface ITestTreeService extends IServicePlus { +public interface ITestTreeService extends IServicePlus { /** * 查询单个 * @return diff --git a/ruoyi-demo/src/main/java/com/ruoyi/demo/service/impl/TestDemoServiceImpl.java b/ruoyi-demo/src/main/java/com/ruoyi/demo/service/impl/TestDemoServiceImpl.java index 552c70d9..7387a121 100644 --- a/ruoyi-demo/src/main/java/com/ruoyi/demo/service/impl/TestDemoServiceImpl.java +++ b/ruoyi-demo/src/main/java/com/ruoyi/demo/service/impl/TestDemoServiceImpl.java @@ -30,17 +30,17 @@ import java.util.Map; * @date 2021-05-30 */ @Service -public class TestDemoServiceImpl extends ServicePlusImpl implements ITestDemoService { +public class TestDemoServiceImpl extends ServicePlusImpl implements ITestDemoService { @Override public TestDemoVo queryById(Long id) { - return getVoById(id, TestDemoVo.class); + return getVoById(id); } @DataScope(isUser = true) @Override public TableDataInfo queryPageList(TestDemoQueryBo bo) { - PagePlus result = pageVo(PageUtils.buildPagePlus(), buildQueryWrapper(bo), TestDemoVo.class); + PagePlus result = pageVo(PageUtils.buildPagePlus(), buildQueryWrapper(bo)); return PageUtils.buildDataInfo(result); } @@ -57,7 +57,7 @@ public class TestDemoServiceImpl extends ServicePlusImpl queryList(TestDemoQueryBo bo) { - return listVo(buildQueryWrapper(bo), TestDemoVo.class); + return listVo(buildQueryWrapper(bo)); } private LambdaQueryWrapper buildQueryWrapper(TestDemoQueryBo bo) { diff --git a/ruoyi-demo/src/main/java/com/ruoyi/demo/service/impl/TestTreeServiceImpl.java b/ruoyi-demo/src/main/java/com/ruoyi/demo/service/impl/TestTreeServiceImpl.java index 36482f19..a84558b8 100644 --- a/ruoyi-demo/src/main/java/com/ruoyi/demo/service/impl/TestTreeServiceImpl.java +++ b/ruoyi-demo/src/main/java/com/ruoyi/demo/service/impl/TestTreeServiceImpl.java @@ -26,18 +26,18 @@ import java.util.Map; * @date 2021-05-30 */ @Service -public class TestTreeServiceImpl extends ServicePlusImpl implements ITestTreeService { +public class TestTreeServiceImpl extends ServicePlusImpl implements ITestTreeService { @Override public TestTreeVo queryById(Long id) { - return getVoById(id, TestTreeVo.class); + return getVoById(id); } // @DataSource(DataSourceType.SLAVE) // 切换从库查询 @DataScope(isUser = true) @Override public List queryList(TestTreeQueryBo bo) { - return listVo(buildQueryWrapper(bo), TestTreeVo.class); + return listVo(buildQueryWrapper(bo)); } private LambdaQueryWrapper buildQueryWrapper(TestTreeQueryBo bo) { diff --git a/ruoyi-generator/src/main/java/com/ruoyi/generator/service/GenTableColumnServiceImpl.java b/ruoyi-generator/src/main/java/com/ruoyi/generator/service/GenTableColumnServiceImpl.java index 44baf825..40f0738c 100644 --- a/ruoyi-generator/src/main/java/com/ruoyi/generator/service/GenTableColumnServiceImpl.java +++ b/ruoyi-generator/src/main/java/com/ruoyi/generator/service/GenTableColumnServiceImpl.java @@ -1,7 +1,7 @@ package com.ruoyi.generator.service; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import com.ruoyi.common.core.mybatisplus.core.ServicePlusImpl; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.ruoyi.generator.domain.GenTableColumn; import com.ruoyi.generator.mapper.GenTableColumnMapper; import org.springframework.stereotype.Service; @@ -15,7 +15,7 @@ import java.util.List; * @author ruoyi */ @Service -public class GenTableColumnServiceImpl extends ServicePlusImpl implements IGenTableColumnService { +public class GenTableColumnServiceImpl extends ServiceImpl implements IGenTableColumnService { /** * 查询业务字段列表 diff --git a/ruoyi-generator/src/main/java/com/ruoyi/generator/service/GenTableServiceImpl.java b/ruoyi-generator/src/main/java/com/ruoyi/generator/service/GenTableServiceImpl.java index 9eceadf0..bece86a9 100644 --- a/ruoyi-generator/src/main/java/com/ruoyi/generator/service/GenTableServiceImpl.java +++ b/ruoyi-generator/src/main/java/com/ruoyi/generator/service/GenTableServiceImpl.java @@ -6,9 +6,9 @@ import cn.hutool.core.lang.Validator; import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.ruoyi.common.constant.Constants; import com.ruoyi.common.constant.GenConstants; -import com.ruoyi.common.core.mybatisplus.core.ServicePlusImpl; import com.ruoyi.common.core.page.TableDataInfo; import com.ruoyi.common.exception.CustomException; import com.ruoyi.common.utils.JsonUtils; @@ -35,7 +35,10 @@ import java.io.ByteArrayOutputStream; import java.io.File; import java.io.IOException; import java.io.StringWriter; -import java.util.*; +import java.util.Arrays; +import java.util.LinkedHashMap; +import java.util.List; +import java.util.Map; import java.util.stream.Collectors; import java.util.zip.ZipEntry; import java.util.zip.ZipOutputStream; @@ -47,7 +50,7 @@ import java.util.zip.ZipOutputStream; */ @Slf4j @Service -public class GenTableServiceImpl extends ServicePlusImpl implements IGenTableService { +public class GenTableServiceImpl extends ServiceImpl implements IGenTableService { @Autowired private GenTableColumnMapper genTableColumnMapper; diff --git a/ruoyi-generator/src/main/java/com/ruoyi/generator/service/IGenTableColumnService.java b/ruoyi-generator/src/main/java/com/ruoyi/generator/service/IGenTableColumnService.java index 38d38540..e0111e5d 100644 --- a/ruoyi-generator/src/main/java/com/ruoyi/generator/service/IGenTableColumnService.java +++ b/ruoyi-generator/src/main/java/com/ruoyi/generator/service/IGenTableColumnService.java @@ -1,6 +1,6 @@ package com.ruoyi.generator.service; -import com.ruoyi.common.core.mybatisplus.core.IServicePlus; +import com.baomidou.mybatisplus.extension.service.IService; import com.ruoyi.generator.domain.GenTableColumn; import java.util.List; @@ -10,7 +10,7 @@ import java.util.List; * * @author ruoyi */ -public interface IGenTableColumnService extends IServicePlus { +public interface IGenTableColumnService extends IService { /** * 查询业务字段列表 * diff --git a/ruoyi-generator/src/main/java/com/ruoyi/generator/service/IGenTableService.java b/ruoyi-generator/src/main/java/com/ruoyi/generator/service/IGenTableService.java index a44dd5e2..9903ecaf 100644 --- a/ruoyi-generator/src/main/java/com/ruoyi/generator/service/IGenTableService.java +++ b/ruoyi-generator/src/main/java/com/ruoyi/generator/service/IGenTableService.java @@ -1,6 +1,6 @@ package com.ruoyi.generator.service; -import com.ruoyi.common.core.mybatisplus.core.IServicePlus; +import com.baomidou.mybatisplus.extension.service.IService; import com.ruoyi.common.core.page.TableDataInfo; import com.ruoyi.generator.domain.GenTable; @@ -12,7 +12,7 @@ import java.util.Map; * * @author ruoyi */ -public interface IGenTableService extends IServicePlus { +public interface IGenTableService extends IService { TableDataInfo selectPageGenTableList(GenTable genTable); diff --git a/ruoyi-generator/src/main/resources/vm/java/service.java.vm b/ruoyi-generator/src/main/resources/vm/java/service.java.vm index 9ae8620b..ff394e40 100644 --- a/ruoyi-generator/src/main/resources/vm/java/service.java.vm +++ b/ruoyi-generator/src/main/resources/vm/java/service.java.vm @@ -19,7 +19,7 @@ import java.util.List; * @author ${author} * @date ${datetime} */ -public interface I${ClassName}Service extends IServicePlus<${ClassName}> { +public interface I${ClassName}Service extends IServicePlus<${ClassName}, ${ClassName}Vo> { /** * 查询单个 * @return diff --git a/ruoyi-generator/src/main/resources/vm/java/serviceImpl.java.vm b/ruoyi-generator/src/main/resources/vm/java/serviceImpl.java.vm index 2421f310..83c34a7c 100644 --- a/ruoyi-generator/src/main/resources/vm/java/serviceImpl.java.vm +++ b/ruoyi-generator/src/main/resources/vm/java/serviceImpl.java.vm @@ -30,24 +30,24 @@ import java.util.Collection; * @date ${datetime} */ @Service -public class ${ClassName}ServiceImpl extends ServicePlusImpl<${ClassName}Mapper, ${ClassName}> implements I${ClassName}Service { +public class ${ClassName}ServiceImpl extends ServicePlusImpl<${ClassName}Mapper, ${ClassName}, ${ClassName}Vo> implements I${ClassName}Service { @Override public ${ClassName}Vo queryById(${pkColumn.javaType} ${pkColumn.javaField}){ - return getVoById(${pkColumn.javaField}, ${ClassName}Vo.class); + return getVoById(${pkColumn.javaField}); } #if($table.crud || $table.sub) @Override public TableDataInfo<${ClassName}Vo> queryPageList(${ClassName}QueryBo bo) { - PagePlus<${ClassName}, ${ClassName}Vo> result = pageVo(PageUtils.buildPagePlus(), buildQueryWrapper(bo), ${ClassName}Vo.class); + PagePlus<${ClassName}, ${ClassName}Vo> result = pageVo(PageUtils.buildPagePlus(), buildQueryWrapper(bo)); return PageUtils.buildDataInfo(result); } #end @Override public List<${ClassName}Vo> queryList(${ClassName}QueryBo bo) { - return listVo(buildQueryWrapper(bo), ${ClassName}Vo.class); + return listVo(buildQueryWrapper(bo)); } private LambdaQueryWrapper<${ClassName}> buildQueryWrapper(${ClassName}QueryBo bo) { diff --git a/ruoyi-oss/src/main/java/com/ruoyi/system/service/ISysOssService.java b/ruoyi-oss/src/main/java/com/ruoyi/system/service/ISysOssService.java index cc61fa0a..df4ea933 100644 --- a/ruoyi-oss/src/main/java/com/ruoyi/system/service/ISysOssService.java +++ b/ruoyi-oss/src/main/java/com/ruoyi/system/service/ISysOssService.java @@ -14,7 +14,7 @@ import java.util.Collection; * * @author Lion Li */ -public interface ISysOssService extends IServicePlus { +public interface ISysOssService extends IServicePlus { TableDataInfo queryPageList(SysOssQueryBo sysOss); diff --git a/ruoyi-oss/src/main/java/com/ruoyi/system/service/impl/SysOssServiceImpl.java b/ruoyi-oss/src/main/java/com/ruoyi/system/service/impl/SysOssServiceImpl.java index ccbf2ad2..bed8a048 100644 --- a/ruoyi-oss/src/main/java/com/ruoyi/system/service/impl/SysOssServiceImpl.java +++ b/ruoyi-oss/src/main/java/com/ruoyi/system/service/impl/SysOssServiceImpl.java @@ -30,11 +30,11 @@ import java.util.Map; * @author Lion Li */ @Service -public class SysOssServiceImpl extends ServicePlusImpl implements ISysOssService { +public class SysOssServiceImpl extends ServicePlusImpl implements ISysOssService { @Override public TableDataInfo queryPageList(SysOssQueryBo bo) { - PagePlus result = pageVo(PageUtils.buildPagePlus(), buildQueryWrapper(bo), SysOssVo.class); + PagePlus result = pageVo(PageUtils.buildPagePlus(), buildQueryWrapper(bo)); return PageUtils.buildDataInfo(result); } diff --git a/ruoyi-quartz/src/main/java/com/ruoyi/quartz/service/ISysJobLogService.java b/ruoyi-quartz/src/main/java/com/ruoyi/quartz/service/ISysJobLogService.java index cb5b7d5f..27f598ac 100644 --- a/ruoyi-quartz/src/main/java/com/ruoyi/quartz/service/ISysJobLogService.java +++ b/ruoyi-quartz/src/main/java/com/ruoyi/quartz/service/ISysJobLogService.java @@ -1,6 +1,6 @@ package com.ruoyi.quartz.service; -import com.ruoyi.common.core.mybatisplus.core.IServicePlus; +import com.baomidou.mybatisplus.extension.service.IService; import com.ruoyi.common.core.page.TableDataInfo; import com.ruoyi.quartz.domain.SysJobLog; @@ -11,7 +11,7 @@ import java.util.List; * * @author ruoyi */ -public interface ISysJobLogService extends IServicePlus { +public interface ISysJobLogService extends IService { TableDataInfo selectPageJobLogList(SysJobLog jobLog); diff --git a/ruoyi-quartz/src/main/java/com/ruoyi/quartz/service/ISysJobService.java b/ruoyi-quartz/src/main/java/com/ruoyi/quartz/service/ISysJobService.java index 11150c75..81eef937 100644 --- a/ruoyi-quartz/src/main/java/com/ruoyi/quartz/service/ISysJobService.java +++ b/ruoyi-quartz/src/main/java/com/ruoyi/quartz/service/ISysJobService.java @@ -1,6 +1,6 @@ package com.ruoyi.quartz.service; -import com.ruoyi.common.core.mybatisplus.core.IServicePlus; +import com.baomidou.mybatisplus.extension.service.IService; import com.ruoyi.common.core.page.TableDataInfo; import com.ruoyi.common.exception.job.TaskException; import com.ruoyi.quartz.domain.SysJob; @@ -13,7 +13,7 @@ import java.util.List; * * @author ruoyi */ -public interface ISysJobService extends IServicePlus { +public interface ISysJobService extends IService { /** * 获取quartz调度器的计划任务 * diff --git a/ruoyi-quartz/src/main/java/com/ruoyi/quartz/service/impl/SysJobLogServiceImpl.java b/ruoyi-quartz/src/main/java/com/ruoyi/quartz/service/impl/SysJobLogServiceImpl.java index e10ad14b..6494492a 100644 --- a/ruoyi-quartz/src/main/java/com/ruoyi/quartz/service/impl/SysJobLogServiceImpl.java +++ b/ruoyi-quartz/src/main/java/com/ruoyi/quartz/service/impl/SysJobLogServiceImpl.java @@ -3,7 +3,7 @@ package com.ruoyi.quartz.service.impl; import cn.hutool.core.lang.Validator; import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import com.ruoyi.common.core.mybatisplus.core.ServicePlusImpl; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.ruoyi.common.core.page.TableDataInfo; import com.ruoyi.common.utils.PageUtils; import com.ruoyi.quartz.domain.SysJobLog; @@ -21,7 +21,7 @@ import java.util.Map; * @author ruoyi */ @Service -public class SysJobLogServiceImpl extends ServicePlusImpl implements ISysJobLogService { +public class SysJobLogServiceImpl extends ServiceImpl implements ISysJobLogService { @Override public TableDataInfo selectPageJobLogList(SysJobLog jobLog) { diff --git a/ruoyi-quartz/src/main/java/com/ruoyi/quartz/service/impl/SysJobServiceImpl.java b/ruoyi-quartz/src/main/java/com/ruoyi/quartz/service/impl/SysJobServiceImpl.java index 7d111d77..3a7f0536 100644 --- a/ruoyi-quartz/src/main/java/com/ruoyi/quartz/service/impl/SysJobServiceImpl.java +++ b/ruoyi-quartz/src/main/java/com/ruoyi/quartz/service/impl/SysJobServiceImpl.java @@ -2,8 +2,8 @@ package com.ruoyi.quartz.service.impl; import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.ruoyi.common.constant.ScheduleConstants; -import com.ruoyi.common.core.mybatisplus.core.ServicePlusImpl; import com.ruoyi.common.core.page.TableDataInfo; import com.ruoyi.common.exception.job.TaskException; import com.ruoyi.common.utils.PageUtils; @@ -29,7 +29,7 @@ import java.util.List; * @author ruoyi */ @Service -public class SysJobServiceImpl extends ServicePlusImpl implements ISysJobService { +public class SysJobServiceImpl extends ServiceImpl implements ISysJobService { @Autowired private Scheduler scheduler; diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysConfigService.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysConfigService.java index b649c7f8..fdc76fb4 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysConfigService.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysConfigService.java @@ -1,6 +1,6 @@ package com.ruoyi.system.service; -import com.ruoyi.common.core.mybatisplus.core.IServicePlus; +import com.baomidou.mybatisplus.extension.service.IService; import com.ruoyi.common.core.page.TableDataInfo; import com.ruoyi.system.domain.SysConfig; @@ -11,7 +11,7 @@ import java.util.List; * * @author ruoyi */ -public interface ISysConfigService extends IServicePlus { +public interface ISysConfigService extends IService { TableDataInfo selectPageConfigList(SysConfig config); diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysDeptService.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysDeptService.java index 7afbf4b5..f518ff5f 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysDeptService.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysDeptService.java @@ -1,8 +1,8 @@ package com.ruoyi.system.service; +import com.baomidou.mybatisplus.extension.service.IService; import com.ruoyi.common.core.domain.TreeSelect; import com.ruoyi.common.core.domain.entity.SysDept; -import com.ruoyi.common.core.mybatisplus.core.IServicePlus; import java.util.List; @@ -11,7 +11,7 @@ import java.util.List; * * @author ruoyi */ -public interface ISysDeptService extends IServicePlus { +public interface ISysDeptService extends IService { /** * 查询部门管理数据 * diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysDictDataService.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysDictDataService.java index 570c7d1a..25daa1a8 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysDictDataService.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysDictDataService.java @@ -1,7 +1,7 @@ package com.ruoyi.system.service; +import com.baomidou.mybatisplus.extension.service.IService; import com.ruoyi.common.core.domain.entity.SysDictData; -import com.ruoyi.common.core.mybatisplus.core.IServicePlus; import com.ruoyi.common.core.page.TableDataInfo; import java.util.List; @@ -11,7 +11,7 @@ import java.util.List; * * @author ruoyi */ -public interface ISysDictDataService extends IServicePlus { +public interface ISysDictDataService extends IService { TableDataInfo selectPageDictDataList(SysDictData dictData); diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysDictTypeService.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysDictTypeService.java index a5d8de58..ac1d6c9a 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysDictTypeService.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysDictTypeService.java @@ -1,8 +1,8 @@ package com.ruoyi.system.service; +import com.baomidou.mybatisplus.extension.service.IService; import com.ruoyi.common.core.domain.entity.SysDictData; import com.ruoyi.common.core.domain.entity.SysDictType; -import com.ruoyi.common.core.mybatisplus.core.IServicePlus; import com.ruoyi.common.core.page.TableDataInfo; import java.util.List; @@ -12,7 +12,7 @@ import java.util.List; * * @author ruoyi */ -public interface ISysDictTypeService extends IServicePlus { +public interface ISysDictTypeService extends IService { TableDataInfo selectPageDictTypeList(SysDictType dictType); diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysLogininforService.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysLogininforService.java index 4976d3f4..5a7d9700 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysLogininforService.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysLogininforService.java @@ -1,6 +1,6 @@ package com.ruoyi.system.service; -import com.ruoyi.common.core.mybatisplus.core.IServicePlus; +import com.baomidou.mybatisplus.extension.service.IService; import com.ruoyi.common.core.page.TableDataInfo; import com.ruoyi.system.domain.SysLogininfor; @@ -11,7 +11,7 @@ import java.util.List; * * @author ruoyi */ -public interface ISysLogininforService extends IServicePlus { +public interface ISysLogininforService extends IService { TableDataInfo selectPageLogininforList(SysLogininfor logininfor); diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysMenuService.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysMenuService.java index d2787435..391cf190 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysMenuService.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysMenuService.java @@ -1,8 +1,8 @@ package com.ruoyi.system.service; +import com.baomidou.mybatisplus.extension.service.IService; import com.ruoyi.common.core.domain.TreeSelect; import com.ruoyi.common.core.domain.entity.SysMenu; -import com.ruoyi.common.core.mybatisplus.core.IServicePlus; import com.ruoyi.system.domain.vo.RouterVo; import java.util.List; @@ -13,7 +13,7 @@ import java.util.Set; * * @author ruoyi */ -public interface ISysMenuService extends IServicePlus { +public interface ISysMenuService extends IService { /** * 根据用户查询系统菜单列表 * diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysNoticeService.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysNoticeService.java index 2db8422a..535e7608 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysNoticeService.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysNoticeService.java @@ -1,6 +1,6 @@ package com.ruoyi.system.service; -import com.ruoyi.common.core.mybatisplus.core.IServicePlus; +import com.baomidou.mybatisplus.extension.service.IService; import com.ruoyi.common.core.page.TableDataInfo; import com.ruoyi.system.domain.SysNotice; @@ -11,7 +11,7 @@ import java.util.List; * * @author ruoyi */ -public interface ISysNoticeService extends IServicePlus { +public interface ISysNoticeService extends IService { TableDataInfo selectPageNoticeList(SysNotice notice); diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysOperLogService.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysOperLogService.java index dcd2c085..ecfadb19 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysOperLogService.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysOperLogService.java @@ -1,6 +1,6 @@ package com.ruoyi.system.service; -import com.ruoyi.common.core.mybatisplus.core.IServicePlus; +import com.baomidou.mybatisplus.extension.service.IService; import com.ruoyi.common.core.page.TableDataInfo; import com.ruoyi.system.domain.SysOperLog; @@ -11,7 +11,7 @@ import java.util.List; * * @author ruoyi */ -public interface ISysOperLogService extends IServicePlus { +public interface ISysOperLogService extends IService { TableDataInfo selectPageOperLogList(SysOperLog operLog); diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysPostService.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysPostService.java index f56c5fdc..f6659c05 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysPostService.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysPostService.java @@ -1,6 +1,6 @@ package com.ruoyi.system.service; -import com.ruoyi.common.core.mybatisplus.core.IServicePlus; +import com.baomidou.mybatisplus.extension.service.IService; import com.ruoyi.common.core.page.TableDataInfo; import com.ruoyi.system.domain.SysPost; @@ -11,7 +11,7 @@ import java.util.List; * * @author ruoyi */ -public interface ISysPostService extends IServicePlus { +public interface ISysPostService extends IService { TableDataInfo selectPagePostList(SysPost post); diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysRoleService.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysRoleService.java index 9d02ceb2..77a7c26d 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysRoleService.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysRoleService.java @@ -1,9 +1,8 @@ package com.ruoyi.system.service; +import com.baomidou.mybatisplus.extension.service.IService; import com.ruoyi.common.core.domain.entity.SysRole; -import com.ruoyi.common.core.mybatisplus.core.IServicePlus; import com.ruoyi.common.core.page.TableDataInfo; -import com.ruoyi.common.core.domain.entity.SysRole; import com.ruoyi.system.domain.SysUserRole; import java.util.List; @@ -14,7 +13,7 @@ import java.util.Set; * * @author ruoyi */ -public interface ISysRoleService extends IServicePlus { +public interface ISysRoleService extends IService { TableDataInfo selectPageRoleList(SysRole role); diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysUserService.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysUserService.java index e277d108..ea1b89b1 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysUserService.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysUserService.java @@ -1,7 +1,7 @@ package com.ruoyi.system.service; +import com.baomidou.mybatisplus.extension.service.IService; import com.ruoyi.common.core.domain.entity.SysUser; -import com.ruoyi.common.core.mybatisplus.core.IServicePlus; import com.ruoyi.common.core.page.TableDataInfo; import java.util.List; @@ -11,7 +11,7 @@ import java.util.List; * * @author ruoyi */ -public interface ISysUserService extends IServicePlus { +public interface ISysUserService extends IService { TableDataInfo selectPageUserList(SysUser user); diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysConfigServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysConfigServiceImpl.java index 41be8077..eee05950 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysConfigServiceImpl.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysConfigServiceImpl.java @@ -4,10 +4,10 @@ import cn.hutool.core.convert.Convert; import cn.hutool.core.lang.Validator; import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.ruoyi.common.annotation.DataSource; import com.ruoyi.common.constant.Constants; import com.ruoyi.common.constant.UserConstants; -import com.ruoyi.common.core.mybatisplus.core.ServicePlusImpl; import com.ruoyi.common.core.page.TableDataInfo; import com.ruoyi.common.core.redis.RedisCache; import com.ruoyi.common.enums.DataSourceType; @@ -31,7 +31,7 @@ import java.util.Map; * @author ruoyi */ @Service -public class SysConfigServiceImpl extends ServicePlusImpl implements ISysConfigService { +public class SysConfigServiceImpl extends ServiceImpl implements ISysConfigService { @Autowired private RedisCache redisCache; @@ -98,6 +98,7 @@ public class SysConfigServiceImpl extends ServicePlusImpl implements ISysDeptService { +public class SysDeptServiceImpl extends ServiceImpl implements ISysDeptService { @Autowired private SysRoleMapper roleMapper; diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysDictDataServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysDictDataServiceImpl.java index 92be9d5e..4b08a141 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysDictDataServiceImpl.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysDictDataServiceImpl.java @@ -2,8 +2,8 @@ package com.ruoyi.system.service.impl; import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.ruoyi.common.core.domain.entity.SysDictData; -import com.ruoyi.common.core.mybatisplus.core.ServicePlusImpl; import com.ruoyi.common.core.page.TableDataInfo; import com.ruoyi.common.utils.DictUtils; import com.ruoyi.common.utils.PageUtils; @@ -20,7 +20,7 @@ import java.util.List; * @author ruoyi */ @Service -public class SysDictDataServiceImpl extends ServicePlusImpl implements ISysDictDataService { +public class SysDictDataServiceImpl extends ServiceImpl implements ISysDictDataService { @Override public TableDataInfo selectPageDictDataList(SysDictData dictData) { diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysDictTypeServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysDictTypeServiceImpl.java index 82f67c3a..c4f9d955 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysDictTypeServiceImpl.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysDictTypeServiceImpl.java @@ -5,10 +5,10 @@ import cn.hutool.core.lang.Validator; import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.ruoyi.common.constant.UserConstants; import com.ruoyi.common.core.domain.entity.SysDictData; import com.ruoyi.common.core.domain.entity.SysDictType; -import com.ruoyi.common.core.mybatisplus.core.ServicePlusImpl; import com.ruoyi.common.core.page.TableDataInfo; import com.ruoyi.common.exception.CustomException; import com.ruoyi.common.utils.DictUtils; @@ -31,7 +31,7 @@ import java.util.Map; * @author ruoyi */ @Service -public class SysDictTypeServiceImpl extends ServicePlusImpl implements ISysDictTypeService { +public class SysDictTypeServiceImpl extends ServiceImpl implements ISysDictTypeService { @Autowired private SysDictDataMapper dictDataMapper; diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysLogininforServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysLogininforServiceImpl.java index 0284ed7e..c1295255 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysLogininforServiceImpl.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysLogininforServiceImpl.java @@ -3,7 +3,7 @@ package com.ruoyi.system.service.impl; import cn.hutool.core.lang.Validator; import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import com.ruoyi.common.core.mybatisplus.core.ServicePlusImpl; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.ruoyi.common.core.page.TableDataInfo; import com.ruoyi.common.utils.PageUtils; import com.ruoyi.system.domain.SysLogininfor; @@ -22,7 +22,7 @@ import java.util.Map; * @author ruoyi */ @Service -public class SysLogininforServiceImpl extends ServicePlusImpl implements ISysLogininforService { +public class SysLogininforServiceImpl extends ServiceImpl implements ISysLogininforService { @Override public TableDataInfo selectPageLogininforList(SysLogininfor logininfor) { diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysMenuServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysMenuServiceImpl.java index e1b43145..44ee91b8 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysMenuServiceImpl.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysMenuServiceImpl.java @@ -3,13 +3,13 @@ package com.ruoyi.system.service.impl; import cn.hutool.core.lang.Validator; import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.ruoyi.common.constant.Constants; import com.ruoyi.common.constant.UserConstants; import com.ruoyi.common.core.domain.TreeSelect; import com.ruoyi.common.core.domain.entity.SysMenu; import com.ruoyi.common.core.domain.entity.SysRole; import com.ruoyi.common.core.domain.entity.SysUser; -import com.ruoyi.common.core.mybatisplus.core.ServicePlusImpl; import com.ruoyi.common.utils.SecurityUtils; import com.ruoyi.system.domain.SysRoleMenu; import com.ruoyi.system.domain.vo.MetaVo; @@ -31,7 +31,7 @@ import java.util.stream.Collectors; * @author ruoyi */ @Service -public class SysMenuServiceImpl extends ServicePlusImpl implements ISysMenuService { +public class SysMenuServiceImpl extends ServiceImpl implements ISysMenuService { public static final String PREMISSION_STRING = "perms[\"{0}\"]"; @Autowired diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysNoticeServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysNoticeServiceImpl.java index 977e6446..e0634701 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysNoticeServiceImpl.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysNoticeServiceImpl.java @@ -2,7 +2,7 @@ package com.ruoyi.system.service.impl; import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import com.ruoyi.common.core.mybatisplus.core.ServicePlusImpl; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.ruoyi.common.core.page.TableDataInfo; import com.ruoyi.common.utils.PageUtils; import com.ruoyi.system.domain.SysNotice; @@ -19,7 +19,7 @@ import java.util.List; * @author ruoyi */ @Service -public class SysNoticeServiceImpl extends ServicePlusImpl implements ISysNoticeService { +public class SysNoticeServiceImpl extends ServiceImpl implements ISysNoticeService { @Override public TableDataInfo selectPageNoticeList(SysNotice notice) { diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysOperLogServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysOperLogServiceImpl.java index 5d243566..238c015a 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysOperLogServiceImpl.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysOperLogServiceImpl.java @@ -4,7 +4,7 @@ import cn.hutool.core.lang.Validator; import cn.hutool.core.util.ArrayUtil; import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import com.ruoyi.common.core.mybatisplus.core.ServicePlusImpl; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.ruoyi.common.core.page.TableDataInfo; import com.ruoyi.common.utils.PageUtils; import com.ruoyi.system.domain.SysOperLog; @@ -23,7 +23,7 @@ import java.util.Map; * @author ruoyi */ @Service -public class SysOperLogServiceImpl extends ServicePlusImpl implements ISysOperLogService { +public class SysOperLogServiceImpl extends ServiceImpl implements ISysOperLogService { @Override public TableDataInfo selectPageOperLogList(SysOperLog operLog) { diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysPostServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysPostServiceImpl.java index 93f8e989..d2aeab07 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysPostServiceImpl.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysPostServiceImpl.java @@ -3,8 +3,8 @@ package com.ruoyi.system.service.impl; import cn.hutool.core.lang.Validator; import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.ruoyi.common.constant.UserConstants; -import com.ruoyi.common.core.mybatisplus.core.ServicePlusImpl; import com.ruoyi.common.core.page.TableDataInfo; import com.ruoyi.common.exception.CustomException; import com.ruoyi.common.utils.PageUtils; @@ -25,7 +25,7 @@ import java.util.List; * @author ruoyi */ @Service -public class SysPostServiceImpl extends ServicePlusImpl implements ISysPostService { +public class SysPostServiceImpl extends ServiceImpl implements ISysPostService { @Autowired private SysUserPostMapper userPostMapper; diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysRoleServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysRoleServiceImpl.java index df024ae6..45d2fb44 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysRoleServiceImpl.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysRoleServiceImpl.java @@ -2,10 +2,10 @@ package com.ruoyi.system.service.impl; import cn.hutool.core.lang.Validator; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.ruoyi.common.annotation.DataScope; import com.ruoyi.common.constant.UserConstants; import com.ruoyi.common.core.domain.entity.SysRole; -import com.ruoyi.common.core.mybatisplus.core.ServicePlusImpl; import com.ruoyi.common.core.page.TableDataInfo; import com.ruoyi.common.exception.CustomException; import com.ruoyi.common.utils.PageUtils; @@ -30,7 +30,7 @@ import java.util.*; * @author ruoyi */ @Service -public class SysRoleServiceImpl extends ServicePlusImpl implements ISysRoleService { +public class SysRoleServiceImpl extends ServiceImpl implements ISysRoleService { @Autowired private SysRoleMenuMapper roleMenuMapper; diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java index b5bcb70d..69adbe19 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java @@ -3,11 +3,11 @@ package com.ruoyi.system.service.impl; import cn.hutool.core.lang.Validator; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.ruoyi.common.annotation.DataScope; import com.ruoyi.common.constant.UserConstants; import com.ruoyi.common.core.domain.entity.SysRole; import com.ruoyi.common.core.domain.entity.SysUser; -import com.ruoyi.common.core.mybatisplus.core.ServicePlusImpl; import com.ruoyi.common.core.page.TableDataInfo; import com.ruoyi.common.exception.CustomException; import com.ruoyi.common.utils.PageUtils; @@ -34,7 +34,7 @@ import java.util.List; */ @Slf4j @Service -public class SysUserServiceImpl extends ServicePlusImpl implements ISysUserService { +public class SysUserServiceImpl extends ServiceImpl implements ISysUserService { @Autowired private SysRoleMapper roleMapper;