refactor(mybatisplus): 优化KitMpService接口方法命名和删除废弃工具类

cutejava-springboot3/cutejava-framework/src/main/java/cn/odboy/framework/mybatisplus/core/KitMpAnyQUtil.java

@@ -1,82 +0,0 @@
-/*
- * Copyright 2021-2026 Odboy
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package cn.odboy.framework.mybatisplus.core;
-
-import cn.odboy.util.KitBeanUtil;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import java.util.ArrayList;
-import java.util.List;
-
-/**
- * 自定义任意对象查询工具
- *
- * @author odboy
- * @date 2025-05-15
- */
-public class KitMpAnyQUtil {
-
-  public static <T> T selectOne(BaseMapper<T> baseMapper, Object queryParams) {
-    QueryWrapper<T> queryWrapper = KitMpQUtil.build(queryParams);
-    return baseMapper.selectOne(queryWrapper);
-  }
-
-  public static <T, M> M selectOne(BaseMapper<T> baseMapper, Object queryParams, Class<M> mapperClazz) {
-    QueryWrapper<T> queryWrapper = KitMpQUtil.build(queryParams);
-    T mapperTarget = baseMapper.selectOne(queryWrapper);
-    if (mapperTarget == null) {
-      return null;
-    }
-    return KitBeanUtil.copyToClass(mapperTarget, mapperClazz);
-  }
-
-  public static <T> List<T> selectList(BaseMapper<T> baseMapper, Object queryParams) {
-    QueryWrapper<T> queryWrapper = KitMpQUtil.build(queryParams);
-    return baseMapper.selectList(queryWrapper);
-  }
-
-  public static <T, M> List<M> selectList(BaseMapper<T> baseMapper, Object queryParams, Class<M> mapperClazz) {
-    QueryWrapper<T> queryWrapper = KitMpQUtil.build(queryParams);
-    List<T> mapperTarget = baseMapper.selectList(queryWrapper);
-    if (mapperTarget == null) {
-      return new ArrayList<>();
-    }
-    return KitBeanUtil.copyToList(mapperTarget, mapperClazz);
-  }
-
-  public static <T> Long selectCount(BaseMapper<T> baseMapper, Object queryParams) {
-    QueryWrapper<T> queryWrapper = KitMpQUtil.build(queryParams);
-    return baseMapper.selectCount(queryWrapper);
-  }
-
-  public static <T> Page<T> selectPage(BaseMapper<T> baseMapper, Page<T> page, Object queryParams) {
-    QueryWrapper<T> queryWrapper = KitMpQUtil.build(queryParams);
-    return baseMapper.selectPage(page, queryWrapper);
-  }
-
-  public static <T, M> Page<M> selectPage(BaseMapper<T> baseMapper, Page<T> page, Object queryParams,
-      Class<M> mapperClazz) {
-    QueryWrapper<T> queryWrapper = KitMpQUtil.build(queryParams);
-    Page<T> tPage = baseMapper.selectPage(page, queryWrapper);
-    Page<M> mapperTarget = new Page<>();
-    mapperTarget.setRecords(KitBeanUtil.copyToList(tPage.getRecords(), mapperClazz));
-    mapperTarget.setTotal(tPage.getTotal());
-    mapperTarget.setSize(tPage.getSize());
-    mapperTarget.setCurrent(tPage.getCurrent());
-    return mapperTarget;
-  }
-}

cutejava-springboot3/cutejava-framework/src/main/java/cn/odboy/framework/mybatisplus/core/interfaces/KitMpService.java

