diff --git a/pom.xml b/pom.xml index 81e1fe8..35506da 100644 --- a/pom.xml +++ b/pom.xml @@ -24,7 +24,7 @@ 1.3.0 2.3 1.44.0 - 3.5.14 + 3.5.7 3.9.1 5.8.40 3.5.3 @@ -50,6 +50,9 @@ 1.8.1 + + 1.5.2 + 3.4.2 3.4.0 @@ -201,12 +204,16 @@ ${mybatis-plus.version} + + + + + - com.baomidou - mybatis-plus-jsqlparser - ${mybatis-plus.version} + com.github.yulichang + mybatis-plus-join-boot-starter + ${mybatis-plus-join.version} - com.baomidou mybatis-plus-annotation diff --git a/ruoyi-common/ruoyi-common-mybatis/pom.xml b/ruoyi-common/ruoyi-common-mybatis/pom.xml index a82268c..a9baa54 100644 --- a/ruoyi-common/ruoyi-common-mybatis/pom.xml +++ b/ruoyi-common/ruoyi-common-mybatis/pom.xml @@ -37,10 +37,17 @@ mybatis-plus-spring-boot3-starter + + + + + + - com.baomidou - mybatis-plus-jsqlparser + com.github.yulichang + mybatis-plus-join-boot-starter + p6spy diff --git a/ruoyi-common/ruoyi-common-mybatis/src/main/java/org/dromara/common/mybatis/core/mapper/BaseMapperPlus.java b/ruoyi-common/ruoyi-common-mybatis/src/main/java/org/dromara/common/mybatis/core/mapper/BaseMapperPlus.java index 24557ed..aec0673 100644 --- a/ruoyi-common/ruoyi-common-mybatis/src/main/java/org/dromara/common/mybatis/core/mapper/BaseMapperPlus.java +++ b/ruoyi-common/ruoyi-common-mybatis/src/main/java/org/dromara/common/mybatis/core/mapper/BaseMapperPlus.java @@ -18,7 +18,9 @@ import java.io.Serializable; import java.util.Collection; import java.util.List; import java.util.Map; +import java.util.Objects; import java.util.function.Function; +import java.util.stream.Collectors; /** * 自定义 Mapper 接口, 实现 自定义扩展 @@ -33,113 +35,78 @@ public interface BaseMapperPlus extends BaseMapper { Log log = LogFactory.getLog(BaseMapperPlus.class); - /** - * 获取当前实例对象关联的泛型类型 V 的 Class 对象 - * - * @return 返回当前实例对象关联的泛型类型 V 的 Class 对象 - */ default Class currentVoClass() { return (Class) GenericTypeUtils.resolveTypeArguments(this.getClass(), BaseMapperPlus.class)[1]; } - /** - * 获取当前实例对象关联的泛型类型 T 的 Class 对象 - * - * @return 返回当前实例对象关联的泛型类型 T 的 Class 对象 - */ default Class currentModelClass() { return (Class) GenericTypeUtils.resolveTypeArguments(this.getClass(), BaseMapperPlus.class)[0]; } - /** - * 使用默认的查询条件查询并返回结果列表 - * - * @return 返回查询结果的列表 - */ default List selectList() { return this.selectList(new QueryWrapper<>()); } /** - * 批量插入实体对象集合 - * - * @param entityList 实体对象集合 - * @return 插入操作是否成功的布尔值 + * 批量插入 */ default boolean insertBatch(Collection entityList) { - return Db.saveBatch(entityList); + Db.saveBatch(entityList); + // 临时解决 新版本 mp 插入状态判断错误问题 + return true; } /** - * 批量根据ID更新实体对象集合 - * - * @param entityList 实体对象集合 - * @return 更新操作是否成功的布尔值 + * 批量更新 */ default boolean updateBatchById(Collection entityList) { - return Db.updateBatchById(entityList); + Db.updateBatchById(entityList); + // 临时解决 新版本 mp 插入状态判断错误问题 + return true; } /** - * 批量插入或更新实体对象集合 - * - * @param entityList 实体对象集合 - * @return 插入或更新操作是否成功的布尔值 + * 批量插入或更新 */ default boolean insertOrUpdateBatch(Collection entityList) { - return Db.saveOrUpdateBatch(entityList); + Db.saveOrUpdateBatch(entityList); + // 临时解决 新版本 mp 插入状态判断错误问题 + return true; } /** - * 批量插入实体对象集合并指定批处理大小 - * - * @param entityList 实体对象集合 - * @param batchSize 批处理大小 - * @return 插入操作是否成功的布尔值 + * 批量插入(包含限制条数) */ default boolean insertBatch(Collection entityList, int batchSize) { - return Db.saveBatch(entityList, batchSize); + Db.saveBatch(entityList, batchSize); + // 临时解决 新版本 mp 插入状态判断错误问题 + return true; } /** - * 批量根据ID更新实体对象集合并指定批处理大小 - * - * @param entityList 实体对象集合 - * @param batchSize 批处理大小 - * @return 更新操作是否成功的布尔值 + * 批量更新(包含限制条数) */ default boolean updateBatchById(Collection entityList, int batchSize) { - return Db.updateBatchById(entityList, batchSize); + Db.updateBatchById(entityList, batchSize); + // 临时解决 新版本 mp 插入状态判断错误问题 + return true; } /** - * 批量插入或更新实体对象集合并指定批处理大小 - * - * @param entityList 实体对象集合 - * @param batchSize 批处理大小 - * @return 插入或更新操作是否成功的布尔值 + * 批量插入或更新(包含限制条数) */ default boolean insertOrUpdateBatch(Collection entityList, int batchSize) { - return Db.saveOrUpdateBatch(entityList, batchSize); + Db.saveOrUpdateBatch(entityList, batchSize); + // 临时解决 新版本 mp 插入状态判断错误问题 + return true; } - /** - * 根据ID查询单个VO对象 - * - * @param id 主键ID - * @return 查询到的单个VO对象 - */ default V selectVoById(Serializable id) { return selectVoById(id, this.currentVoClass()); } /** - * 根据ID查询单个VO对象并将其转换为指定的VO类 - * - * @param id 主键ID - * @param voClass 要转换的VO类的Class对象 - * @param VO类的类型 - * @return 查询到的单个VO对象，经过转换为指定的VO类后返回 + * 根据 ID 查询 */ default C selectVoById(Serializable id, Class voClass) { T obj = this.selectById(id); @@ -149,49 +116,27 @@ public interface BaseMapperPlus extends BaseMapper { return MapstructUtils.convert(obj, voClass); } - /** - * 根据ID集合批量查询VO对象列表 - * - * @param idList 主键ID集合 - * @return 查询到的VO对象列表 - */ - default List selectVoByIds(Collection idList) { - return selectVoByIds(idList, this.currentVoClass()); + default List selectVoBatchIds(Collection idList) { + return selectVoBatchIds(idList, this.currentVoClass()); } /** - * 根据ID集合批量查询实体对象列表，并将其转换为指定的VO对象列表 - * - * @param idList 主键ID集合 - * @param voClass 要转换的VO类的Class对象 - * @param VO类的类型 - * @return 查询到的VO对象列表，经过转换为指定的VO类后返回 + * 查询（根据ID 批量查询） */ - default List selectVoByIds(Collection idList, Class voClass) { - List list = this.selectByIds(idList); + default List selectVoBatchIds(Collection idList, Class voClass) { + List list = this.selectBatchIds(idList); if (CollUtil.isEmpty(list)) { return CollUtil.newArrayList(); } return MapstructUtils.convert(list, voClass); } - /** - * 根据查询条件Map查询VO对象列表 - * - * @param map 查询条件Map - * @return 查询到的VO对象列表 - */ default List selectVoByMap(Map map) { return selectVoByMap(map, this.currentVoClass()); } /** - * 根据查询条件Map查询实体对象列表，并将其转换为指定的VO对象列表 - * - * @param map 查询条件Map - * @param voClass 要转换的VO类的Class对象 - * @param VO类的类型 - * @return 查询到的VO对象列表，经过转换为指定的VO类后返回 + * 查询（根据 columnMap 条件） */ default List selectVoByMap(Map map, Class voClass) { List list = this.selectByMap(map); @@ -201,47 +146,23 @@ public interface BaseMapperPlus extends BaseMapper { return MapstructUtils.convert(list, voClass); } - /** - * 根据条件查询单个VO对象 - * - * @param wrapper 查询条件Wrapper - * @return 查询到的单个VO对象 - */ default V selectVoOne(Wrapper wrapper) { return selectVoOne(wrapper, this.currentVoClass()); } - /** - * 根据条件查询单个VO对象，并根据需要决定是否抛出异常 - * - * @param wrapper 查询条件Wrapper - * @param throwEx 是否抛出异常的标志 - * @return 查询到的单个VO对象 - */ default V selectVoOne(Wrapper wrapper, boolean throwEx) { return selectVoOne(wrapper, this.currentVoClass(), throwEx); } /** - * 根据条件查询单个VO对象，并指定返回的VO对象的类型 - * - * @param wrapper 查询条件Wrapper - * @param voClass 返回的VO对象的Class对象 - * @param 返回的VO对象的类型 - * @return 查询到的单个VO对象，经过类型转换为指定的VO类后返回 + * 根据 entity 条件，查询一条记录 */ default C selectVoOne(Wrapper wrapper, Class voClass) { return selectVoOne(wrapper, voClass, true); } /** - * 根据条件查询单个实体对象，并将其转换为指定的VO对象 - * - * @param wrapper 查询条件Wrapper - * @param voClass 要转换的VO类的Class对象 - * @param throwEx 是否抛出异常的标志 - * @param VO类的类型 - * @return 查询到的单个VO对象，经过转换为指定的VO类后返回 + * 根据 entity 条件，查询一条记录 */ default C selectVoOne(Wrapper wrapper, Class voClass, boolean throwEx) { T obj = this.selectOne(wrapper, throwEx); @@ -251,32 +172,16 @@ public interface BaseMapperPlus extends BaseMapper { return MapstructUtils.convert(obj, voClass); } - /** - * 查询所有VO对象列表 - * - * @return 查询到的VO对象列表 - */ default List selectVoList() { return selectVoList(new QueryWrapper<>(), this.currentVoClass()); } - /** - * 根据条件查询VO对象列表 - * - * @param wrapper 查询条件Wrapper - * @return 查询到的VO对象列表 - */ default List selectVoList(Wrapper wrapper) { return selectVoList(wrapper, this.currentVoClass()); } /** - * 根据条件查询实体对象列表，并将其转换为指定的VO对象列表 - * - * @param wrapper 查询条件Wrapper - * @param voClass 要转换的VO类的Class对象 - * @param VO类的类型 - * @return 查询到的VO对象列表，经过转换为指定的VO类后返回 + * 根据 entity 条件，查询全部记录 */ default List selectVoList(Wrapper wrapper, Class voClass) { List list = this.selectList(wrapper); @@ -286,31 +191,15 @@ public interface BaseMapperPlus extends BaseMapper { return MapstructUtils.convert(list, voClass); } - /** - * 根据条件分页查询VO对象列表 - * - * @param page 分页信息 - * @param wrapper 查询条件Wrapper - * @return 查询到的VO对象分页列表 - */ default

> P selectVoPage(IPage page, Wrapper wrapper) { return selectVoPage(page, wrapper, this.currentVoClass()); } /** - * 根据条件分页查询实体对象列表，并将其转换为指定的VO对象分页列表 - * - * @param page 分页信息 - * @param wrapper 查询条件Wrapper - * @param voClass 要转换的VO类的Class对象 - * @param VO类的类型 - * @param

VO对象分页列表的类型 - * @return 查询到的VO对象分页列表，经过转换为指定的VO类后返回 + * 分页查询VO */ default > P selectVoPage(IPage page, Wrapper wrapper, Class voClass) { - // 根据条件分页查询实体对象列表 List list = this.selectList(page, wrapper); - // 创建一个新的VO对象分页列表，并设置分页信息 IPage voPage = new Page<>(page.getCurrent(), page.getSize(), page.getTotal()); if (CollUtil.isEmpty(list)) { return (P) voPage; @@ -319,16 +208,9 @@ public interface BaseMapperPlus extends BaseMapper { return (P) voPage; } - /** - * 根据条件查询符合条件的对象，并将其转换为指定类型的对象列表 - * - * @param wrapper 查询条件Wrapper - * @param mapper 转换函数，用于将查询到的对象转换为指定类型的对象 - * @param 要转换的对象的类型 - * @return 查询到的符合条件的对象列表，经过转换为指定类型的对象后返回 - */ default List selectObjs(Wrapper wrapper, Function mapper) { - return StreamUtils.toList(this.selectObjs(wrapper), mapper); + return this.selectObjs(wrapper).stream().filter(Objects::nonNull).map(mapper).collect(Collectors.toList()); } } + diff --git a/ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/mapper/TestDemoMapper.java b/ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/mapper/TestDemoMapper.java index 19b2d52..2b82b9b 100644 --- a/ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/mapper/TestDemoMapper.java +++ b/ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/mapper/TestDemoMapper.java @@ -52,7 +52,7 @@ public interface TestDemoMapper extends BaseMapperPlus { @DataColumn(key = "deptName", value = "dept_id"), @DataColumn(key = "userName", value = "user_id") }, joinStr = "AND") - List selectByIds(@Param(Constants.COLL) Collection idList); + List selectBatchIds(@Param(Constants.COLL) Collection idList); @Override @DataPermission({ diff --git a/ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/service/impl/TestDemoServiceImpl.java b/ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/service/impl/TestDemoServiceImpl.java index ced141e..3cfde3a 100644 --- a/ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/service/impl/TestDemoServiceImpl.java +++ b/ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/service/impl/TestDemoServiceImpl.java @@ -101,7 +101,7 @@ public class TestDemoServiceImpl implements ITestDemoService { public Boolean deleteWithValidByIds(Collection ids, Boolean isValid) { if (isValid) { // 做一些业务上的校验,判断是否需要校验 - List list = baseMapper.selectByIds(ids); + List list = baseMapper.selectBatchIds(ids); if (list.size() != ids.size()) { throw new ServiceException("您没有删除权限!"); } diff --git a/ruoyi-modules/ruoyi-fishery/src/main/java/org/dromara/fishery/mapper/DeviceBindRecordMapper.java b/ruoyi-modules/ruoyi-fishery/src/main/java/org/dromara/fishery/mapper/DeviceBindRecordMapper.java index a01aaa6..10f1501 100644 --- a/ruoyi-modules/ruoyi-fishery/src/main/java/org/dromara/fishery/mapper/DeviceBindRecordMapper.java +++ b/ruoyi-modules/ruoyi-fishery/src/main/java/org/dromara/fishery/mapper/DeviceBindRecordMapper.java @@ -1,5 +1,6 @@ package org.dromara.fishery.mapper; +import org.dromara.common.mybatis.core.mapper.BaseMapperPlusJoin; import org.dromara.fishery.domain.DeviceBindRecord; import org.dromara.fishery.domain.vo.DeviceBindRecordVo; import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; @@ -10,6 +11,6 @@ import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; * @author intc * @date 2025-10-14 */ -public interface DeviceBindRecordMapper extends BaseMapperPlus { +public interface DeviceBindRecordMapper extends BaseMapperPlusJoin { } diff --git a/ruoyi-modules/ruoyi-fishery/src/main/java/org/dromara/fishery/mapper/DeviceMapper.java b/ruoyi-modules/ruoyi-fishery/src/main/java/org/dromara/fishery/mapper/DeviceMapper.java index fd22b11..cfca543 100644 --- a/ruoyi-modules/ruoyi-fishery/src/main/java/org/dromara/fishery/mapper/DeviceMapper.java +++ b/ruoyi-modules/ruoyi-fishery/src/main/java/org/dromara/fishery/mapper/DeviceMapper.java @@ -1,6 +1,7 @@ package org.dromara.fishery.mapper; import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; +import org.dromara.common.mybatis.core.mapper.BaseMapperPlusJoin; import org.dromara.fishery.domain.Device; import org.dromara.fishery.domain.vo.DeviceVo; import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; @@ -11,6 +12,6 @@ import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; * @author intc * @date 2025-10-14 */ -public interface DeviceMapper extends BaseMapperPlus { +public interface DeviceMapper extends BaseMapperPlusJoin { } diff --git a/ruoyi-modules/ruoyi-fishery/src/main/java/org/dromara/fishery/mapper/PondMapper.java b/ruoyi-modules/ruoyi-fishery/src/main/java/org/dromara/fishery/mapper/PondMapper.java index 307ac81..7ff563f 100644 --- a/ruoyi-modules/ruoyi-fishery/src/main/java/org/dromara/fishery/mapper/PondMapper.java +++ b/ruoyi-modules/ruoyi-fishery/src/main/java/org/dromara/fishery/mapper/PondMapper.java @@ -1,5 +1,6 @@ package org.dromara.fishery.mapper; +import org.dromara.common.mybatis.core.mapper.BaseMapperPlusJoin; import org.dromara.fishery.domain.Pond; import org.dromara.fishery.domain.vo.PondVo; import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; @@ -10,6 +11,6 @@ import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; * @author intc * @date 2025-10-11 */ -public interface PondMapper extends BaseMapperPlus { +public interface PondMapper extends BaseMapperPlusJoin { } diff --git a/ruoyi-modules/ruoyi-fishery/src/main/java/org/dromara/fishery/service/impl/DeviceBindRecordServiceImpl.java b/ruoyi-modules/ruoyi-fishery/src/main/java/org/dromara/fishery/service/impl/DeviceBindRecordServiceImpl.java index 58931c8..6ac73b8 100644 --- a/ruoyi-modules/ruoyi-fishery/src/main/java/org/dromara/fishery/service/impl/DeviceBindRecordServiceImpl.java +++ b/ruoyi-modules/ruoyi-fishery/src/main/java/org/dromara/fishery/service/impl/DeviceBindRecordServiceImpl.java @@ -5,8 +5,7 @@ import org.dromara.common.core.utils.StringUtils; import org.dromara.common.mybatis.core.page.TableDataInfo; import org.dromara.common.mybatis.core.page.PageQuery; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import com.baomidou.mybatisplus.core.toolkit.Wrappers; +import com.github.yulichang.wrapper.MPJLambdaWrapper; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; @@ -14,15 +13,12 @@ import org.dromara.fishery.domain.AquUser; import org.dromara.fishery.domain.bo.DeviceBindRecordBo; import org.dromara.fishery.domain.vo.DeviceBindRecordVo; import org.dromara.fishery.domain.DeviceBindRecord; -import org.dromara.fishery.mapper.AquUserMapper; import org.dromara.fishery.mapper.DeviceBindRecordMapper; import org.dromara.fishery.service.IDeviceBindRecordService; -import java.util.Arrays; import java.util.List; import java.util.Map; import java.util.Collection; -import java.util.stream.Collectors; /** * 设备绑定记录Service业务层处理 @@ -36,7 +32,6 @@ import java.util.stream.Collectors; public class DeviceBindRecordServiceImpl implements IDeviceBindRecordService { private final DeviceBindRecordMapper baseMapper; - private final AquUserMapper aquUserMapper; /** * 查询设备绑定记录 @@ -58,12 +53,8 @@ public class DeviceBindRecordServiceImpl implements IDeviceBindRecordService { */ @Override public TableDataInfo queryPageList(DeviceBindRecordBo bo, PageQuery pageQuery) { - LambdaQueryWrapper lqw = buildQueryWrapper(bo); - Page result = baseMapper.selectVoPage(pageQuery.build(), lqw); - - // 批量填充用户信息 - enrichRecordListWithUserInfo(result.getRecords()); - + MPJLambdaWrapper wrapper = buildQueryWrapper(bo); + Page result = baseMapper.selectJoinPage(pageQuery.build(), DeviceBindRecordVo.class, wrapper); return TableDataInfo.build(result); } @@ -75,50 +66,61 @@ public class DeviceBindRecordServiceImpl implements IDeviceBindRecordService { */ @Override public List queryList(DeviceBindRecordBo bo) { - LambdaQueryWrapper lqw = buildQueryWrapper(bo); - List recordList = baseMapper.selectVoList(lqw); - - // 批量填充用户信息 - enrichRecordListWithUserInfo(recordList); - - return recordList; + MPJLambdaWrapper wrapper = buildQueryWrapper(bo); + return baseMapper.selectVoJoinList(wrapper); } - private LambdaQueryWrapper buildQueryWrapper(DeviceBindRecordBo bo) { + /** + * 构建查询条件包装器（使用 MPJLambdaWrapper 支持联表查询） + * + * @param bo 查询条件业务对象 + * @return 构建好的查询条件包装器 + */ + private MPJLambdaWrapper buildQueryWrapper(DeviceBindRecordBo bo) { Map params = bo.getParams(); - LambdaQueryWrapper lqw = Wrappers.lambdaQuery(); - lqw.orderByDesc(DeviceBindRecord::getCreateTime); - lqw.like(StringUtils.isNotBlank(bo.getIotId()), DeviceBindRecord::getIotId, bo.getIotId()); - lqw.eq(bo.getDeviceType() != null, DeviceBindRecord::getDeviceType, bo.getDeviceType()); - lqw.eq(StringUtils.isNotBlank(bo.getSerialNum()), DeviceBindRecord::getSerialNum, bo.getSerialNum()); - lqw.eq(bo.getUserId() != null, DeviceBindRecord::getUserId, bo.getUserId()); - lqw.eq(bo.getIsBind() != null, DeviceBindRecord::getIsBind, bo.getIsBind()); + MPJLambdaWrapper wrapper = new MPJLambdaWrapper<>(); + + // 选择主表所有字段 + wrapper.selectAll(DeviceBindRecord.class); + // 选择关联表的字段（使用 selectAs 映射到 VO） + wrapper.selectAs(AquUser::getUserName, DeviceBindRecordVo::getUserName) + .selectAs(AquUser::getMobilePhone, DeviceBindRecordVo::getMobilePhone); + + // 关联查询用户表 + wrapper.leftJoin(AquUser.class, AquUser::getId, DeviceBindRecord::getUserId); + + // 默认按创建时间倒序排序 + wrapper.orderByDesc(DeviceBindRecord::getCreateTime); + + // 基础查询条件 + wrapper.like(StringUtils.isNotBlank(bo.getIotId()), DeviceBindRecord::getIotId, bo.getIotId()); + wrapper.eq(bo.getDeviceType() != null, DeviceBindRecord::getDeviceType, bo.getDeviceType()); + wrapper.eq(StringUtils.isNotBlank(bo.getSerialNum()), DeviceBindRecord::getSerialNum, bo.getSerialNum()); + wrapper.eq(bo.getUserId() != null, DeviceBindRecord::getUserId, bo.getUserId()); + wrapper.eq(bo.getIsBind() != null, DeviceBindRecord::getIsBind, bo.getIsBind()); // 处理额外的查询参数 if (params != null && !params.isEmpty()) { - handleExtraParams(lqw, params); + handleExtraParams(wrapper, params); } - return lqw; + return wrapper; } /** * 处理额外的查询参数 * - * @param lqw 查询包装器 - * @param params 额外参数 + * @param wrapper 查询包装器 + * @param params 额外参数 */ - private void handleExtraParams(LambdaQueryWrapper lqw, Map params) { + private void handleExtraParams(MPJLambdaWrapper wrapper, Map params) { // 处理用户搜索关键词（用户名或手机号） String userKeyword = (String) params.get("userKeyword"); if (StringUtils.isNotBlank(userKeyword)) { - List matchingUserIds = getMatchingUserIds(userKeyword); - if (matchingUserIds.isEmpty()) { - // 如果没有符合条件的用户，直接返回空结果 - lqw.eq(DeviceBindRecord::getId, -1); // 使用不存在的ID来返回空结果 - return; - } - lqw.in(DeviceBindRecord::getUserId, matchingUserIds); + // 使用联表查询直接在 SQL 中过滤用户信息 + wrapper.and(w -> w.like(AquUser::getUserName, userKeyword) + .or() + .like(AquUser::getMobilePhone, userKeyword)); } } @@ -174,63 +176,5 @@ public class DeviceBindRecordServiceImpl implements IDeviceBindRecordService { return baseMapper.deleteByIds(ids) > 0; } - /** - * 为记录列表批量填充用户信息 - * - * @param recordList 记录列表 - */ - private void enrichRecordListWithUserInfo(List recordList) { - if (recordList == null || recordList.isEmpty()) { - return; - } - // 收集所有的用户ID - List userIds = recordList.stream() - .map(DeviceBindRecordVo::getUserId) - .filter(userId -> userId != null) - .distinct() - .collect(Collectors.toList()); - - if (userIds.isEmpty()) { - return; - } - - // 批量查询用户信息 - List userList = aquUserMapper.selectBatchIds(userIds); - Map userMap = userList.stream() - .collect(Collectors.toMap(AquUser::getId, user -> user, (existing, replacement) -> existing)); - - // 为每条记录设置用户信息 - for (DeviceBindRecordVo record : recordList) { - if (record.getUserId() != null) { - AquUser user = userMap.get(record.getUserId()); - if (user != null) { - record.setUserName(user.getUserName()); - record.setMobilePhone(user.getMobilePhone()); - } - } - } - } - - /** - * 根据用户关键词查询符合条件的用户ID列表 - * - * @param userKeyword 用户搜索关键词（用户名或手机号） - * @return 符合条件的用户ID列表 - */ - private List getMatchingUserIds(String userKeyword) { - if (StringUtils.isBlank(userKeyword)) { - return Arrays.asList(); - } - - LambdaQueryWrapper userQuery = Wrappers.lambdaQuery(); - userQuery.like(AquUser::getUserName, userKeyword) - .or() - .like(AquUser::getMobilePhone, userKeyword); - - List matchingUsers = aquUserMapper.selectList(userQuery); - return matchingUsers.stream() - .map(AquUser::getId) - .collect(Collectors.toList()); - } } diff --git a/ruoyi-modules/ruoyi-fishery/src/main/java/org/dromara/fishery/service/impl/DeviceServiceImpl.java b/ruoyi-modules/ruoyi-fishery/src/main/java/org/dromara/fishery/service/impl/DeviceServiceImpl.java index 2481109..186aed0 100644 --- a/ruoyi-modules/ruoyi-fishery/src/main/java/org/dromara/fishery/service/impl/DeviceServiceImpl.java +++ b/ruoyi-modules/ruoyi-fishery/src/main/java/org/dromara/fishery/service/impl/DeviceServiceImpl.java @@ -1,11 +1,9 @@ package org.dromara.fishery.service.impl; -import java.util.Arrays; import java.util.Collection; import java.util.Date; import java.util.List; import java.util.Map; -import java.util.stream.Collectors; import org.dromara.common.core.utils.MapstructUtils; import org.dromara.common.core.utils.StringUtils; @@ -16,15 +14,14 @@ import org.dromara.fishery.domain.Device; import org.dromara.fishery.domain.Pond; import org.dromara.fishery.domain.bo.DeviceBo; import org.dromara.fishery.domain.vo.DeviceVo; -import org.dromara.fishery.mapper.AquUserMapper; import org.dromara.fishery.mapper.DeviceMapper; -import org.dromara.fishery.mapper.PondMapper; import org.dromara.fishery.service.IDeviceService; import org.springframework.stereotype.Service; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.github.yulichang.wrapper.MPJLambdaWrapper; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; @@ -41,8 +38,6 @@ import lombok.extern.slf4j.Slf4j; public class DeviceServiceImpl implements IDeviceService { private final DeviceMapper baseMapper; - private final AquUserMapper aquUserMapper; - private final PondMapper pondMapper; /** * 查询设备管理 @@ -56,7 +51,7 @@ public class DeviceServiceImpl implements IDeviceService { } /** - * 分页查询设备管理列表 - 批量查询方案（避免N+1问题） + * 分页查询设备管理列表 - JOIN查询方案（避免N+1问题） * * @param bo 查询条件 * @param pageQuery 分页参数 @@ -64,12 +59,9 @@ public class DeviceServiceImpl implements IDeviceService { */ @Override public TableDataInfo queryPageList(DeviceBo bo, PageQuery pageQuery) { - LambdaQueryWrapper lqw = buildQueryWrapper(bo); - Page result = baseMapper.selectVoPage(pageQuery.build(), lqw); + MPJLambdaWrapper wrapper = buildQueryWrapper(bo); + Page result = baseMapper.selectJoinPage(pageQuery.build(), DeviceVo.class, wrapper); - // 批量填充关联数据 - enrichDeviceListWithUserInfo(result.getRecords()); - enrichDeviceListWithPondInfo(result.getRecords()); // 计算过期信息 calculateExpirationInfo(result.getRecords()); @@ -77,84 +69,83 @@ public class DeviceServiceImpl implements IDeviceService { } /** - * 查询符合条件的设备管理列表 - 批量查询方案（避免N+1问题） + * 查询符合条件的设备管理列表 - JOIN查询方案（避免N+1问题） * * @param bo 查询条件 * @return 设备管理列表 */ @Override public List queryList(DeviceBo bo) { - LambdaQueryWrapper lqw = buildQueryWrapper(bo); - List deviceList = baseMapper.selectVoList(lqw); + MPJLambdaWrapper wrapper = buildQueryWrapper(bo); + List deviceList = baseMapper.selectJoinList(DeviceVo.class, wrapper); - // 批量填充关联数据 - enrichDeviceListWithUserInfo(deviceList); - enrichDeviceListWithPondInfo(deviceList); // 计算过期信息 calculateExpirationInfo(deviceList); return deviceList; } - private LambdaQueryWrapper buildQueryWrapper(DeviceBo bo) { + private MPJLambdaWrapper buildQueryWrapper(DeviceBo bo) { Map params = bo.getParams(); - LambdaQueryWrapper lqw = Wrappers.lambdaQuery(); + MPJLambdaWrapper wrapper = new MPJLambdaWrapper<>(); + + // Select main table fields + wrapper.selectAll(Device.class); + // Select joined table fields with Lambda mapping + wrapper.selectAs(AquUser::getUserName, DeviceVo::getUserName) + .selectAs(AquUser::getMobilePhone, DeviceVo::getMobilePhone); + wrapper.selectAs(Pond::getPondName, DeviceVo::getPondName); + + // Left join with user table + wrapper.leftJoin(AquUser.class, AquUser::getId, Device::getUserId); + // Left join with pond table + wrapper.leftJoin(Pond.class, Pond::getId, Device::getPondId); // 处理排序逼辑：如果expiredFlag为1，按过期时间倒序，否则按创建时间倒序 String expiredFlag = params != null ? (String) params.get("expiredFlag") : null; if ("1".equals(expiredFlag)) { // 按deadTime倒序（过期时间越早的越靠后，即过期越久的越靠前） - lqw.orderByAsc(Device::getDeadTime); + wrapper.orderByAsc(Device::getDeadTime); } else { - lqw.orderByDesc(Device::getCreateTime); + wrapper.orderByDesc(Device::getCreateTime); } - lqw.eq(bo.getUserId() != null, Device::getUserId, bo.getUserId()); - lqw.eq(StringUtils.isNotBlank(bo.getSerialNum()), Device::getSerialNum, bo.getSerialNum()); - lqw.like(StringUtils.isNotBlank(bo.getDeviceName()), Device::getDeviceName, bo.getDeviceName()); - lqw.eq(bo.getDeviceType() != null, Device::getDeviceType, bo.getDeviceType()); - lqw.eq(bo.getBindTime() != null, Device::getBindTime, bo.getBindTime()); - lqw.eq(bo.getPondId() != null, Device::getPondId, bo.getPondId()); - lqw.like(StringUtils.isNotBlank(bo.getIccId()), Device::getIccId, bo.getIccId()); - lqw.eq(StringUtils.isNotBlank(bo.getCategory()), Device::getCategory, bo.getCategory()); + wrapper.eq(bo.getUserId() != null, Device::getUserId, bo.getUserId()); + wrapper.eq(StringUtils.isNotBlank(bo.getSerialNum()), Device::getSerialNum, bo.getSerialNum()); + wrapper.like(StringUtils.isNotBlank(bo.getDeviceName()), Device::getDeviceName, bo.getDeviceName()); + wrapper.eq(bo.getDeviceType() != null, Device::getDeviceType, bo.getDeviceType()); + wrapper.eq(bo.getBindTime() != null, Device::getBindTime, bo.getBindTime()); + wrapper.eq(bo.getPondId() != null, Device::getPondId, bo.getPondId()); + wrapper.like(StringUtils.isNotBlank(bo.getIccId()), Device::getIccId, bo.getIccId()); + wrapper.eq(StringUtils.isNotBlank(bo.getCategory()), Device::getCategory, bo.getCategory()); // 处理额外的查询参数 if (params != null && !params.isEmpty()) { - handleExtraParams(lqw, params); + handleExtraParams(wrapper, params); } - return lqw; + return wrapper; } /** * 处理额外的查询参数 * - * @param lqw 查询包装器 + * @param wrapper 查询包装器 * @param params 额外参数 */ - private void handleExtraParams(LambdaQueryWrapper lqw, Map params) { - // 处理用户搜索关键词（用户名或手机号） + private void handleExtraParams(MPJLambdaWrapper wrapper, Map params) { + // 处理用户搜索关键词（用户名或手机号）- 直接在SQL中进行JOIN查询 String userKeyword = (String) params.get("userKeyword"); if (StringUtils.isNotBlank(userKeyword)) { - List matchingUserIds = getMatchingUserIds(userKeyword); - if (matchingUserIds.isEmpty()) { - // 如果没有符合条件的用户，直接返回空结果 - lqw.eq(Device::getId, -1); // 使用不存在的ID来返回空结果 - return; - } - lqw.in(Device::getUserId, matchingUserIds); + wrapper.and(w -> w.like(AquUser::getUserName, userKeyword) + .or() + .like(AquUser::getMobilePhone, userKeyword)); } - // 处理塘口搜索关键词（塘口名称） + // 处理塘口搜索关键词（塘口名称）- 直接在SQL中进行JOIN查询 String pondKeyword = (String) params.get("pondKeyword"); if (StringUtils.isNotBlank(pondKeyword)) { - List matchingPondIds = getMatchingPondIds(pondKeyword); - if (matchingPondIds.isEmpty()) { - // 如果没有符合条件的塘口，直接返回空结果 - lqw.eq(Device::getId, -1); // 使用不存在的ID来返回空结果 - return; - } - lqw.in(Device::getPondId, matchingPondIds); + wrapper.like(Pond::getPondName, pondKeyword); } // 处理是否过期查询条件 @@ -165,10 +156,10 @@ public class DeviceServiceImpl implements IDeviceService { Date currentDate = new Date(); if (isExpired == 1) { // 查询已过期的设备（deadTime < 当前时间） - lqw.lt(Device::getDeadTime, currentDate); + wrapper.lt(Device::getDeadTime, currentDate); } else if (isExpired == 0) { // 查询未过期的设备（deadTime >= 当前时间 或 deadTime 为空） - lqw.and(wrapper -> wrapper.ge(Device::getDeadTime, currentDate) + wrapper.and(w -> w.ge(Device::getDeadTime, currentDate) .or() .isNull(Device::getDeadTime)); } @@ -230,122 +221,7 @@ public class DeviceServiceImpl implements IDeviceService { return baseMapper.deleteByIds(ids) > 0; } - /** - * 为设备列表批量填充用户信息 - * - * @param deviceList 设备列表 - */ - private void enrichDeviceListWithUserInfo(List deviceList) { - if (deviceList == null || deviceList.isEmpty()) { - return; - } - // 收集所有的用户ID - List userIds = deviceList.stream() - .map(DeviceVo::getUserId) - .filter(userId -> userId != null) - .distinct() - .collect(Collectors.toList()); - - if (userIds.isEmpty()) { - return; - } - - // 批量查询用户信息 - List userList = aquUserMapper.selectBatchIds(userIds); - Map userMap = userList.stream() - .collect(Collectors.toMap(AquUser::getId, user -> user, (existing, replacement) -> existing)); - - // 为每个设备设置用户信息 - for (DeviceVo device : deviceList) { - if (device.getUserId() != null) { - AquUser user = userMap.get(device.getUserId()); - if (user != null) { - device.setUserName(user.getUserName()); - device.setMobilePhone(user.getMobilePhone()); - } - } - } - } - - /** - * 为设备列表批量填充塘口信息 - * - * @param deviceList 设备列表 - */ - private void enrichDeviceListWithPondInfo(List deviceList) { - if (deviceList == null || deviceList.isEmpty()) { - return; - } - - // 收集所有的塘口ID - List pondIds = deviceList.stream() - .map(DeviceVo::getPondId) - .filter(pondId -> pondId != null) - .distinct() - .collect(Collectors.toList()); - - if (pondIds.isEmpty()) { - return; - } - - // 批量查询塘口信息 - List pondList = pondMapper.selectBatchIds(pondIds); - Map pondMap = pondList.stream() - .collect(Collectors.toMap(Pond::getId, pond -> pond, (existing, replacement) -> existing)); - - // 为每个设备设置塘口信息 - for (DeviceVo device : deviceList) { - if (device.getPondId() != null) { - Pond pond = pondMap.get(device.getPondId()); - if (pond != null) { - device.setPondName(pond.getPondName()); - } - } - } - } - - /** - * 根据用户关键词查询符合条件的用户ID列表 - * - * @param userKeyword 用户搜索关键词（用户名或手机号） - * @return 符合条件的用户ID列表 - */ - private List getMatchingUserIds(String userKeyword) { - if (StringUtils.isBlank(userKeyword)) { - return Arrays.asList(); - } - - LambdaQueryWrapper userQuery = Wrappers.lambdaQuery(); - userQuery.like(AquUser::getUserName, userKeyword) - .or() - .like(AquUser::getMobilePhone, userKeyword); - - List matchingUsers = aquUserMapper.selectList(userQuery); - return matchingUsers.stream() - .map(AquUser::getId) - .collect(Collectors.toList()); - } - - /** - * 根据塘口关键词查询符合条件的塘口ID列表 - * - * @param pondKeyword 塘口搜索关键词（塘口名称） - * @return 符合条件的塘口ID列表 - */ - private List getMatchingPondIds(String pondKeyword) { - if (StringUtils.isBlank(pondKeyword)) { - return Arrays.asList(); - } - - LambdaQueryWrapper pondQuery = Wrappers.lambdaQuery(); - pondQuery.like(Pond::getPondName, pondKeyword); - - List matchingPonds = pondMapper.selectList(pondQuery); - return matchingPonds.stream() - .map(Pond::getId) - .collect(Collectors.toList()); - } /** * 计算设备列表的过期信息 diff --git a/ruoyi-modules/ruoyi-fishery/src/main/java/org/dromara/fishery/service/impl/PondServiceImpl.java b/ruoyi-modules/ruoyi-fishery/src/main/java/org/dromara/fishery/service/impl/PondServiceImpl.java index deaef5f..5df6e85 100644 --- a/ruoyi-modules/ruoyi-fishery/src/main/java/org/dromara/fishery/service/impl/PondServiceImpl.java +++ b/ruoyi-modules/ruoyi-fishery/src/main/java/org/dromara/fishery/service/impl/PondServiceImpl.java @@ -15,7 +15,6 @@ import org.dromara.fishery.domain.Fish; import org.dromara.fishery.domain.Pond; import org.dromara.fishery.domain.bo.PondBo; import org.dromara.fishery.domain.vo.PondVo; -import org.dromara.fishery.mapper.AquUserMapper; import org.dromara.fishery.mapper.FishMapper; import org.dromara.fishery.mapper.PondMapper; import org.dromara.fishery.service.IPondService; @@ -24,6 +23,7 @@ import org.springframework.stereotype.Service; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.github.yulichang.wrapper.MPJLambdaWrapper; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; @@ -43,8 +43,6 @@ public class PondServiceImpl implements IPondService { private final FishMapper fishMapper; - private final AquUserMapper aquUserMapper; - /** * 查询塘口管理 * @@ -57,7 +55,7 @@ public class PondServiceImpl implements IPondService { } /** - * 分页查询塘口管理列表 + * 分页查询塘口管理列表 - JOIN查询方案（避免N+1问题） * * @param bo 查询条件 * @param pageQuery 分页参数 @@ -65,44 +63,47 @@ public class PondServiceImpl implements IPondService { */ @Override public TableDataInfo queryPageList(PondBo bo, PageQuery pageQuery) { - LambdaQueryWrapper lqw = buildQueryWrapper(bo); - Page result = baseMapper.selectVoPage(pageQuery.build(), lqw); + MPJLambdaWrapper wrapper = buildQueryWrapper(bo); + Page result = baseMapper.selectJoinPage(pageQuery.build(), PondVo.class, wrapper); - // 填充鱼类名称信息 + // 填充鱼类名称信息（鱼类ID是数组，仍需后处理） enrichPondListWithFishNames(result.getRecords()); - // 填充用户信息 - enrichPondListWithUserInfo(result.getRecords()); - return TableDataInfo.build(result); } /** - * 查询符合条件的塘口管理列表 + * 查询符合条件的塘口管理列表 - JOIN查询方案（避免N+1问题） * * @param bo 查询条件 * @return 塘口管理列表 */ @Override public List queryList(PondBo bo) { - LambdaQueryWrapper lqw = buildQueryWrapper(bo); - List list = baseMapper.selectVoList(lqw); + MPJLambdaWrapper wrapper = buildQueryWrapper(bo); + List list = baseMapper.selectJoinList(PondVo.class, wrapper); - // 填充鱼类名称信息 + // 填充鱼类名称信息（鱼类ID是数组，仍需后处理） enrichPondListWithFishNames(list); - // 填充用户信息 - enrichPondListWithUserInfo(list); - return list; } - private LambdaQueryWrapper buildQueryWrapper(PondBo bo) { + private MPJLambdaWrapper buildQueryWrapper(PondBo bo) { Map params = bo.getParams(); - LambdaQueryWrapper lqw = Wrappers.lambdaQuery(); + MPJLambdaWrapper wrapper = new MPJLambdaWrapper<>(); + + // Select main table fields + wrapper.selectAll(Pond.class); + // Select joined table fields with Lambda mapping + wrapper.selectAs(AquUser::getUserName, PondVo::getUserName) + .selectAs(AquUser::getMobilePhone, PondVo::getMobilePhone); + + // Left join with user table + wrapper.leftJoin(AquUser.class, AquUser::getId, Pond::getUserId); // 基础条件查询 - lqw.eq(bo.getUserId() != null, Pond::getUserId, bo.getUserId()) + wrapper.eq(bo.getUserId() != null, Pond::getUserId, bo.getUserId()) .like(StringUtils.isNotBlank(bo.getPondName()), Pond::getPondName, bo.getPondName()) .like(StringUtils.isNotBlank(bo.getFishKindIds()), Pond::getFishKindIds, bo.getFishKindIds()) .eq(bo.getPlaceTime() != null, Pond::getPlaceTime, bo.getPlaceTime()) @@ -110,32 +111,28 @@ public class PondServiceImpl implements IPondService { // 处理额外的查询参数 if (params != null && !params.isEmpty()) { - handleExtraParams(lqw, params); + handleExtraParams(wrapper, params); } // 默认按创建时间升序排列 - lqw.orderByDesc(Pond::getCreateTime); + wrapper.orderByDesc(Pond::getCreateTime); - return lqw; + return wrapper; } /** * 处理额外的查询参数 * - * @param lqw 查询包装器 + * @param wrapper 查询包装器 * @param params 额外参数 */ - private void handleExtraParams(LambdaQueryWrapper lqw, Map params) { - // 处理用户搜索关键词 + private void handleExtraParams(MPJLambdaWrapper wrapper, Map params) { + // 处理用户搜索关键词 - 直接在SQL中进行JOIN查询 String userKeyword = (String) params.get("userKeyword"); if (StringUtils.isNotBlank(userKeyword)) { - List matchingUserIds = getMatchingUserIds(userKeyword); - if (matchingUserIds.isEmpty()) { - // 如果没有符合条件的用户，直接返回空结果 - lqw.eq(Pond::getId, -1); // 使用不存在的ID来返回空结果 - return; - } - lqw.in(Pond::getUserId, matchingUserIds); + wrapper.and(w -> w.like(AquUser::getUserName, userKeyword) + .or() + .like(AquUser::getMobilePhone, userKeyword)); } // 处理时间范围查询 @@ -152,7 +149,7 @@ public class PondServiceImpl implements IPondService { if (startDateTime.length() == 10) { // yyyy-MM-dd 格式 startDateTime += " 00:00:00"; } - lqw.ge(Pond::getCreateTime, startDateTime); + wrapper.ge(Pond::getCreateTime, startDateTime); } catch (Exception e) { log.warn("开始时间格式不正确: {}", startTime, e); } @@ -165,7 +162,7 @@ public class PondServiceImpl implements IPondService { if (endDateTime.length() == 10) { // yyyy-MM-dd 格式 endDateTime += " 23:59:59"; } - lqw.le(Pond::getCreateTime, endDateTime); + wrapper.le(Pond::getCreateTime, endDateTime); } catch (Exception e) { log.warn("结束时间格式不正确: {}", endTime, e); } @@ -294,63 +291,5 @@ public class PondServiceImpl implements IPondService { } } - /** - * 为塘口列表填充用户信息 - * - * @param pondList 塘口列表 - */ - private void enrichPondListWithUserInfo(List pondList) { - if (pondList == null || pondList.isEmpty()) { - return; - } - // 收集所有的用户ID - List userIds = pondList.stream() - .map(PondVo::getUserId) - .filter(userId -> userId != null) - .distinct() - .collect(Collectors.toList()); - - if (userIds.isEmpty()) { - return; - } - - // 批量查询用户信息 - List userList = aquUserMapper.selectBatchIds(userIds); - Map userMap = userList.stream() - .collect(Collectors.toMap(AquUser::getId, user -> user, (existing, replacement) -> existing)); - - // 为每个塘口设置用户信息 - for (PondVo pond : pondList) { - if (pond.getUserId() != null) { - AquUser user = userMap.get(pond.getUserId()); - if (user != null) { - pond.setUserName(user.getUserName()); - pond.setMobilePhone(user.getMobilePhone()); - } - } - } - } - - /** - * 根据用户关键词查询符合条件的用户ID列表 - * - * @param userKeyword 用户搜索关键词（用户名或手机号） - * @return 符合条件的用户ID列表 - */ - private List getMatchingUserIds(String userKeyword) { - if (StringUtils.isBlank(userKeyword)) { - return Arrays.asList(); - } - - LambdaQueryWrapper userQuery = Wrappers.lambdaQuery(); - userQuery.like(AquUser::getUserName, userKeyword) - .or() - .like(AquUser::getMobilePhone, userKeyword); - - List matchingUsers = aquUserMapper.selectList(userQuery); - return matchingUsers.stream() - .map(AquUser::getId) - .collect(Collectors.toList()); - } } diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysConfigServiceImpl.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysConfigServiceImpl.java index d96fa12..83ecd5c 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysConfigServiceImpl.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysConfigServiceImpl.java @@ -169,7 +169,7 @@ public class SysConfigServiceImpl implements ISysConfigService, ConfigService { */ @Override public void deleteConfigByIds(List configIds) { - List list = baseMapper.selectByIds(configIds); + List list = baseMapper.selectBatchIds(configIds); list.forEach(config -> { if (StringUtils.equals(SystemConstants.YES, config.getConfigType())) { throw new ServiceException("内置参数【{}】不能删除", config.getConfigKey()); diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysDictDataServiceImpl.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysDictDataServiceImpl.java index 018f043..cb82e49 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysDictDataServiceImpl.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysDictDataServiceImpl.java @@ -102,7 +102,7 @@ public class SysDictDataServiceImpl implements ISysDictDataService { */ @Override public void deleteDictDataByIds(List dictCodes) { - List list = baseMapper.selectByIds(dictCodes); + List list = baseMapper.selectBatchIds(dictCodes); baseMapper.deleteByIds(dictCodes); list.forEach(x -> CacheUtils.evict(CacheNames.SYS_DICT, x.getDictType())); } diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysDictTypeServiceImpl.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysDictTypeServiceImpl.java index 6d4d9fe..e72438e 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysDictTypeServiceImpl.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysDictTypeServiceImpl.java @@ -138,7 +138,7 @@ public class SysDictTypeServiceImpl implements ISysDictTypeService, DictService */ @Override public void deleteDictTypeByIds(List dictIds) { - List list = baseMapper.selectByIds(dictIds); + List list = baseMapper.selectBatchIds(dictIds); list.forEach(x -> { boolean assigned = dictDataMapper.exists(new LambdaQueryWrapper() .eq(SysDictData::getDictType, x.getDictType())); diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysOssServiceImpl.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysOssServiceImpl.java index 33341a9..7b5ba2a 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysOssServiceImpl.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysOssServiceImpl.java @@ -252,7 +252,7 @@ public class SysOssServiceImpl implements ISysOssService, OssService { if (isValid) { // 做一些业务上的校验,判断是否需要校验 } - List list = baseMapper.selectByIds(ids); + List list = baseMapper.selectBatchIds(ids); for (SysOss sysOss : list) { OssClient storage = OssFactory.instance(sysOss.getService()); storage.delete(sysOss.getUrl()); diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysPostServiceImpl.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysPostServiceImpl.java index 56a0c4b..d80437b 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysPostServiceImpl.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysPostServiceImpl.java @@ -222,7 +222,7 @@ public class SysPostServiceImpl implements ISysPostService, PostService { */ @Override public int deletePostByIds(List postIds) { - List list = baseMapper.selectByIds(postIds); + List list = baseMapper.selectBatchIds(postIds); for (SysPost post : list) { if (this.countUserPostById(post.getPostId()) > 0) { throw new ServiceException("{}已分配，不能删除!", post.getPostName()); diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysRoleServiceImpl.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysRoleServiceImpl.java index 53d270f..3136b1e 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysRoleServiceImpl.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysRoleServiceImpl.java @@ -428,7 +428,7 @@ public class SysRoleServiceImpl implements ISysRoleService, RoleService { @Transactional(rollbackFor = Exception.class) public int deleteRoleByIds(List roleIds) { this.checkRoleDataScope(roleIds); - List roles = baseMapper.selectByIds(roleIds); + List roles = baseMapper.selectBatchIds(roleIds); for (SysRole role : roles) { checkRoleAllowed(BeanUtil.toBean(role, SysRoleBo.class)); if (countUserRoleByRoleId(role.getRoleId()) > 0) { diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/FlwDefinitionServiceImpl.java b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/FlwDefinitionServiceImpl.java index b89a369..d57ddbe 100644 --- a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/FlwDefinitionServiceImpl.java +++ b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/FlwDefinitionServiceImpl.java @@ -184,7 +184,7 @@ public class FlwDefinitionServiceImpl implements IFlwDefinitionService { wrapper.in(FlowHisTask::getDefinitionId, ids); List flowHisTasks = flowHisTaskMapper.selectList(wrapper); if (CollUtil.isNotEmpty(flowHisTasks)) { - List flowDefinitions = flowDefinitionMapper.selectByIds(StreamUtils.toList(flowHisTasks, FlowHisTask::getDefinitionId)); + List flowDefinitions = flowDefinitionMapper.selectBatchIds(StreamUtils.toList(flowHisTasks, FlowHisTask::getDefinitionId)); if (CollUtil.isNotEmpty(flowDefinitions)) { String join = StreamUtils.join(flowDefinitions, FlowDefinition::getFlowCode); log.info("流程定义【{}】已被使用不可被删除！", join); diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/FlwInstanceServiceImpl.java b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/FlwInstanceServiceImpl.java index be6dfaf..d5737ee 100644 --- a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/FlwInstanceServiceImpl.java +++ b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/FlwInstanceServiceImpl.java @@ -171,7 +171,7 @@ public class FlwInstanceServiceImpl implements IFlwInstanceService { */ @Override public List selectInstListByIdList(List instanceIds) { - return flowInstanceMapper.selectByIds(instanceIds); + return flowInstanceMapper.selectBatchIds(instanceIds); } /**