From d2c33ec7e51ce8a5882681afd9cdcc7fd54dbc16 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=BC=80=E6=BA=90=E6=B5=B7=E5=93=A5?= Date: Sun, 14 May 2023 12:32:20 +0800 Subject: [PATCH] optimize IService.java --- .../mybatisflex/spring/service/IService.java | 56 +++++++++---------- .../spring/service/impl/ServiceImpl.java | 12 ++-- 2 files changed, 34 insertions(+), 34 deletions(-) diff --git a/mybatis-flex-spring/src/main/java/com/mybatisflex/spring/service/IService.java b/mybatis-flex-spring/src/main/java/com/mybatisflex/spring/service/IService.java index 55e4c14a..e41829d9 100644 --- a/mybatis-flex-spring/src/main/java/com/mybatisflex/spring/service/IService.java +++ b/mybatis-flex-spring/src/main/java/com/mybatisflex/spring/service/IService.java @@ -42,7 +42,7 @@ public interface IService { * * @return 基础映射类（BaseMapper） */ - BaseMapper getBaseMapper(); + BaseMapper getMapper(); // ===== 保存（增）操作 ===== @@ -55,7 +55,7 @@ public interface IService { * {@code null} 字段的数据，使数据库配置的默认值生效。 */ default boolean save(T entity) { - return retBool(getBaseMapper().insertSelective(entity)); + return retBool(getMapper().insertSelective(entity)); } /** @@ -66,7 +66,7 @@ public interface IService { * @apiNote 如果实体类对象主键有值，则更新数据，若没有值，则保存数据。 */ default boolean saveOrUpdate(T entity) { - return retBool(getBaseMapper().insertOrUpdate(entity)); + return retBool(getMapper().insertOrUpdate(entity)); } /** @@ -77,7 +77,7 @@ public interface IService { */ @Transactional(rollbackFor = Exception.class) default boolean saveBatch(Collection entities) { - return retBool(getBaseMapper().insertBatch(new ArrayList<>(entities))); + return retBool(getMapper().insertBatch(new ArrayList<>(entities))); } /** @@ -89,7 +89,7 @@ public interface IService { */ @Transactional(rollbackFor = Exception.class) default boolean saveBatch(Collection entities, int size) { - return retBool(getBaseMapper().insertBatch(new ArrayList<>(entities), size)); + return retBool(getMapper().insertBatch(new ArrayList<>(entities), size)); } // ===== 删除（删）操作 ===== @@ -101,7 +101,7 @@ public interface IService { * @return {@code true} 删除成功，{@code false} 删除失败。 */ default boolean remove(QueryWrapper query) { - return retBool(getBaseMapper().deleteByQuery(query)); + return retBool(getMapper().deleteByQuery(query)); } /** @@ -111,7 +111,7 @@ public interface IService { * @return {@code true} 删除成功，{@code false} 删除失败。 */ default boolean remove(QueryCondition query) { - return retBool(getBaseMapper().deleteByCondition(query)); + return retBool(getMapper().deleteByCondition(query)); } /** @@ -121,7 +121,7 @@ public interface IService { * @return {@code true} 删除成功，{@code false} 删除失败。 */ default boolean removeById(Serializable id) { - return retBool(getBaseMapper().deleteById(id)); + return retBool(getMapper().deleteById(id)); } /** @@ -135,7 +135,7 @@ public interface IService { if (CollectionUtil.isEmpty(ids)) { return false; } - return retBool(getBaseMapper().deleteBatchByIds(ids)); + return retBool(getMapper().deleteBatchByIds(ids)); } /** @@ -145,7 +145,7 @@ public interface IService { * @return {@code true} 删除成功，{@code false} 删除失败。 */ default boolean removeByMap(Map query) { - return retBool(getBaseMapper().deleteByMap(query)); + return retBool(getMapper().deleteByMap(query)); } // ===== 更新（改）操作 ===== @@ -158,7 +158,7 @@ public interface IService { * @return {@code true} 更新成功，{@code false} 更新失败。 */ default boolean update(T entity, QueryWrapper query) { - return retBool(getBaseMapper().updateByQuery(entity, query)); + return retBool(getMapper().updateByQuery(entity, query)); } /** @@ -169,7 +169,7 @@ public interface IService { * @return {@code true} 更新成功，{@code false} 更新失败。 */ default boolean update(T entity, QueryCondition query) { - return retBool(getBaseMapper().updateByCondition(entity, query)); + return retBool(getMapper().updateByCondition(entity, query)); } /** @@ -179,7 +179,7 @@ public interface IService { * @return {@code true} 更新成功，{@code false} 更新失败。 */ default boolean updateById(T entity) { - return retBool(getBaseMapper().update(entity)); + return retBool(getMapper().update(entity)); } /** @@ -190,7 +190,7 @@ public interface IService { * @return {@code true} 更新成功，{@code false} 更新失败。 */ default boolean updateByMap(T entity, Map query) { - return retBool(getBaseMapper().updateByMap(entity, query)); + return retBool(getMapper().updateByMap(entity, query)); } // ===== 查询（查）操作 ===== @@ -202,7 +202,7 @@ public interface IService { * @return 查询结果数据 */ default T getById(Serializable id) { - return getBaseMapper().selectOneById(id); + return getMapper().selectOneById(id); } /** @@ -223,7 +223,7 @@ public interface IService { * @return 查询结果数据 */ default T getOne(QueryWrapper query) { - return getBaseMapper().selectOneByQuery(query); + return getMapper().selectOneByQuery(query); } /** @@ -244,7 +244,7 @@ public interface IService { * @return 查询结果数据 */ default T getOne(QueryCondition query) { - return getBaseMapper().selectOneByCondition(query); + return getMapper().selectOneByCondition(query); } /** @@ -264,7 +264,7 @@ public interface IService { * @return 所有数据 */ default List list() { - return getBaseMapper().selectAll(); + return getMapper().selectAll(); } /** @@ -274,7 +274,7 @@ public interface IService { * @return 数据集合 */ default List list(QueryWrapper query) { - return getBaseMapper().selectListByQuery(query); + return getMapper().selectListByQuery(query); } /** @@ -284,7 +284,7 @@ public interface IService { * @return 数据集合 */ default List list(QueryCondition query) { - return getBaseMapper().selectListByCondition(query); + return getMapper().selectListByCondition(query); } /** @@ -294,7 +294,7 @@ public interface IService { * @return 数据集合 */ default List listByIds(Collection ids) { - return getBaseMapper().selectListByIds(ids); + return getMapper().selectListByIds(ids); } /** @@ -304,7 +304,7 @@ public interface IService { * @return 数据集合 */ default List listByMap(Map query) { - return getBaseMapper().selectListByMap(query); + return getMapper().selectListByMap(query); } // ===== 数量查询操作 ===== @@ -335,7 +335,7 @@ public interface IService { * @return 所有数据数量 */ default long count() { - return getBaseMapper().selectCountByQuery(QueryWrapper.create()); + return getMapper().selectCountByQuery(QueryWrapper.create()); } /** @@ -345,7 +345,7 @@ public interface IService { * @return 数据数量 */ default long count(QueryWrapper query) { - return getBaseMapper().selectCountByQuery(query); + return getMapper().selectCountByQuery(query); } /** @@ -355,7 +355,7 @@ public interface IService { * @return 数据数量 */ default long count(QueryCondition query) { - return getBaseMapper().selectCountByCondition(query); + return getMapper().selectCountByCondition(query); } // ===== 分页查询操作 ===== @@ -367,7 +367,7 @@ public interface IService { * @return 分页对象 */ default Page page(Page page) { - return getBaseMapper().paginate(page, QueryWrapper.create()); + return getMapper().paginate(page, QueryWrapper.create()); } /** @@ -378,7 +378,7 @@ public interface IService { * @return 分页对象 */ default Page page(Page page, QueryWrapper query) { - return getBaseMapper().paginate(page, query); + return getMapper().paginate(page, query); } /** @@ -389,7 +389,7 @@ public interface IService { * @return 分页对象 */ default Page page(Page page, QueryCondition query) { - return getBaseMapper().paginate(page, QueryWrapper.create().where(query)); + return getMapper().paginate(page, QueryWrapper.create().where(query)); } } \ No newline at end of file diff --git a/mybatis-flex-spring/src/main/java/com/mybatisflex/spring/service/impl/ServiceImpl.java b/mybatis-flex-spring/src/main/java/com/mybatisflex/spring/service/impl/ServiceImpl.java index e1c537a9..171a28fa 100644 --- a/mybatis-flex-spring/src/main/java/com/mybatisflex/spring/service/impl/ServiceImpl.java +++ b/mybatis-flex-spring/src/main/java/com/mybatisflex/spring/service/impl/ServiceImpl.java @@ -22,20 +22,20 @@ import org.springframework.beans.factory.annotation.Autowired; /** * 由 Mybatis-Flex 提供的顶级增强 Service 接口的默认实现类。 * + * @param 实体类（Entity）类型 + * @param 映射类（Mapper）类型 * @author 王帅 * @since 2023-05-01 - * @param 映射类（Mapper）类型 - * @param 实体类（Entity）类型 */ @SuppressWarnings("SpringJavaInjectionPointsAutowiringInspection") -public class ServiceImpl, T> implements IService { +public class ServiceImpl> implements IService { @Autowired - protected M baseMapper; + protected M mapper; @Override - public BaseMapper getBaseMapper() { - return baseMapper; + public BaseMapper getMapper() { + return mapper; } } \ No newline at end of file