@@ -83,7 +83,7 @@ public interface KitMpService<T> extends IService<T> {
   T getClazzByArgs(LambdaQueryWrapper<T> wrapper, SFunction<T, ?> orderColumn);
 
   /**
-   * 根据条件查询一条数据（已测试）
+   * 根据条件查询一条目标类型的数据（已测试）
    *
    * @param wrapper     查询条件
    * @param orderColumn 排序字段
@@ -99,7 +99,7 @@ public interface KitMpService<T> extends IService<T> {
    * @param targetClazz 目标类型
    * @return /
    */
-  <G> List<G> queryFeatureClazzListByIds(List<Serializable> ids, Class<G> targetClazz);
+  <G> List<G> listFeatureClazzByIds(List<Serializable> ids, Class<G> targetClazz);
 
   /**
    * 根据条件查询目标数据（已测试）
@@ -108,7 +108,7 @@ public interface KitMpService<T> extends IService<T> {
    * @param targetClazz 目标类型
    * @return /
    */
-  <G> List<G> queryFeatureClazzListByArgs(LambdaQueryWrapper<T> wrapper, Class<G> targetClazz);
+  <G> List<G> queryFeatureClazzByArgs(LambdaQueryWrapper<T> wrapper, Class<G> targetClazz);
 
   /**
    * 根据条件分页查询数据（已测试）
@@ -117,17 +117,17 @@ public interface KitMpService<T> extends IService<T> {
    * @param pageable 分页参数
    * @return /
    */
-  KitPageResult<T> searchClazzPageByArgs(LambdaQueryWrapper<T> wrapper, IPage<T> pageable);
+  KitPageResult<T> searchClazzByArgs(LambdaQueryWrapper<T> wrapper, IPage<T> pageable);
 
   /**
    * 根据条件分页查询目标数据（已测试）
    *
    * @param wrapper     查询条件
-   * @param pageable    分页参数
    * @param targetClazz 目标类型
+   * @param pageable    分页参数
    * @return /
    */
-  <G> KitPageResult<G> searchFeatureClazzPageByArgs(LambdaQueryWrapper<T> wrapper, IPage<T> pageable, Class<G> targetClazz);
+  <G> KitPageResult<G> searchFeatureClazzByArgs(LambdaQueryWrapper<T> wrapper, Class<G> targetClazz, IPage<T> pageable);
 
   /**
    * 根据条件更新数据（已测试）

cutejava-springboot3/cutejava-framework/src/main/java/cn/odboy/framework/mybatisplus/core/interfaces/KitMpServiceImpl.java

@@ -84,19 +84,18 @@ public class KitMpServiceImpl<M extends KitMpMapper<T>, T> extends ServiceImpl<M
     return KitBeanUtil.copyToClass(baseMapper.selectOne(wrapper), targetClazz);
   }
 
-  public <G> List<G> queryFeatureClazzListByIds(List<Serializable> ids, Class<G> targetClazz) {
-    List<T> entitys = this.listByIds(ids);
-    return KitBeanUtil.copyToList(entitys, targetClazz);
+  public <G> List<G> listFeatureClazzByIds(List<Serializable> ids, Class<G> targetClazz) {
+    return KitBeanUtil.copyToList(this.listByIds(ids), targetClazz);
   }
 
-  public <G> List<G> queryFeatureClazzListByArgs(LambdaQueryWrapper<T> wrapper, Class<G> targetClazz) {
+  public <G> List<G> queryFeatureClazzByArgs(LambdaQueryWrapper<T> wrapper, Class<G> targetClazz) {
     if (wrapper == null) {
       wrapper = new LambdaQueryWrapper<>();
     }
     return KitBeanUtil.copyToList(baseMapper.selectList(wrapper), targetClazz);
   }
 
-  public KitPageResult<T> searchClazzPageByArgs(LambdaQueryWrapper<T> wrapper, IPage<T> pageable) {
+  public KitPageResult<T> searchClazzByArgs(LambdaQueryWrapper<T> wrapper, IPage<T> pageable) {
     if (wrapper == null) {
       wrapper = new LambdaQueryWrapper<>();
     }
@@ -104,15 +103,12 @@ public class KitMpServiceImpl<M extends KitMpMapper<T>, T> extends ServiceImpl<M
     return new KitPageResult<>(originPageData.getRecords(), originPageData.getTotal());
   }
 
-  public <G> KitPageResult<G> searchFeatureClazzPageByArgs(LambdaQueryWrapper<T> wrapper, IPage<T> pageable, Class<G> targetClazz) {
+  public <G> KitPageResult<G> searchFeatureClazzByArgs(LambdaQueryWrapper<T> wrapper, Class<G> targetClazz, IPage<T> pageable) {
     if (wrapper == null) {
       wrapper = new LambdaQueryWrapper<>();
     }
     IPage<T> originPageData = baseMapper.selectPage(pageable, wrapper);
-    return new KitPageResult<>(
-        KitBeanUtil.copyToList(originPageData.getRecords(), targetClazz),
-        originPageData.getTotal()
-    );
+    return new KitPageResult<>(KitBeanUtil.copyToList(originPageData.getRecords(), targetClazz), originPageData.getTotal());
   }
 
   public int updateClazzByArgs(LambdaUpdateWrapper<T> wrapper) {