From c828e27b953342d936b96768e4530d91fb45624a Mon Sep 17 00:00:00 2001 From: Odboy Date: Fri, 30 Jan 2026 08:51:44 +0800 Subject: [PATCH] =?UTF-8?q?refactor(mybatisplus):=20=E4=BC=98=E5=8C=96KitM?= =?UTF-8?q?pService=E6=8E=A5=E5=8F=A3=E6=96=B9=E6=B3=95=E5=91=BD=E5=90=8D?= =?UTF-8?q?=E5=92=8C=E5=88=A0=E9=99=A4=E5=BA=9F=E5=BC=83=E5=B7=A5=E5=85=B7?= =?UTF-8?q?=E7=B1=BB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/views/components/dev/CutePage.vue | 19 +++++ .../mybatisplus/core/KitMpAnyQUtil.java | 82 ------------------- .../core/interfaces/KitMpService.java | 12 +-- .../core/interfaces/KitMpServiceImpl.java | 16 ++-- .../mybatisplus/core/KitMpAnyQUtil.java | 82 ------------------- .../core/interfaces/KitMpService.java | 12 +-- .../core/interfaces/KitMpServiceImpl.java | 16 ++-- 7 files changed, 43 insertions(+), 196 deletions(-) create mode 100644 cutejava-front/src/views/components/dev/CutePage.vue delete mode 100644 cutejava-springboot3/cutejava-framework/src/main/java/cn/odboy/framework/mybatisplus/core/KitMpAnyQUtil.java delete mode 100644 cutejava/cutejava-framework/src/main/java/cn/odboy/framework/mybatisplus/core/KitMpAnyQUtil.java diff --git a/cutejava-front/src/views/components/dev/CutePage.vue b/cutejava-front/src/views/components/dev/CutePage.vue new file mode 100644 index 00000000..5aea5be5 --- /dev/null +++ b/cutejava-front/src/views/components/dev/CutePage.vue @@ -0,0 +1,19 @@ + + + + + diff --git a/cutejava-springboot3/cutejava-framework/src/main/java/cn/odboy/framework/mybatisplus/core/KitMpAnyQUtil.java b/cutejava-springboot3/cutejava-framework/src/main/java/cn/odboy/framework/mybatisplus/core/KitMpAnyQUtil.java deleted file mode 100644 index 1c2cd08b..00000000 --- a/cutejava-springboot3/cutejava-framework/src/main/java/cn/odboy/framework/mybatisplus/core/KitMpAnyQUtil.java +++ /dev/null @@ -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 selectOne(BaseMapper baseMapper, Object queryParams) { - QueryWrapper queryWrapper = KitMpQUtil.build(queryParams); - return baseMapper.selectOne(queryWrapper); - } - - public static M selectOne(BaseMapper baseMapper, Object queryParams, Class mapperClazz) { - QueryWrapper queryWrapper = KitMpQUtil.build(queryParams); - T mapperTarget = baseMapper.selectOne(queryWrapper); - if (mapperTarget == null) { - return null; - } - return KitBeanUtil.copyToClass(mapperTarget, mapperClazz); - } - - public static List selectList(BaseMapper baseMapper, Object queryParams) { - QueryWrapper queryWrapper = KitMpQUtil.build(queryParams); - return baseMapper.selectList(queryWrapper); - } - - public static List selectList(BaseMapper baseMapper, Object queryParams, Class mapperClazz) { - QueryWrapper queryWrapper = KitMpQUtil.build(queryParams); - List mapperTarget = baseMapper.selectList(queryWrapper); - if (mapperTarget == null) { - return new ArrayList<>(); - } - return KitBeanUtil.copyToList(mapperTarget, mapperClazz); - } - - public static Long selectCount(BaseMapper baseMapper, Object queryParams) { - QueryWrapper queryWrapper = KitMpQUtil.build(queryParams); - return baseMapper.selectCount(queryWrapper); - } - - public static Page selectPage(BaseMapper baseMapper, Page page, Object queryParams) { - QueryWrapper queryWrapper = KitMpQUtil.build(queryParams); - return baseMapper.selectPage(page, queryWrapper); - } - - public static Page selectPage(BaseMapper baseMapper, Page page, Object queryParams, - Class mapperClazz) { - QueryWrapper queryWrapper = KitMpQUtil.build(queryParams); - Page tPage = baseMapper.selectPage(page, queryWrapper); - Page mapperTarget = new Page<>(); - mapperTarget.setRecords(KitBeanUtil.copyToList(tPage.getRecords(), mapperClazz)); - mapperTarget.setTotal(tPage.getTotal()); - mapperTarget.setSize(tPage.getSize()); - mapperTarget.setCurrent(tPage.getCurrent()); - return mapperTarget; - } -} diff --git a/cutejava-springboot3/cutejava-framework/src/main/java/cn/odboy/framework/mybatisplus/core/interfaces/KitMpService.java b/cutejava-springboot3/cutejava-framework/src/main/java/cn/odboy/framework/mybatisplus/core/interfaces/KitMpService.java index 0a7811f6..b66ebe81 100644 --- a/cutejava-springboot3/cutejava-framework/src/main/java/cn/odboy/framework/mybatisplus/core/interfaces/KitMpService.java +++ b/cutejava-springboot3/cutejava-framework/src/main/java/cn/odboy/framework/mybatisplus/core/interfaces/KitMpService.java @@ -83,7 +83,7 @@ public interface KitMpService extends IService { T getClazzByArgs(LambdaQueryWrapper wrapper, SFunction orderColumn); /** - * 根据条件查询一条数据（已测试） + * 根据条件查询一条目标类型的数据（已测试） * * @param wrapper 查询条件 * @param orderColumn 排序字段 @@ -99,7 +99,7 @@ public interface KitMpService extends IService { * @param targetClazz 目标类型 * @return / */ - List queryFeatureClazzListByIds(List ids, Class targetClazz); + List listFeatureClazzByIds(List ids, Class targetClazz); /** * 根据条件查询目标数据（已测试） @@ -108,7 +108,7 @@ public interface KitMpService extends IService { * @param targetClazz 目标类型 * @return / */ - List queryFeatureClazzListByArgs(LambdaQueryWrapper wrapper, Class targetClazz); + List queryFeatureClazzByArgs(LambdaQueryWrapper wrapper, Class targetClazz); /** * 根据条件分页查询数据（已测试） @@ -117,17 +117,17 @@ public interface KitMpService extends IService { * @param pageable 分页参数 * @return / */ - KitPageResult searchClazzPageByArgs(LambdaQueryWrapper wrapper, IPage pageable); + KitPageResult searchClazzByArgs(LambdaQueryWrapper wrapper, IPage pageable); /** * 根据条件分页查询目标数据（已测试） * * @param wrapper 查询条件 - * @param pageable 分页参数 * @param targetClazz 目标类型 + * @param pageable 分页参数 * @return / */ - KitPageResult searchFeatureClazzPageByArgs(LambdaQueryWrapper wrapper, IPage pageable, Class targetClazz); + KitPageResult searchFeatureClazzByArgs(LambdaQueryWrapper wrapper, Class targetClazz, IPage pageable); /** * 根据条件更新数据（已测试） diff --git a/cutejava-springboot3/cutejava-framework/src/main/java/cn/odboy/framework/mybatisplus/core/interfaces/KitMpServiceImpl.java b/cutejava-springboot3/cutejava-framework/src/main/java/cn/odboy/framework/mybatisplus/core/interfaces/KitMpServiceImpl.java index ffe1c18c..2477b167 100644 --- a/cutejava-springboot3/cutejava-framework/src/main/java/cn/odboy/framework/mybatisplus/core/interfaces/KitMpServiceImpl.java +++ b/cutejava-springboot3/cutejava-framework/src/main/java/cn/odboy/framework/mybatisplus/core/interfaces/KitMpServiceImpl.java @@ -84,19 +84,18 @@ public class KitMpServiceImpl, T> extends ServiceImpl List queryFeatureClazzListByIds(List ids, Class targetClazz) { - List entitys = this.listByIds(ids); - return KitBeanUtil.copyToList(entitys, targetClazz); + public List listFeatureClazzByIds(List ids, Class targetClazz) { + return KitBeanUtil.copyToList(this.listByIds(ids), targetClazz); } - public List queryFeatureClazzListByArgs(LambdaQueryWrapper wrapper, Class targetClazz) { + public List queryFeatureClazzByArgs(LambdaQueryWrapper wrapper, Class targetClazz) { if (wrapper == null) { wrapper = new LambdaQueryWrapper<>(); } return KitBeanUtil.copyToList(baseMapper.selectList(wrapper), targetClazz); } - public KitPageResult searchClazzPageByArgs(LambdaQueryWrapper wrapper, IPage pageable) { + public KitPageResult searchClazzByArgs(LambdaQueryWrapper wrapper, IPage pageable) { if (wrapper == null) { wrapper = new LambdaQueryWrapper<>(); } @@ -104,15 +103,12 @@ public class KitMpServiceImpl, T> extends ServiceImpl(originPageData.getRecords(), originPageData.getTotal()); } - public KitPageResult searchFeatureClazzPageByArgs(LambdaQueryWrapper wrapper, IPage pageable, Class targetClazz) { + public KitPageResult searchFeatureClazzByArgs(LambdaQueryWrapper wrapper, Class targetClazz, IPage pageable) { if (wrapper == null) { wrapper = new LambdaQueryWrapper<>(); } IPage 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 wrapper) { diff --git a/cutejava/cutejava-framework/src/main/java/cn/odboy/framework/mybatisplus/core/KitMpAnyQUtil.java b/cutejava/cutejava-framework/src/main/java/cn/odboy/framework/mybatisplus/core/KitMpAnyQUtil.java deleted file mode 100644 index 1c2cd08b..00000000 --- a/cutejava/cutejava-framework/src/main/java/cn/odboy/framework/mybatisplus/core/KitMpAnyQUtil.java +++ /dev/null @@ -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 selectOne(BaseMapper baseMapper, Object queryParams) { - QueryWrapper queryWrapper = KitMpQUtil.build(queryParams); - return baseMapper.selectOne(queryWrapper); - } - - public static M selectOne(BaseMapper baseMapper, Object queryParams, Class mapperClazz) { - QueryWrapper queryWrapper = KitMpQUtil.build(queryParams); - T mapperTarget = baseMapper.selectOne(queryWrapper); - if (mapperTarget == null) { - return null; - } - return KitBeanUtil.copyToClass(mapperTarget, mapperClazz); - } - - public static List selectList(BaseMapper baseMapper, Object queryParams) { - QueryWrapper queryWrapper = KitMpQUtil.build(queryParams); - return baseMapper.selectList(queryWrapper); - } - - public static List selectList(BaseMapper baseMapper, Object queryParams, Class mapperClazz) { - QueryWrapper queryWrapper = KitMpQUtil.build(queryParams); - List mapperTarget = baseMapper.selectList(queryWrapper); - if (mapperTarget == null) { - return new ArrayList<>(); - } - return KitBeanUtil.copyToList(mapperTarget, mapperClazz); - } - - public static Long selectCount(BaseMapper baseMapper, Object queryParams) { - QueryWrapper queryWrapper = KitMpQUtil.build(queryParams); - return baseMapper.selectCount(queryWrapper); - } - - public static Page selectPage(BaseMapper baseMapper, Page page, Object queryParams) { - QueryWrapper queryWrapper = KitMpQUtil.build(queryParams); - return baseMapper.selectPage(page, queryWrapper); - } - - public static Page selectPage(BaseMapper baseMapper, Page page, Object queryParams, - Class mapperClazz) { - QueryWrapper queryWrapper = KitMpQUtil.build(queryParams); - Page tPage = baseMapper.selectPage(page, queryWrapper); - Page mapperTarget = new Page<>(); - mapperTarget.setRecords(KitBeanUtil.copyToList(tPage.getRecords(), mapperClazz)); - mapperTarget.setTotal(tPage.getTotal()); - mapperTarget.setSize(tPage.getSize()); - mapperTarget.setCurrent(tPage.getCurrent()); - return mapperTarget; - } -} diff --git a/cutejava/cutejava-framework/src/main/java/cn/odboy/framework/mybatisplus/core/interfaces/KitMpService.java b/cutejava/cutejava-framework/src/main/java/cn/odboy/framework/mybatisplus/core/interfaces/KitMpService.java index 0a7811f6..b66ebe81 100644 --- a/cutejava/cutejava-framework/src/main/java/cn/odboy/framework/mybatisplus/core/interfaces/KitMpService.java +++ b/cutejava/cutejava-framework/src/main/java/cn/odboy/framework/mybatisplus/core/interfaces/KitMpService.java @@ -83,7 +83,7 @@ public interface KitMpService extends IService { T getClazzByArgs(LambdaQueryWrapper wrapper, SFunction orderColumn); /** - * 根据条件查询一条数据（已测试） + * 根据条件查询一条目标类型的数据（已测试） * * @param wrapper 查询条件 * @param orderColumn 排序字段 @@ -99,7 +99,7 @@ public interface KitMpService extends IService { * @param targetClazz 目标类型 * @return / */ - List queryFeatureClazzListByIds(List ids, Class targetClazz); + List listFeatureClazzByIds(List ids, Class targetClazz); /** * 根据条件查询目标数据（已测试） @@ -108,7 +108,7 @@ public interface KitMpService extends IService { * @param targetClazz 目标类型 * @return / */ - List queryFeatureClazzListByArgs(LambdaQueryWrapper wrapper, Class targetClazz); + List queryFeatureClazzByArgs(LambdaQueryWrapper wrapper, Class targetClazz); /** * 根据条件分页查询数据（已测试） @@ -117,17 +117,17 @@ public interface KitMpService extends IService { * @param pageable 分页参数 * @return / */ - KitPageResult searchClazzPageByArgs(LambdaQueryWrapper wrapper, IPage pageable); + KitPageResult searchClazzByArgs(LambdaQueryWrapper wrapper, IPage pageable); /** * 根据条件分页查询目标数据（已测试） * * @param wrapper 查询条件 - * @param pageable 分页参数 * @param targetClazz 目标类型 + * @param pageable 分页参数 * @return / */ - KitPageResult searchFeatureClazzPageByArgs(LambdaQueryWrapper wrapper, IPage pageable, Class targetClazz); + KitPageResult searchFeatureClazzByArgs(LambdaQueryWrapper wrapper, Class targetClazz, IPage pageable); /** * 根据条件更新数据（已测试） diff --git a/cutejava/cutejava-framework/src/main/java/cn/odboy/framework/mybatisplus/core/interfaces/KitMpServiceImpl.java b/cutejava/cutejava-framework/src/main/java/cn/odboy/framework/mybatisplus/core/interfaces/KitMpServiceImpl.java index b7b880bf..b7f2ada2 100644 --- a/cutejava/cutejava-framework/src/main/java/cn/odboy/framework/mybatisplus/core/interfaces/KitMpServiceImpl.java +++ b/cutejava/cutejava-framework/src/main/java/cn/odboy/framework/mybatisplus/core/interfaces/KitMpServiceImpl.java @@ -91,19 +91,18 @@ public class KitMpServiceImpl, T> extends ServiceImpl List queryFeatureClazzListByIds(List ids, Class targetClazz) { - List entitys = this.listByIds(ids); - return KitBeanUtil.copyToList(entitys, targetClazz); + public List listFeatureClazzByIds(List ids, Class targetClazz) { + return KitBeanUtil.copyToList(this.listByIds(ids), targetClazz); } - public List queryFeatureClazzListByArgs(LambdaQueryWrapper wrapper, Class targetClazz) { + public List queryFeatureClazzByArgs(LambdaQueryWrapper wrapper, Class targetClazz) { if (wrapper == null) { wrapper = new LambdaQueryWrapper<>(); } return KitBeanUtil.copyToList(baseMapper.selectList(wrapper), targetClazz); } - public KitPageResult searchClazzPageByArgs(LambdaQueryWrapper wrapper, IPage pageable) { + public KitPageResult searchClazzByArgs(LambdaQueryWrapper wrapper, IPage pageable) { if (wrapper == null) { wrapper = new LambdaQueryWrapper<>(); } @@ -111,15 +110,12 @@ public class KitMpServiceImpl, T> extends ServiceImpl(originPageData.getRecords(), originPageData.getTotal()); } - public KitPageResult searchFeatureClazzPageByArgs(LambdaQueryWrapper wrapper, IPage pageable, Class targetClazz) { + public KitPageResult searchFeatureClazzByArgs(LambdaQueryWrapper wrapper, Class targetClazz, IPage pageable) { if (wrapper == null) { wrapper = new LambdaQueryWrapper<>(); } IPage 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 wrapper) {