From bf70c2c673597a1d89b607b3a21729e0fa65c8d3 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: Fri, 15 May 2026 14:18:35 +0800 Subject: [PATCH] =?UTF-8?q?[=E9=87=8D=E5=A4=A7=E6=9B=B4=E6=96=B0]=20?= =?UTF-8?q?=E5=A2=9E=E5=8A=A0mybatis-plus=E6=89=A9=E5=B1=95=E5=B7=A5?= =?UTF-8?q?=E5=85=B7=20=E5=A4=A7=E5=B9=85=E7=AE=80=E5=8C=96=E6=95=B4?= =?UTF-8?q?=E4=BD=93=E4=B8=9A=E5=8A=A1=E4=BB=A3=E7=A0=81=E5=86=99=E6=B3=95?= =?UTF-8?q?=20=E4=BC=98=E9=9B=85=E8=88=92=E9=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .codex/skills/ruoyi-plus-ai-coding/SKILL.md | 3 +- .../references/backend.md | 6 +- .../mybatis/core/mapper/BaseMapperPlus.java | 20 + .../core/mapper/LambdaCrudChainWrapper.java | 399 +++++++++++++++++ .../core/query/LambdaQueryBuilder.java | 422 ++++++++++++++++++ .../core/query/LambdaQueryCondition.java | 146 ++++++ .../mybatis/core/query/QueryBuilder.java | 19 + .../demo/controller/TestBatchController.java | 11 +- .../service/impl/TestDemoServiceImpl.java | 20 +- .../service/impl/TestTreeServiceImpl.java | 12 +- .../gen/service/GenTableServiceImpl.java | 14 +- .../resources/vm/java/serviceImpl.java.vm | 46 +- .../service/impl/SysMessageServiceImpl.java | 6 +- .../service/impl/SysOssConfigServiceImpl.java | 26 +- .../service/impl/SysOssServiceImpl.java | 14 +- .../dubbo/RemoteDataScopeServiceImpl.java | 9 +- .../system/dubbo/RemoteDeptServiceImpl.java | 15 +- .../system/dubbo/RemotePostServiceImpl.java | 10 +- .../system/dubbo/RemoteRoleServiceImpl.java | 10 +- .../system/dubbo/RemoteUserServiceImpl.java | 41 +- .../dromara/system/mapper/SysDeptMapper.java | 9 +- .../system/mapper/SysDictDataMapper.java | 9 +- .../dromara/system/mapper/SysMenuMapper.java | 7 +- .../dromara/system/mapper/SysPostMapper.java | 3 +- .../dromara/system/mapper/SysRoleMapper.java | 3 +- .../system/mapper/SysRoleMenuMapper.java | 3 +- .../dromara/system/mapper/SysUserMapper.java | 3 +- .../system/mapper/SysUserRoleMapper.java | 9 +- .../service/impl/SysClientServiceImpl.java | 20 +- .../service/impl/SysConfigServiceImpl.java | 24 +- .../service/impl/SysDeptServiceImpl.java | 44 +- .../service/impl/SysDictDataServiceImpl.java | 24 +- .../service/impl/SysDictTypeServiceImpl.java | 24 +- .../service/impl/SysLoginInfoServiceImpl.java | 12 +- .../service/impl/SysMenuServiceImpl.java | 38 +- .../service/impl/SysNoticeServiceImpl.java | 20 +- .../service/impl/SysOperLogServiceImpl.java | 14 +- .../service/impl/SysPostServiceImpl.java | 34 +- .../service/impl/SysRoleServiceImpl.java | 52 +-- .../service/impl/SysSocialServiceImpl.java | 16 +- .../service/impl/SysUserServiceImpl.java | 62 +-- .../workflow/mapper/FlwCategoryMapper.java | 7 +- .../mapper/FlwInstanceBizExtMapper.java | 16 +- .../service/impl/FlwCategoryServiceImpl.java | 32 +- .../impl/FlwDefinitionServiceImpl.java | 4 +- .../service/impl/FlwSpelServiceImpl.java | 18 +- .../service/impl/TestLeaveServiceImpl.java | 24 +- 47 files changed, 1393 insertions(+), 387 deletions(-) create mode 100644 ruoyi-common/ruoyi-common-mybatis/src/main/java/org/dromara/common/mybatis/core/mapper/LambdaCrudChainWrapper.java create mode 100644 ruoyi-common/ruoyi-common-mybatis/src/main/java/org/dromara/common/mybatis/core/query/LambdaQueryBuilder.java create mode 100644 ruoyi-common/ruoyi-common-mybatis/src/main/java/org/dromara/common/mybatis/core/query/LambdaQueryCondition.java create mode 100644 ruoyi-common/ruoyi-common-mybatis/src/main/java/org/dromara/common/mybatis/core/query/QueryBuilder.java diff --git a/.codex/skills/ruoyi-plus-ai-coding/SKILL.md b/.codex/skills/ruoyi-plus-ai-coding/SKILL.md index a1b25fdfb..cfcbab540 100644 --- a/.codex/skills/ruoyi-plus-ai-coding/SKILL.md +++ b/.codex/skills/ruoyi-plus-ai-coding/SKILL.md @@ -153,7 +153,8 @@ Vue 3、TypeScript API 文件、生成式列表页、表单状态、字典和日 - 包路径和 `@RequestMapping` 与模块保持一致。 - 权限标识遵循 `${module}:${business}:${action}`。 - Mapper 继承 `BaseMapperPlus`。 -- Service 使用 `baseMapper`，并按场景返回 `PageResult` 或 `List`。 +- 手写 Service 注入 Mapper 时使用具体业务短名；代码生成器模板按类名首字母小写命名，例如 `SysRoleMapper` 生成 `sysRoleMapper`。 +- Service 按场景返回 `PageResult` 或 `List`。 - 查询代码优先使用 `LambdaQueryWrapper`，复杂模块沿用既有 MPJ 联表风格。 - BO 使用 `@AutoMapper(target = Entity.class, reverseConvertGenerate = false)`。 - VO 使用 `@AutoMapper(target = Entity.class)`。 diff --git a/.codex/skills/ruoyi-plus-ai-coding/references/backend.md b/.codex/skills/ruoyi-plus-ai-coding/references/backend.md index fc2e2009f..cad981db2 100644 --- a/.codex/skills/ruoyi-plus-ai-coding/references/backend.md +++ b/.codex/skills/ruoyi-plus-ai-coding/references/backend.md @@ -156,13 +156,15 @@ ## Service 规则 - 类声明通常是 `@RequiredArgsConstructor`、`@Service`，按需补 `@Slf4j`。 -- mapper 注入字段命名为 `private final XxxMapper baseMapper;`。 +- 手写 mapper 注入字段使用具体业务短名；代码生成器模板按类名首字母小写命名。 +- 命名时去掉清晰的模块/系统前缀后使用 lowerCamel + `Mapper`，例如 `SysRoleMapper` -> `roleMapper`、`SysDictDataMapper` -> `dictDataMapper`。 +- 如果去掉前缀会产生歧义或命名冲突，保留必要前缀。 - 读操作通常返回 `Vo`、`List` 或 `PageResult`。 - BO 转实体用 `MapstructUtils.convert(bo, Entity.class)`。 - 查询条件优先用 `LambdaQueryWrapper` 和 `Wrappers.lambdaQuery()`。 - 在 wrapper 条件里直接写 `StringUtils.isNotBlank(...)` 和 null 判断。 - 分页查询优先采用： - `Page result = baseMapper.selectVoPage(pageQuery.build(), lqw);` + `Page result = entityMapper.selectVoPage(pageQuery.build(), lqw);` `return PageResult.build(result.getRecords(), result.getTotal());` - 生成器风格模块保留 `validEntityBeforeSave(...)` 这种扩展点。 - 多表写操作使用 `@Transactional(rollbackFor = Exception.class)`。 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 a5213fda4..827fb4685 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 @@ -7,7 +7,9 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.toolkit.reflect.GenericTypeUtils; +import com.baomidou.mybatisplus.extension.conditions.update.LambdaUpdateChainWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.baomidou.mybatisplus.extension.toolkit.ChainWrappers; import com.baomidou.mybatisplus.extension.toolkit.Db; import org.apache.ibatis.logging.Log; import org.apache.ibatis.logging.LogFactory; @@ -64,6 +66,24 @@ public interface BaseMapperPlus extends BaseMapper { return this.selectList(new QueryWrapper<>()); } + /** + * 创建当前 Mapper 绑定的 Lambda CRUD 链式操作。 + * + * @return Lambda CRUD 链式包装器 + */ + default LambdaCrudChainWrapper lambda() { + return new LambdaCrudChainWrapper<>(this); + } + + /** + * 创建当前 Mapper 绑定的 Lambda 链式更新。 + * + * @return Lambda 链式更新包装器 + */ + default LambdaUpdateChainWrapper lambdaUpdate() { + return ChainWrappers.lambdaUpdateChain(this); + } + /** * 批量插入实体对象集合 * diff --git a/ruoyi-common/ruoyi-common-mybatis/src/main/java/org/dromara/common/mybatis/core/mapper/LambdaCrudChainWrapper.java b/ruoyi-common/ruoyi-common-mybatis/src/main/java/org/dromara/common/mybatis/core/mapper/LambdaCrudChainWrapper.java new file mode 100644 index 000000000..91d47f49f --- /dev/null +++ b/ruoyi-common/ruoyi-common-mybatis/src/main/java/org/dromara/common/mybatis/core/mapper/LambdaCrudChainWrapper.java @@ -0,0 +1,399 @@ +package org.dromara.common.mybatis.core.mapper; + +import com.baomidou.mybatisplus.core.conditions.AbstractLambdaWrapper; +import com.baomidou.mybatisplus.core.conditions.SharedString; +import com.baomidou.mybatisplus.core.conditions.query.Query; +import com.baomidou.mybatisplus.core.conditions.segments.MergeSegments; +import com.baomidou.mybatisplus.core.conditions.update.Update; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.core.metadata.TableFieldInfo; +import com.baomidou.mybatisplus.core.metadata.TableInfoHelper; +import com.baomidou.mybatisplus.core.toolkit.Assert; +import com.baomidou.mybatisplus.core.toolkit.CollectionUtils; +import com.baomidou.mybatisplus.core.toolkit.Constants; +import com.baomidou.mybatisplus.core.toolkit.StringUtils; +import com.baomidou.mybatisplus.core.toolkit.support.SFunction; +import org.dromara.common.mybatis.core.query.LambdaQueryCondition; + +import java.math.BigDecimal; +import java.util.ArrayList; +import java.util.List; +import java.util.Map; +import java.util.Optional; +import java.util.concurrent.atomic.AtomicInteger; +import java.util.function.Function; +import java.util.function.Predicate; + +/** + * Mapper ? Lambda CRUD ?????? + * + * @param table ?? + * @param vo ?? + * @author Lion Li + */ +public class LambdaCrudChainWrapper extends AbstractLambdaWrapper> + implements Query, T, SFunction>, + Update, SFunction>, + LambdaQueryCondition> { + + private final BaseMapperPlus crudMapper; + private final List sqlSet; + private SharedString sqlSelect = new SharedString(); + + public LambdaCrudChainWrapper(BaseMapperPlus crudMapper) { + this.crudMapper = crudMapper; + super.setEntityClass(crudMapper.currentModelClass()); + super.initNeed(); + this.sqlSet = new ArrayList<>(); + } + + LambdaCrudChainWrapper(BaseMapperPlus crudMapper, T entity, Class entityClass, SharedString sqlSelect, + List sqlSet, AtomicInteger paramNameSeq, Map paramNameValuePairs, + MergeSegments mergeSegments, SharedString paramAlias, SharedString lastSql, + SharedString sqlComment, SharedString sqlFirst) { + this.crudMapper = crudMapper; + super.setEntity(entity); + super.setEntityClass(entityClass); + this.sqlSelect = sqlSelect == null ? new SharedString() : sqlSelect; + this.sqlSet = sqlSet == null ? new ArrayList<>() : sqlSet; + this.paramNameSeq = paramNameSeq; + this.paramNameValuePairs = paramNameValuePairs; + this.expression = mergeSegments; + this.paramAlias = paramAlias; + this.lastSql = lastSql; + this.sqlComment = sqlComment; + this.sqlFirst = sqlFirst; + } + + @Override + public LambdaCrudChainWrapper select(boolean condition, List> columns) { + if (condition && CollectionUtils.isNotEmpty(columns)) { + this.sqlSelect.setStringValue(columnsToString(false, columns)); + } + return typedThis; + } + + @SafeVarargs + public final LambdaCrudChainWrapper select(SFunction... columns) { + return select(true, CollectionUtils.toList(columns)); + } + + @SafeVarargs + public final LambdaCrudChainWrapper select(boolean condition, SFunction... columns) { + return select(condition, CollectionUtils.toList(columns)); + } + + @Override + public LambdaCrudChainWrapper select(Class entityClass, Predicate predicate) { + if (entityClass == null) { + entityClass = getEntityClass(); + } else { + setEntityClass(entityClass); + } + Assert.notNull(entityClass, "entityClass can not be null"); + this.sqlSelect.setStringValue(TableInfoHelper.getTableInfo(entityClass).chooseSelect(predicate)); + return typedThis; + } + + @Override + public String getSqlSelect() { + return sqlSelect.getStringValue(); + } + + @Override + public LambdaCrudChainWrapper set(boolean condition, SFunction column, Object val, String mapping) { + return maybeDo(condition, () -> { + String sql = formatParam(mapping, val); + sqlSet.add(columnToString(column) + Constants.EQUALS + sql); + }); + } + + /** + * ??? null ???????? + * + * @param column ?? + * @param value ? + * @return this + */ + public LambdaCrudChainWrapper setIfPresent(SFunction column, Object value) { + return set(value != null, column, value); + } + + /** + * ????????????? + * + * @param column ?? + * @param value ? + * @return this + */ + public LambdaCrudChainWrapper setIfText(SFunction column, String value) { + return set(org.dromara.common.core.utils.StringUtils.isNotBlank(value), column, value); + } + + @Override + public LambdaCrudChainWrapper setSql(boolean condition, String setSql, Object... params) { + return maybeDo(condition && StringUtils.isNotBlank(setSql), () -> sqlSet.add(formatSqlMaybeWithParam(setSql, params))); + } + + @Override + public LambdaCrudChainWrapper setIncrBy(boolean condition, SFunction column, Number val) { + return maybeDo(condition, () -> { + String realColumn = columnToString(column); + String realVal = val instanceof BigDecimal ? ((BigDecimal) val).toPlainString() : String.valueOf(val); + sqlSet.add(String.format("%s=%s + %s", realColumn, realColumn, realVal)); + }); + } + + @Override + public LambdaCrudChainWrapper setDecrBy(boolean condition, SFunction column, Number val) { + return maybeDo(condition, () -> { + String realColumn = columnToString(column); + String realVal = val instanceof BigDecimal ? ((BigDecimal) val).toPlainString() : String.valueOf(val); + sqlSet.add(String.format("%s=%s - %s", realColumn, realColumn, realVal)); + }); + } + + @Override + public String getSqlSet() { + if (CollectionUtils.isEmpty(sqlSet)) { + return null; + } + return String.join(Constants.COMMA, sqlSet); + } + + /** + * ?????? Wrapper? + * + * @return this + */ + public LambdaCrudChainWrapper getWrapper() { + return typedThis; + } + + public LambdaCrudChainWrapper findInSet(Object value, SFunction column) { + return findInSet(true, value, column); + } + + public LambdaCrudChainWrapper findInSet(boolean condition, Object value, SFunction column) { + return findInSet(condition, value, columnToString(column)); + } + + public LambdaCrudChainWrapper findInSetIfPresent(Object value, SFunction column) { + return findInSet(value != null, value, column); + } + + /** + * ???? Wrapper? + * + * @return this + */ + public LambdaCrudChainWrapper build() { + return typedThis; + } + + /** + * ??????? + * + * @return ???? + */ + public List list() { + return crudMapper.selectList(typedThis); + } + + /** + * ????????? + * + * @param page ???? + * @return ?????? + */ + public List list(IPage page) { + return crudMapper.selectList(page, typedThis); + } + + /** + * ?? VO ??? + * + * @return VO ?? + */ + public List voList() { + return crudMapper.selectVoList(typedThis); + } + + /** + * ????????? + * + * @return ?????? + */ + public List objs() { + return crudMapper.selectObjs(typedThis); + } + + /** + * ?????????????? + * + * @param mapper ???? + * @param ?????? + * @return ?????? + */ + public List objs(Function mapper) { + return crudMapper.selectObjs(typedThis, mapper); + } + + /** + * ??????? + * + * @return ?? + */ + public T one() { + return crudMapper.selectOne(typedThis); + } + + /** + * ??????? + * + * @param throwEx ??????????? + * @return ?? + */ + public T one(boolean throwEx) { + return crudMapper.selectOne(typedThis, throwEx); + } + + /** + * ?????? Optional? + * + * @return Optional ?? + */ + public Optional oneOpt() { + return Optional.ofNullable(one()); + } + + /** + * ???? VO? + * + * @return VO + */ + public V voOne() { + return crudMapper.selectVoOne(typedThis); + } + + /** + * ???? VO? + * + * @param throwEx ??????????? + * @return VO + */ + public V voOne(boolean throwEx) { + return crudMapper.selectVoOne(typedThis, throwEx); + } + + /** + * ????? + * + * @return ?? + */ + public Long count() { + return crudMapper.selectCount(typedThis); + } + + /** + * ??????? + * + * @return ???? + */ + public boolean exists() { + return crudMapper.exists(typedThis); + } + + /** + * ??????? + * + * @param page ???? + * @param

???? + * @return ???? + */ + public

> P page(P page) { + return crudMapper.selectPage(page, typedThis); + } + + /** + * ?? VO ??? + * + * @param page ???? + * @param

???? + * @return VO ?? + */ + public

> P voPage(IPage page) { + return crudMapper.selectVoPage(page, typedThis); + } + + /** + * ????? + * + * @return ?????? + */ + public boolean delete() { + return deleteCount() > 0; + } + + /** + * ????? + * + * @return ???? + */ + public int deleteCount() { + return crudMapper.delete(typedThis); + } + + /** + * ?? set ??????? + * + * @return ?????? + */ + public boolean update() { + return updateCount() > 0; + } + + /** + * ?????????????? + * + * @param entity ?? + * @return ?????? + */ + public boolean update(T entity) { + return updateCount(entity) > 0; + } + + /** + * ?? set ??????? + * + * @return ???? + */ + public int updateCount() { + return crudMapper.update(typedThis); + } + + /** + * ?????????????? + * + * @param entity ?? + * @return ???? + */ + public int updateCount(T entity) { + return crudMapper.update(entity, typedThis); + } + + @Override + protected LambdaCrudChainWrapper instance() { + return new LambdaCrudChainWrapper<>(crudMapper, getEntity(), getEntityClass(), null, null, paramNameSeq, + paramNameValuePairs, new MergeSegments(), paramAlias, SharedString.emptyString(), SharedString.emptyString(), + SharedString.emptyString()); + } + + @Override + public void clear() { + super.clear(); + sqlSelect.toNull(); + sqlSet.clear(); + } + +} diff --git a/ruoyi-common/ruoyi-common-mybatis/src/main/java/org/dromara/common/mybatis/core/query/LambdaQueryBuilder.java b/ruoyi-common/ruoyi-common-mybatis/src/main/java/org/dromara/common/mybatis/core/query/LambdaQueryBuilder.java new file mode 100644 index 000000000..9b4535ac8 --- /dev/null +++ b/ruoyi-common/ruoyi-common-mybatis/src/main/java/org/dromara/common/mybatis/core/query/LambdaQueryBuilder.java @@ -0,0 +1,422 @@ +package org.dromara.common.mybatis.core.query; + +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.toolkit.support.SFunction; + +import java.util.Arrays; +import java.util.Collection; +import java.util.Map; +import java.util.function.BiPredicate; +import java.util.function.Consumer; + +/** + * LambdaQueryWrapper ???????? + * + * @param ???? + * @author Lion Li + */ +public final class LambdaQueryBuilder implements LambdaQueryCondition> { + + private final LambdaQueryWrapper wrapper; + + LambdaQueryBuilder(LambdaQueryWrapper wrapper) { + this.wrapper = wrapper; + } + + @SafeVarargs + public final LambdaQueryBuilder select(SFunction... columns) { + wrapper.select(columns); + return this; + } + + public LambdaQueryBuilder eq(SFunction column, Object value) { + wrapper.eq(column, value); + return this; + } + + public LambdaQueryBuilder eq(boolean condition, SFunction column, Object value) { + wrapper.eq(condition, column, value); + return this; + } + + public LambdaQueryBuilder ne(SFunction column, Object value) { + wrapper.ne(column, value); + return this; + } + + public LambdaQueryBuilder ne(boolean condition, SFunction column, Object value) { + wrapper.ne(condition, column, value); + return this; + } + + public LambdaQueryBuilder gt(SFunction column, Object value) { + wrapper.gt(column, value); + return this; + } + + public LambdaQueryBuilder gt(boolean condition, SFunction column, Object value) { + wrapper.gt(condition, column, value); + return this; + } + + public LambdaQueryBuilder ge(SFunction column, Object value) { + wrapper.ge(column, value); + return this; + } + + public LambdaQueryBuilder ge(boolean condition, SFunction column, Object value) { + wrapper.ge(condition, column, value); + return this; + } + + public LambdaQueryBuilder lt(SFunction column, Object value) { + wrapper.lt(column, value); + return this; + } + + public LambdaQueryBuilder lt(boolean condition, SFunction column, Object value) { + wrapper.lt(condition, column, value); + return this; + } + + public LambdaQueryBuilder le(SFunction column, Object value) { + wrapper.le(column, value); + return this; + } + + public LambdaQueryBuilder le(boolean condition, SFunction column, Object value) { + wrapper.le(condition, column, value); + return this; + } + + public LambdaQueryBuilder like(SFunction column, Object value) { + wrapper.like(column, value); + return this; + } + + public LambdaQueryBuilder like(boolean condition, SFunction column, Object value) { + wrapper.like(condition, column, value); + return this; + } + + public LambdaQueryBuilder notLike(SFunction column, Object value) { + wrapper.notLike(column, value); + return this; + } + + public LambdaQueryBuilder notLike(boolean condition, SFunction column, Object value) { + wrapper.notLike(condition, column, value); + return this; + } + + public LambdaQueryBuilder likeLeft(SFunction column, Object value) { + wrapper.likeLeft(column, value); + return this; + } + + public LambdaQueryBuilder likeLeft(boolean condition, SFunction column, Object value) { + wrapper.likeLeft(condition, column, value); + return this; + } + + public LambdaQueryBuilder likeRight(SFunction column, Object value) { + wrapper.likeRight(column, value); + return this; + } + + public LambdaQueryBuilder likeRight(boolean condition, SFunction column, Object value) { + wrapper.likeRight(condition, column, value); + return this; + } + + public LambdaQueryBuilder between(SFunction column, Object begin, Object end) { + wrapper.between(column, begin, end); + return this; + } + + public LambdaQueryBuilder between(boolean condition, SFunction column, Object begin, Object end) { + wrapper.between(condition, column, begin, end); + return this; + } + + public LambdaQueryBuilder notBetween(SFunction column, Object begin, Object end) { + wrapper.notBetween(column, begin, end); + return this; + } + + public LambdaQueryBuilder notBetween(boolean condition, SFunction column, Object begin, Object end) { + wrapper.notBetween(condition, column, begin, end); + return this; + } + + public LambdaQueryBuilder allEq(Map params, boolean null2IsNull) { + wrapper.allEq(true, (Map) params, null2IsNull); + return this; + } + + public LambdaQueryBuilder allEq(boolean condition, Map params, boolean null2IsNull) { + wrapper.allEq(condition, (Map) params, null2IsNull); + return this; + } + + public LambdaQueryBuilder allEq(BiPredicate, Object> filter, Map params, boolean null2IsNull) { + wrapper.allEq(true, (BiPredicate) filter, (Map) params, null2IsNull); + return this; + } + + public LambdaQueryBuilder allEq(boolean condition, BiPredicate, Object> filter, Map params, boolean null2IsNull) { + wrapper.allEq(condition, (BiPredicate) filter, (Map) params, null2IsNull); + return this; + } + + public LambdaQueryBuilder isNull(SFunction column) { + wrapper.isNull(column); + return this; + } + + public LambdaQueryBuilder isNull(boolean condition, SFunction column) { + wrapper.isNull(condition, column); + return this; + } + + public LambdaQueryBuilder isNotNull(SFunction column) { + wrapper.isNotNull(column); + return this; + } + + public LambdaQueryBuilder isNotNull(boolean condition, SFunction column) { + wrapper.isNotNull(condition, column); + return this; + } + + public LambdaQueryBuilder in(SFunction column, Collection values) { + wrapper.in(column, values); + return this; + } + + public LambdaQueryBuilder in(boolean condition, SFunction column, Collection values) { + wrapper.in(condition, column, values); + return this; + } + + public LambdaQueryBuilder in(SFunction column, Object... values) { + wrapper.in(column, values); + return this; + } + + public LambdaQueryBuilder in(boolean condition, SFunction column, Object... values) { + wrapper.in(condition, column, values); + return this; + } + + public LambdaQueryBuilder notIn(SFunction column, Collection values) { + wrapper.notIn(column, values); + return this; + } + + public LambdaQueryBuilder notIn(boolean condition, SFunction column, Collection values) { + wrapper.notIn(condition, column, values); + return this; + } + + public LambdaQueryBuilder notIn(SFunction column, Object... values) { + wrapper.notIn(column, values); + return this; + } + + public LambdaQueryBuilder notIn(boolean condition, SFunction column, Object... values) { + wrapper.notIn(condition, column, values); + return this; + } + + @SafeVarargs + public final LambdaQueryBuilder groupBy(SFunction... columns) { + wrapper.groupBy(Arrays.asList(columns)); + return this; + } + + @SafeVarargs + public final LambdaQueryBuilder groupBy(boolean condition, SFunction... columns) { + wrapper.groupBy(condition, Arrays.asList(columns)); + return this; + } + + public LambdaQueryBuilder orderBy(boolean condition, boolean isAsc, SFunction column) { + wrapper.orderBy(condition, isAsc, column); + return this; + } + + @SafeVarargs + public final LambdaQueryBuilder orderByAsc(SFunction... columns) { + wrapper.orderByAsc(Arrays.asList(columns)); + return this; + } + + @SafeVarargs + public final LambdaQueryBuilder orderByAsc(boolean condition, SFunction... columns) { + wrapper.orderByAsc(condition, Arrays.asList(columns)); + return this; + } + + @SafeVarargs + public final LambdaQueryBuilder orderByDesc(SFunction... columns) { + wrapper.orderByDesc(Arrays.asList(columns)); + return this; + } + + @SafeVarargs + public final LambdaQueryBuilder orderByDesc(boolean condition, SFunction... columns) { + wrapper.orderByDesc(condition, Arrays.asList(columns)); + return this; + } + + public LambdaQueryBuilder having(String sqlHaving, Object... params) { + wrapper.having(sqlHaving, params); + return this; + } + + public LambdaQueryBuilder having(boolean condition, String sqlHaving, Object... params) { + wrapper.having(condition, sqlHaving, params); + return this; + } + + public LambdaQueryBuilder and(Consumer> consumer) { + wrapper.and(consumer); + return this; + } + + public LambdaQueryBuilder and(boolean condition, Consumer> consumer) { + wrapper.and(condition, consumer); + return this; + } + + public LambdaQueryBuilder or() { + wrapper.or(); + return this; + } + + public LambdaQueryBuilder or(Consumer> consumer) { + wrapper.or(consumer); + return this; + } + + public LambdaQueryBuilder or(boolean condition, Consumer> consumer) { + wrapper.or(condition, consumer); + return this; + } + + public LambdaQueryBuilder nested(Consumer> consumer) { + wrapper.nested(consumer); + return this; + } + + public LambdaQueryBuilder nested(boolean condition, Consumer> consumer) { + wrapper.nested(condition, consumer); + return this; + } + + public LambdaQueryBuilder exists(String existsSql, Object... values) { + wrapper.exists(existsSql, values); + return this; + } + + public LambdaQueryBuilder exists(boolean condition, String existsSql, Object... values) { + wrapper.exists(condition, existsSql, values); + return this; + } + + public LambdaQueryBuilder eqSql(SFunction column, String inValue) { + wrapper.eqSql(true, column, inValue); + return this; + } + + public LambdaQueryBuilder eqSql(boolean condition, SFunction column, String inValue) { + wrapper.eqSql(condition, column, inValue); + return this; + } + + public LambdaQueryBuilder inSql(SFunction column, String inValue) { + wrapper.inSql(true, column, inValue); + return this; + } + + public LambdaQueryBuilder inSql(boolean condition, SFunction column, String inValue) { + wrapper.inSql(condition, column, inValue); + return this; + } + + public LambdaQueryBuilder notInSql(SFunction column, String inValue) { + wrapper.notInSql(true, column, inValue); + return this; + } + + public LambdaQueryBuilder notInSql(boolean condition, SFunction column, String inValue) { + wrapper.notInSql(condition, column, inValue); + return this; + } + + public LambdaQueryBuilder notExists(String existsSql, Object... values) { + wrapper.notExists(existsSql, values); + return this; + } + + public LambdaQueryBuilder notExists(boolean condition, String existsSql, Object... values) { + wrapper.notExists(condition, existsSql, values); + return this; + } + + public LambdaQueryBuilder apply(String applySql, Object... values) { + wrapper.apply(applySql, values); + return this; + } + + public LambdaQueryBuilder apply(boolean condition, String applySql, Object... values) { + wrapper.apply(condition, applySql, values); + return this; + } + + public LambdaQueryBuilder apply(Consumer> consumer) { + consumer.accept(wrapper); + return this; + } + + public LambdaQueryBuilder func(Consumer> consumer) { + wrapper.func(true, consumer); + return this; + } + + public LambdaQueryBuilder func(boolean condition, Consumer> consumer) { + wrapper.func(condition, consumer); + return this; + } + + public LambdaQueryBuilder not(Consumer> consumer) { + wrapper.not(true, consumer); + return this; + } + + public LambdaQueryBuilder not(boolean condition, Consumer> consumer) { + wrapper.not(condition, consumer); + return this; + } + + public LambdaQueryBuilder comment(String comment) { + wrapper.comment(true, comment); + return this; + } + + public LambdaQueryBuilder comment(boolean condition, String comment) { + wrapper.comment(condition, comment); + return this; + } + + public LambdaQueryBuilder last(String lastSql) { + wrapper.last(lastSql); + return this; + } + + public LambdaQueryWrapper build() { + return wrapper; + } + +} diff --git a/ruoyi-common/ruoyi-common-mybatis/src/main/java/org/dromara/common/mybatis/core/query/LambdaQueryCondition.java b/ruoyi-common/ruoyi-common-mybatis/src/main/java/org/dromara/common/mybatis/core/query/LambdaQueryCondition.java new file mode 100644 index 000000000..748460d3a --- /dev/null +++ b/ruoyi-common/ruoyi-common-mybatis/src/main/java/org/dromara/common/mybatis/core/query/LambdaQueryCondition.java @@ -0,0 +1,146 @@ +package org.dromara.common.mybatis.core.query; + +import com.baomidou.mybatisplus.core.toolkit.support.SFunction; +import org.dromara.common.core.utils.StringUtils; +import org.dromara.common.mybatis.helper.DataBaseHelper; + +import java.util.Collection; +import java.util.Map; + +/** + * Lambda ????????? + * + * @param ???? + * @param ?????? + * @author Lion Li + */ +public interface LambdaQueryCondition { + + Children eq(boolean condition, SFunction column, Object value); + + Children ne(boolean condition, SFunction column, Object value); + + Children gt(boolean condition, SFunction column, Object value); + + Children ge(boolean condition, SFunction column, Object value); + + Children lt(boolean condition, SFunction column, Object value); + + Children le(boolean condition, SFunction column, Object value); + + Children like(boolean condition, SFunction column, Object value); + + Children notLike(boolean condition, SFunction column, Object value); + + Children likeLeft(boolean condition, SFunction column, Object value); + + Children likeRight(boolean condition, SFunction column, Object value); + + Children between(boolean condition, SFunction column, Object begin, Object end); + + Children notBetween(boolean condition, SFunction column, Object begin, Object end); + + Children in(boolean condition, SFunction column, Collection values); + + Children in(boolean condition, SFunction column, Object... values); + + Children notIn(boolean condition, SFunction column, Collection values); + + Children notIn(boolean condition, SFunction column, Object... values); + + Children apply(boolean condition, String applySql, Object... values); + + default Children eqIfPresent(SFunction column, Object value) { + return eq(value != null, column, value); + } + + default Children eqIfText(SFunction column, String value) { + return eq(StringUtils.isNotBlank(value), column, value); + } + + default Children neIfPresent(SFunction column, Object value) { + return ne(value != null, column, value); + } + + default Children neIfText(SFunction column, String value) { + return ne(StringUtils.isNotBlank(value), column, value); + } + + default Children gtIfPresent(SFunction column, Object value) { + return gt(value != null, column, value); + } + + default Children geIfPresent(SFunction column, Object value) { + return ge(value != null, column, value); + } + + default Children ltIfPresent(SFunction column, Object value) { + return lt(value != null, column, value); + } + + default Children leIfPresent(SFunction column, Object value) { + return le(value != null, column, value); + } + + default Children likeIfText(SFunction column, String value) { + return like(StringUtils.isNotBlank(value), column, value); + } + + default Children notLikeIfText(SFunction column, String value) { + return notLike(StringUtils.isNotBlank(value), column, value); + } + + default Children likeLeftIfText(SFunction column, String value) { + return likeLeft(StringUtils.isNotBlank(value), column, value); + } + + default Children likeRightIfText(SFunction column, String value) { + return likeRight(StringUtils.isNotBlank(value), column, value); + } + + default Children betweenIfPresent(SFunction column, Object begin, Object end) { + return between(begin != null && end != null, column, begin, end); + } + + default Children betweenParams(SFunction column, Map params, String beginKey, String endKey) { + if (params == null) { + return between(false, column, null, null); + } + Object begin = params.get(beginKey); + Object end = params.get(endKey); + return between(begin != null && end != null, column, begin, end); + } + + default Children notBetweenIfPresent(SFunction column, Object begin, Object end) { + return notBetween(begin != null && end != null, column, begin, end); + } + + default Children inIfNotEmpty(SFunction column, Collection values) { + return in(values != null && !values.isEmpty(), column, values); + } + + default Children inIfNotEmpty(SFunction column, Object... values) { + return in(values != null && values.length > 0, column, values); + } + + default Children notInIfNotEmpty(SFunction column, Collection values) { + return notIn(values != null && !values.isEmpty(), column, values); + } + + default Children notInIfNotEmpty(SFunction column, Object... values) { + return notIn(values != null && values.length > 0, column, values); + } + + default Children findInSet(Object value, String column) { + return findInSet(true, value, column); + } + + default Children findInSet(boolean condition, Object value, String column) { + return apply(condition, DataBaseHelper.findInSet(value, column)); + } + + default Children findInSetIfPresent(Object value, String column) { + return findInSet(value != null, value, column); + } + +} diff --git a/ruoyi-common/ruoyi-common-mybatis/src/main/java/org/dromara/common/mybatis/core/query/QueryBuilder.java b/ruoyi-common/ruoyi-common-mybatis/src/main/java/org/dromara/common/mybatis/core/query/QueryBuilder.java new file mode 100644 index 000000000..38bfe1a4f --- /dev/null +++ b/ruoyi-common/ruoyi-common-mybatis/src/main/java/org/dromara/common/mybatis/core/query/QueryBuilder.java @@ -0,0 +1,19 @@ +package org.dromara.common.mybatis.core.query; + +import com.baomidou.mybatisplus.core.toolkit.Wrappers; + +/** + * MyBatis-Plus ???????? + * + * @author Lion Li + */ +public final class QueryBuilder { + + private QueryBuilder() { + } + + public static LambdaQueryBuilder lambda(Class entityClass) { + return new LambdaQueryBuilder<>(Wrappers.lambdaQuery(entityClass)); + } + +} diff --git a/ruoyi-example/ruoyi-demo/src/main/java/org/dromara/demo/controller/TestBatchController.java b/ruoyi-example/ruoyi-demo/src/main/java/org/dromara/demo/controller/TestBatchController.java index 2c49b4d1d..260730524 100644 --- a/ruoyi-example/ruoyi-demo/src/main/java/org/dromara/demo/controller/TestBatchController.java +++ b/ruoyi-example/ruoyi-demo/src/main/java/org/dromara/demo/controller/TestBatchController.java @@ -1,11 +1,10 @@ package org.dromara.demo.controller; -import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import org.dromara.common.core.domain.R; import org.dromara.common.web.core.BaseController; import org.dromara.demo.domain.TestDemo; -import org.dromara.demo.mapper.TestDemoMapper; import lombok.RequiredArgsConstructor; +import org.dromara.demo.mapper.TestDemoMapper; import org.springframework.web.bind.annotation.DeleteMapping; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestMapping; @@ -63,7 +62,8 @@ public class TestBatchController extends BaseController { testDemo.setOrderNum(-1); testDemo.setTestKey("批量新增"); testDemo.setValue("测试新增"); - list.add(testDemo); } + list.add(testDemo); + } testDemoMapper.insertBatch(list); for (int i = 0; i < list.size(); i++) { TestDemo testDemo = list.get(i); @@ -82,8 +82,9 @@ public class TestBatchController extends BaseController { @DeleteMapping() // @DS("slave") public R remove() { - return toAjax(testDemoMapper.delete(new LambdaQueryWrapper() - .eq(TestDemo::getOrderNum, -1L))); + return toAjax(testDemoMapper.lambda() + .eq(TestDemo::getOrderNum, -1L) + .deleteCount()); } } diff --git a/ruoyi-example/ruoyi-demo/src/main/java/org/dromara/demo/service/impl/TestDemoServiceImpl.java b/ruoyi-example/ruoyi-demo/src/main/java/org/dromara/demo/service/impl/TestDemoServiceImpl.java index 3b668f7e0..5620f583b 100644 --- a/ruoyi-example/ruoyi-demo/src/main/java/org/dromara/demo/service/impl/TestDemoServiceImpl.java +++ b/ruoyi-example/ruoyi-demo/src/main/java/org/dromara/demo/service/impl/TestDemoServiceImpl.java @@ -30,17 +30,17 @@ import java.util.Map; @Service public class TestDemoServiceImpl implements ITestDemoService { - private final TestDemoMapper baseMapper; + private final TestDemoMapper demoMapper; @Override public TestDemoVo queryById(Long id) { - return baseMapper.selectVoById(id); + return demoMapper.selectVoById(id); } @Override public PageResult queryPageList(TestDemoBo bo, PageQuery pageQuery) { LambdaQueryWrapper lqw = buildQueryWrapper(bo); - Page result = baseMapper.selectVoPage(pageQuery.build(), lqw); + Page result = demoMapper.selectVoPage(pageQuery.build(), lqw); return PageResult.build(result.getRecords(), result.getTotal()); } @@ -50,13 +50,13 @@ public class TestDemoServiceImpl implements ITestDemoService { @Override public PageResult customPageList(TestDemoBo bo, PageQuery pageQuery) { LambdaQueryWrapper lqw = buildQueryWrapper(bo); - Page result = baseMapper.customPageList(pageQuery.build(), lqw); + Page result = demoMapper.customPageList(pageQuery.build(), lqw); return PageResult.build(result.getRecords(), result.getTotal()); } @Override public List queryList(TestDemoBo bo) { - return baseMapper.selectVoList(buildQueryWrapper(bo)); + return demoMapper.selectVoList(buildQueryWrapper(bo)); } private LambdaQueryWrapper buildQueryWrapper(TestDemoBo bo) { @@ -76,7 +76,7 @@ public class TestDemoServiceImpl implements ITestDemoService { public Boolean insertByBo(TestDemoBo bo) { TestDemo add = BeanUtil.toBean(bo, TestDemo.class); validEntityBeforeSave(add); - boolean flag = baseMapper.insert(add) > 0; + boolean flag = demoMapper.insert(add) > 0; if (flag) { bo.setId(add.getId()); } @@ -87,7 +87,7 @@ public class TestDemoServiceImpl implements ITestDemoService { public Boolean updateByBo(TestDemoBo bo) { TestDemo update = BeanUtil.toBean(bo, TestDemo.class); validEntityBeforeSave(update); - return baseMapper.updateById(update) > 0; + return demoMapper.updateById(update) > 0; } /** @@ -103,16 +103,16 @@ public class TestDemoServiceImpl implements ITestDemoService { public Boolean deleteWithValidByIds(Collection ids, Boolean isValid) { if (isValid) { // 做一些业务上的校验,判断是否需要校验 - List list = baseMapper.selectByIds(ids); + List list = demoMapper.selectByIds(ids); if (list.size() != ids.size()) { throw new ServiceException("您没有删除权限!"); } } - return baseMapper.deleteByIds(ids) > 0; + return demoMapper.deleteByIds(ids) > 0; } @Override public Boolean saveBatch(List list) { - return baseMapper.insertBatch(list); + return demoMapper.insertBatch(list); } } diff --git a/ruoyi-example/ruoyi-demo/src/main/java/org/dromara/demo/service/impl/TestTreeServiceImpl.java b/ruoyi-example/ruoyi-demo/src/main/java/org/dromara/demo/service/impl/TestTreeServiceImpl.java index edf6db864..6db64f2e6 100644 --- a/ruoyi-example/ruoyi-demo/src/main/java/org/dromara/demo/service/impl/TestTreeServiceImpl.java +++ b/ruoyi-example/ruoyi-demo/src/main/java/org/dromara/demo/service/impl/TestTreeServiceImpl.java @@ -27,18 +27,18 @@ import java.util.Map; @Service public class TestTreeServiceImpl implements ITestTreeService { - private final TestTreeMapper baseMapper; + private final TestTreeMapper treeMapper; @Override public TestTreeVo queryById(Long id) { - return baseMapper.selectVoById(id); + return treeMapper.selectVoById(id); } // @DS("slave") // 切换从库查询 @Override public List queryList(TestTreeBo bo) { LambdaQueryWrapper lqw = buildQueryWrapper(bo); - return baseMapper.selectVoList(lqw); + return treeMapper.selectVoList(lqw); } private LambdaQueryWrapper buildQueryWrapper(TestTreeBo bo) { @@ -57,7 +57,7 @@ public class TestTreeServiceImpl implements ITestTreeService { public Boolean insertByBo(TestTreeBo bo) { TestTree add = BeanUtil.toBean(bo, TestTree.class); validEntityBeforeSave(add); - boolean flag = baseMapper.insert(add) > 0; + boolean flag = treeMapper.insert(add) > 0; if (flag) { bo.setId(add.getId()); } @@ -68,7 +68,7 @@ public class TestTreeServiceImpl implements ITestTreeService { public Boolean updateByBo(TestTreeBo bo) { TestTree update = BeanUtil.toBean(bo, TestTree.class); validEntityBeforeSave(update); - return baseMapper.updateById(update) > 0; + return treeMapper.updateById(update) > 0; } /** @@ -85,6 +85,6 @@ public class TestTreeServiceImpl implements ITestTreeService { if (isValid) { //TODO 做一些业务上的校验,判断是否需要校验 } - return baseMapper.deleteByIds(ids) > 0; + return treeMapper.deleteByIds(ids) > 0; } } diff --git a/ruoyi-modules/ruoyi-gen/src/main/java/org/dromara/gen/service/GenTableServiceImpl.java b/ruoyi-modules/ruoyi-gen/src/main/java/org/dromara/gen/service/GenTableServiceImpl.java index 7510aeac9..ebce0011f 100644 --- a/ruoyi-modules/ruoyi-gen/src/main/java/org/dromara/gen/service/GenTableServiceImpl.java +++ b/ruoyi-modules/ruoyi-gen/src/main/java/org/dromara/gen/service/GenTableServiceImpl.java @@ -55,7 +55,7 @@ import java.util.zip.ZipOutputStream; @Service public class GenTableServiceImpl implements IGenTableService { - private final GenTableMapper baseMapper; + private final GenTableMapper genTableMapper; private final GenTableColumnMapper genTableColumnMapper; private static final String[] TABLE_IGNORE = new String[]{"sj_", "flow_", "gen_"}; @@ -95,7 +95,7 @@ public class GenTableServiceImpl implements IGenTableService { */ @Override public PageResult selectPageGenTableList(GenTable genTable, PageQuery pageQuery) { - Page page = baseMapper.selectPage(pageQuery.build(), this.buildGenTableQueryWrapper(genTable)); + Page page = genTableMapper.selectPage(pageQuery.build(), this.buildGenTableQueryWrapper(genTable)); return PageResult.build(page.getRecords(), page.getTotal()); } @@ -136,7 +136,7 @@ public class GenTableServiceImpl implements IGenTableService { if (CollUtil.isEmpty(tablesMap)) { return PageResult.build(); } - List tableNames = baseMapper.selectTableNameList(genTable.getDataName()); + List tableNames = genTableMapper.selectTableNameList(genTable.getDataName()); String[] tableArrays; if (CollUtil.isNotEmpty(tableNames)) { tableArrays = tableNames.toArray(new String[0]); @@ -232,7 +232,7 @@ public class GenTableServiceImpl implements IGenTableService { normalizeColumnOptions(genTable.getColumns()); String options = JsonUtils.toJsonString(genTable.getParams()); genTable.setOptions(options); - int row = baseMapper.updateById(genTable); + int row = genTableMapper.updateById(genTable); if (row > 0) { genTableColumnMapper.updateBatchById(genTable.getColumns()); } @@ -247,7 +247,7 @@ public class GenTableServiceImpl implements IGenTableService { @Override public void deleteGenTableByIds(Long[] tableIds) { List ids = Arrays.asList(tableIds); - baseMapper.deleteByIds(ids); + genTableMapper.deleteByIds(ids); genTableColumnMapper.delete(new LambdaQueryWrapper().in(GenTableColumn::getTableId, ids)); } @@ -265,7 +265,7 @@ public class GenTableServiceImpl implements IGenTableService { String tableName = table.getTableName(); GenUtils.initTable(table); table.setDataName(dataName); - int row = baseMapper.insert(table); + int row = genTableMapper.insert(table); if (row > 0) { // 保存列信息 List genTableColumns = SpringUtils.getAopProxy(this).selectDbTableColumnsByName(tableName, dataName); @@ -534,7 +534,7 @@ public class GenTableServiceImpl implements IGenTableService { * @return 包含字段集合的业务表实体 */ private GenTable getGenTable(Long tableId) { - GenTable table = baseMapper.selectById(tableId); + GenTable table = genTableMapper.selectById(tableId); if (ObjectUtil.isNull(table)) { throw new ServiceException("业务表不存在"); } diff --git a/ruoyi-modules/ruoyi-gen/src/main/resources/vm/java/serviceImpl.java.vm b/ruoyi-modules/ruoyi-gen/src/main/resources/vm/java/serviceImpl.java.vm index ce5a6dff3..4cfae9f58 100644 --- a/ruoyi-modules/ruoyi-gen/src/main/resources/vm/java/serviceImpl.java.vm +++ b/ruoyi-modules/ruoyi-gen/src/main/resources/vm/java/serviceImpl.java.vm @@ -8,11 +8,11 @@ import org.dromara.common.core.domain.PageResult; import org.dromara.common.mybatis.core.page.PageQuery; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; #end -#if($enableStatus || $enableSort) -import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; -#end import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +#if($enableUnique) import com.baomidou.mybatisplus.core.toolkit.Wrappers; +#end +import org.dromara.common.mybatis.core.query.QueryBuilder; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; @@ -41,7 +41,7 @@ import java.util.Collection; @Service public class ${ClassName}ServiceImpl implements I${ClassName}Service { - private final ${ClassName}Mapper baseMapper; + private final ${ClassName}Mapper ${className}Mapper; #set($TreeParentCap = "") #if("" != $treeParentCode) @@ -64,7 +64,7 @@ public class ${ClassName}ServiceImpl implements I${ClassName}Service { */ @Override public ${ClassName}Vo queryById(${pkColumn.javaType} ${pkColumn.javaField}) { - return baseMapper.selectVoById(${pkColumn.javaField}); + return ${className}Mapper.selectVoById(${pkColumn.javaField}); } #if($table.crud) @@ -78,7 +78,7 @@ public class ${ClassName}ServiceImpl implements I${ClassName}Service { @Override public PageResult<${ClassName}Vo> queryPageList(${ClassName}Bo bo, PageQuery pageQuery) { LambdaQueryWrapper<${ClassName}> lqw = buildQueryWrapper(bo); - Page<${ClassName}Vo> result = baseMapper.selectVoPage(pageQuery.build(), lqw); + Page<${ClassName}Vo> result = ${className}Mapper.selectVoPage(pageQuery.build(), lqw); return PageResult.build(result.getRecords(), result.getTotal()); } #end @@ -92,7 +92,7 @@ public class ${ClassName}ServiceImpl implements I${ClassName}Service { @Override public List<${ClassName}Vo> queryList(${ClassName}Bo bo) { LambdaQueryWrapper<${ClassName}> lqw = buildQueryWrapper(bo); - return baseMapper.selectVoList(lqw); + return ${className}Mapper.selectVoList(lqw); } #if($enableUnique) @@ -120,7 +120,7 @@ public class ${ClassName}ServiceImpl implements I${ClassName}Service { lqw.eq(${ClassName}::get${column.capJavaField}, bo.get${column.capJavaField}()); #end lqw.ne(bo.get${pkColumn.capJavaField}() != null, ${ClassName}::get${pkColumn.capJavaField}, bo.get${pkColumn.capJavaField}()); - return !baseMapper.exists(lqw); + return !${className}Mapper.exists(lqw); } #end @@ -182,7 +182,7 @@ public class ${ClassName}ServiceImpl implements I${ClassName}Service { fillTreeMetaBeforeSave(add, false); #end validEntityBeforeSave(add); - boolean flag = baseMapper.insert(add) > 0; + boolean flag = ${className}Mapper.insert(add) > 0; if (flag) { bo.set${pkColumn.capJavaField}(add.get${pkColumn.capJavaField}()); } @@ -202,7 +202,7 @@ public class ${ClassName}ServiceImpl implements I${ClassName}Service { fillTreeMetaBeforeSave(update, true); #end validEntityBeforeSave(update); - return baseMapper.updateById(update) > 0; + return ${className}Mapper.updateById(update) > 0; } #if($enableStatus) @@ -215,9 +215,10 @@ public class ${ClassName}ServiceImpl implements I${ClassName}Service { */ @Override public Boolean updateStatus(${pkColumn.javaType} ${pkColumn.javaField}, ${statusColumn.javaType} status) { - return baseMapper.update(null, new LambdaUpdateWrapper<${ClassName}>() + return ${className}Mapper.lambda() .set(${ClassName}::get${statusColumn.capJavaField}, status) - .eq(${ClassName}::get${pkColumn.capJavaField}, ${pkColumn.javaField})) > 0; + .eq(${ClassName}::get${pkColumn.capJavaField}, ${pkColumn.javaField}) + .update(); } #end @@ -231,9 +232,10 @@ public class ${ClassName}ServiceImpl implements I${ClassName}Service { */ @Override public Boolean updateSort(${pkColumn.javaType} ${pkColumn.javaField}, ${sortColumn.javaType} sortValue) { - return baseMapper.update(null, new LambdaUpdateWrapper<${ClassName}>() + return ${className}Mapper.lambda() .set(${ClassName}::get${sortColumn.capJavaField}, sortValue) - .eq(${ClassName}::get${pkColumn.capJavaField}, ${pkColumn.javaField})) > 0; + .eq(${ClassName}::get${pkColumn.capJavaField}, ${pkColumn.javaField}) + .update(); } #end @@ -256,7 +258,7 @@ public class ${ClassName}ServiceImpl implements I${ClassName}Service { #if("" != $treeAncestorsField) ${ClassName} parent = null; if (!ObjectUtil.equal(entity.get${TreeParentCap}(), ${treeRootValueJavaLiteral})) { - parent = baseMapper.selectById(entity.get${TreeParentCap}()); + parent = ${className}Mapper.selectById(entity.get${TreeParentCap}()); if (ObjectUtil.isNull(parent)) { throw new ServiceException("${functionName}父节点不存在"); } @@ -267,7 +269,7 @@ public class ${ClassName}ServiceImpl implements I${ClassName}Service { } String newAncestors = resolveAncestors(entity.get${TreeParentCap}(), parent); if (updateMode && entity.get${pkColumn.capJavaField}() != null) { - ${ClassName} oldEntity = baseMapper.selectById(entity.get${pkColumn.capJavaField}()); + ${ClassName} oldEntity = ${className}Mapper.selectById(entity.get${pkColumn.capJavaField}()); if (ObjectUtil.isNull(oldEntity)) { throw new ServiceException("${functionName}不存在，无法修改"); } @@ -296,12 +298,14 @@ public class ${ClassName}ServiceImpl implements I${ClassName}Service { } private void updateChildrenAncestors(${pkColumn.javaType} currentId, String newAncestors, String oldAncestors) { - List<${ClassName}> children = baseMapper.selectList(new LambdaQueryWrapper<${ClassName}>() - .select(${ClassName}::get${pkColumn.capJavaField}, ${ClassName}::get${TreeAncestorsCap}())); + List<${ClassName}> children = ${className}Mapper.lambda() + .select(${ClassName}::get${pkColumn.capJavaField}, ${ClassName}::get${TreeAncestorsCap}) + .findInSet(currentId, ${ClassName}::get${TreeAncestorsCap}) + .list(); List<${ClassName}> updateList = new ArrayList<>(); for (${ClassName} child : children) { String ancestors = child.get${TreeAncestorsCap}(); - if (StringUtils.isBlank(ancestors) || !containsAncestor(ancestors, currentId)) { + if (StringUtils.isBlank(ancestors)) { continue; } ${ClassName} update = new ${ClassName}(); @@ -310,7 +314,7 @@ public class ${ClassName}ServiceImpl implements I${ClassName}Service { updateList.add(update); } if (!updateList.isEmpty()) { - baseMapper.updateBatchById(updateList); + ${className}Mapper.updateBatchById(updateList); } } @@ -337,6 +341,6 @@ public class ${ClassName}ServiceImpl implements I${ClassName}Service { if (isValid) { // 可在此扩展删除前业务校验 } - return baseMapper.deleteByIds(ids) > 0; + return ${className}Mapper.deleteByIds(ids) > 0; } } diff --git a/ruoyi-modules/ruoyi-resource/src/main/java/org/dromara/resource/service/impl/SysMessageServiceImpl.java b/ruoyi-modules/ruoyi-resource/src/main/java/org/dromara/resource/service/impl/SysMessageServiceImpl.java index 599754184..89f3a132c 100644 --- a/ruoyi-modules/ruoyi-resource/src/main/java/org/dromara/resource/service/impl/SysMessageServiceImpl.java +++ b/ruoyi-modules/ruoyi-resource/src/main/java/org/dromara/resource/service/impl/SysMessageServiceImpl.java @@ -63,7 +63,7 @@ public class SysMessageServiceImpl implements ISysMessageService { */ private static final long BOX_DAYS = 30L; - private final SysMessageMapper baseMapper; + private final SysMessageMapper messageMapper; /** * 查询当前用户消息盒子数据 @@ -117,7 +117,7 @@ public class SysMessageServiceImpl implements ISysMessageService { return payload; } SysMessage message = buildMessage(userIds, payload); - baseMapper.insert(message); + messageMapper.insert(message); payload.setMessageId(message.getMessageId()); return payload; } @@ -138,7 +138,7 @@ public class SysMessageServiceImpl implements ISysMessageService { .or() .apply(DataBaseHelper.findInSet(userId, "send_user_ids"))); lqw.orderByDesc(SysMessage::getCreateTime, SysMessage::getMessageId); - List list = baseMapper.selectList(new Page<>(1, BOX_LIMIT, false), lqw); + List list = messageMapper.selectList(new Page<>(1, BOX_LIMIT, false), lqw); return list.stream().map(this::buildVo).toList(); } diff --git a/ruoyi-modules/ruoyi-resource/src/main/java/org/dromara/resource/service/impl/SysOssConfigServiceImpl.java b/ruoyi-modules/ruoyi-resource/src/main/java/org/dromara/resource/service/impl/SysOssConfigServiceImpl.java index a772f0e66..8fc506c86 100644 --- a/ruoyi-modules/ruoyi-resource/src/main/java/org/dromara/resource/service/impl/SysOssConfigServiceImpl.java +++ b/ruoyi-modules/ruoyi-resource/src/main/java/org/dromara/resource/service/impl/SysOssConfigServiceImpl.java @@ -43,14 +43,14 @@ import java.util.List; @Service public class SysOssConfigServiceImpl implements ISysOssConfigService { - private final SysOssConfigMapper baseMapper; + private final SysOssConfigMapper ossConfigMapper; /** * 项目启动时，初始化参数到缓存，加载配置类 */ @Override public void init() { - List list = baseMapper.selectList(); + List list = ossConfigMapper.selectList(); // 加载OSS初始化配置 for (SysOssConfig config : list) { String configKey = config.getConfigKey(); @@ -63,13 +63,13 @@ public class SysOssConfigServiceImpl implements ISysOssConfigService { @Override public SysOssConfigVo queryById(Long ossConfigId) { - return baseMapper.selectVoById(ossConfigId); + return ossConfigMapper.selectVoById(ossConfigId); } @Override public PageResult queryPageList(SysOssConfigBo bo, PageQuery pageQuery) { LambdaQueryWrapper lqw = buildQueryWrapper(bo); - Page result = baseMapper.selectVoPage(pageQuery.build(), lqw); + Page result = ossConfigMapper.selectVoPage(pageQuery.build(), lqw); return PageResult.build(result.getRecords(), result.getTotal()); } @@ -87,10 +87,10 @@ public class SysOssConfigServiceImpl implements ISysOssConfigService { public Boolean insertByBo(SysOssConfigBo bo) { SysOssConfig config = BeanUtil.toBean(bo, SysOssConfig.class); validEntityBeforeSave(config); - boolean flag = baseMapper.insert(config) > 0; + boolean flag = ossConfigMapper.insert(config) > 0; if (flag) { // 从数据库查询完整的数据做缓存 - config = baseMapper.selectById(config.getOssConfigId()); + config = ossConfigMapper.selectById(config.getOssConfigId()); CacheUtils.put(CacheNames.SYS_OSS_CONFIG, config.getConfigKey(), JsonUtils.toJsonString(config)); } return flag; @@ -106,10 +106,10 @@ public class SysOssConfigServiceImpl implements ISysOssConfigService { luw.set(ObjectUtil.isNull(config.getExt1()), SysOssConfig::getExt1, ""); luw.set(ObjectUtil.isNull(config.getRemark()), SysOssConfig::getRemark, ""); luw.eq(SysOssConfig::getOssConfigId, config.getOssConfigId()); - boolean flag = baseMapper.update(config, luw) > 0; + boolean flag = ossConfigMapper.update(config, luw) > 0; if (flag) { // 从数据库查询完整的数据做缓存 - config = baseMapper.selectById(config.getOssConfigId()); + config = ossConfigMapper.selectById(config.getOssConfigId()); CacheUtils.put(CacheNames.SYS_OSS_CONFIG, config.getConfigKey(), JsonUtils.toJsonString(config)); } return flag; @@ -133,10 +133,10 @@ public class SysOssConfigServiceImpl implements ISysOssConfigService { } List list = CollUtil.newArrayList(); for (Long configId : ids) { - SysOssConfig config = baseMapper.selectById(configId); + SysOssConfig config = ossConfigMapper.selectById(configId); list.add(config); } - boolean flag = baseMapper.deleteByIds(ids) > 0; + boolean flag = ossConfigMapper.deleteByIds(ids) > 0; if (flag) { list.forEach(sysOssConfig -> CacheUtils.evict(CacheNames.SYS_OSS_CONFIG, sysOssConfig.getConfigKey())); @@ -149,7 +149,7 @@ public class SysOssConfigServiceImpl implements ISysOssConfigService { */ private boolean checkConfigKeyUnique(SysOssConfig sysOssConfig) { long ossConfigId = ObjectUtils.notNull(sysOssConfig.getOssConfigId(), -1L); - SysOssConfig info = baseMapper.selectOne(new LambdaQueryWrapper() + SysOssConfig info = ossConfigMapper.selectOne(new LambdaQueryWrapper() .select(SysOssConfig::getOssConfigId, SysOssConfig::getConfigKey) .eq(SysOssConfig::getConfigKey, sysOssConfig.getConfigKey())); if (ObjectUtil.isNotNull(info) && info.getOssConfigId() != ossConfigId) { @@ -165,9 +165,9 @@ public class SysOssConfigServiceImpl implements ISysOssConfigService { @Transactional(rollbackFor = Exception.class) public int updateOssConfigStatus(SysOssConfigBo bo) { SysOssConfig sysOssConfig = BeanUtil.toBean(bo, SysOssConfig.class); - int row = baseMapper.update(null, new LambdaUpdateWrapper() + int row = ossConfigMapper.update(null, new LambdaUpdateWrapper() .set(SysOssConfig::getStatus, SystemConstants.NO)); - row += baseMapper.updateById(sysOssConfig); + row += ossConfigMapper.updateById(sysOssConfig); if (row > 0) { RedisUtils.setCacheObject(OssConstant.DEFAULT_CONFIG_KEY, sysOssConfig.getConfigKey()); } diff --git a/ruoyi-modules/ruoyi-resource/src/main/java/org/dromara/resource/service/impl/SysOssServiceImpl.java b/ruoyi-modules/ruoyi-resource/src/main/java/org/dromara/resource/service/impl/SysOssServiceImpl.java index b53103fda..16ddab3e0 100644 --- a/ruoyi-modules/ruoyi-resource/src/main/java/org/dromara/resource/service/impl/SysOssServiceImpl.java +++ b/ruoyi-modules/ruoyi-resource/src/main/java/org/dromara/resource/service/impl/SysOssServiceImpl.java @@ -54,7 +54,7 @@ import java.util.Map; @Service public class SysOssServiceImpl implements ISysOssService { - private final SysOssMapper baseMapper; + private final SysOssMapper ossMapper; /** * 查询OSS对象存储列表 @@ -66,7 +66,7 @@ public class SysOssServiceImpl implements ISysOssService { @Override public PageResult queryPageList(SysOssBo bo, PageQuery pageQuery) { LambdaQueryWrapper lqw = buildQueryWrapper(bo); - Page result = baseMapper.selectVoPage(pageQuery.build(), lqw); + Page result = ossMapper.selectVoPage(pageQuery.build(), lqw); List filterResult = StreamUtils.toList(result.getRecords(), this::matchingUrl); result.setRecords(filterResult); return PageResult.build(result.getRecords(), result.getTotal()); @@ -150,7 +150,7 @@ public class SysOssServiceImpl implements ISysOssService { @Cacheable(cacheNames = CacheNames.SYS_OSS, key = "#ossId") @Override public SysOssVo getById(Long ossId) { - return baseMapper.selectVoById(ossId); + return ossMapper.selectVoById(ossId); } /** @@ -249,7 +249,7 @@ public class SysOssServiceImpl implements ISysOssService { oss.setOriginalName(originalfileName); oss.setService(configKey); oss.setExt1(JsonUtils.toJsonString(ext1)); - baseMapper.insert(oss); + ossMapper.insert(oss); SysOssVo sysOssVo = MapstructUtils.convert(oss, SysOssVo.class); return this.matchingUrl(sysOssVo); } @@ -263,7 +263,7 @@ public class SysOssServiceImpl implements ISysOssService { @Override public Boolean insertByBo(SysOssBo bo) { SysOss oss = BeanUtil.toBean(bo, SysOss.class); - boolean flag = baseMapper.insert(oss) > 0; + boolean flag = ossMapper.insert(oss) > 0; if (flag) { bo.setOssId(oss.getOssId()); } @@ -282,11 +282,11 @@ public class SysOssServiceImpl implements ISysOssService { if (isValid) { // 做一些业务上的校验,判断是否需要校验 } - List list = baseMapper.selectByIds(ids); + List list = ossMapper.selectByIds(ids); for (SysOss sysOss : list) { OssFactory.instance(sysOss.getService()).delete(sysOss.getFileName()); } - return baseMapper.deleteByIds(ids) > 0; + return ossMapper.deleteByIds(ids) > 0; } /** diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/dubbo/RemoteDataScopeServiceImpl.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/dubbo/RemoteDataScopeServiceImpl.java index 858a436de..f6510a76d 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/dubbo/RemoteDataScopeServiceImpl.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/dubbo/RemoteDataScopeServiceImpl.java @@ -3,7 +3,6 @@ package org.dromara.system.dubbo; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.convert.Convert; import cn.hutool.core.util.ObjectUtil; -import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import lombok.RequiredArgsConstructor; import org.apache.dubbo.config.annotation.DubboService; import org.dromara.common.core.constant.CacheNames; @@ -45,10 +44,10 @@ public class RemoteDataScopeServiceImpl implements RemoteDataScopeService { if (ObjectUtil.isNull(roleId)) { return "-1"; } - List list = roleDeptMapper.selectList( - new LambdaQueryWrapper() - .select(SysRoleDept::getDeptId) - .eq(SysRoleDept::getRoleId, roleId)); + List list = roleDeptMapper.lambda() + .select(SysRoleDept::getDeptId) + .eq(SysRoleDept::getRoleId, roleId) + .list(); if (CollUtil.isNotEmpty(list)) { return StreamUtils.join(list, rd -> Convert.toStr(rd.getDeptId())); } diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/dubbo/RemoteDeptServiceImpl.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/dubbo/RemoteDeptServiceImpl.java index be5857cfd..28f185fdc 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/dubbo/RemoteDeptServiceImpl.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/dubbo/RemoteDeptServiceImpl.java @@ -3,7 +3,6 @@ package org.dromara.system.dubbo; import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.util.ObjectUtil; -import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import lombok.RequiredArgsConstructor; import org.apache.dubbo.config.annotation.DubboService; import org.dromara.common.core.constant.SystemConstants; @@ -64,9 +63,10 @@ public class RemoteDeptServiceImpl implements RemoteDeptService { */ @Override public List selectDeptsByList() { - List list = deptMapper.selectDeptList(new LambdaQueryWrapper() + List list = deptMapper.lambda() .select(SysDept::getDeptId, SysDept::getDeptName, SysDept::getParentId) - .eq(SysDept::getStatus, SystemConstants.NORMAL)); + .eq(SysDept::getStatus, SystemConstants.NORMAL) + .voList(); return BeanUtil.copyToList(list, RemoteDeptVo.class); } @@ -81,11 +81,10 @@ public class RemoteDeptServiceImpl implements RemoteDeptService { if (CollUtil.isEmpty(deptIds)) { return Collections.emptyMap(); } - List list = deptMapper.selectList( - new LambdaQueryWrapper() - .select(SysDept::getDeptId, SysDept::getDeptName) - .in(SysDept::getDeptId, deptIds) - ); + List list = deptMapper.lambda() + .select(SysDept::getDeptId, SysDept::getDeptName) + .in(SysDept::getDeptId, deptIds) + .list(); return StreamUtils.toMap(list, SysDept::getDeptId, SysDept::getDeptName); } diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/dubbo/RemotePostServiceImpl.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/dubbo/RemotePostServiceImpl.java index a0258cd7c..344df6a95 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/dubbo/RemotePostServiceImpl.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/dubbo/RemotePostServiceImpl.java @@ -1,7 +1,6 @@ package org.dromara.system.dubbo; import cn.hutool.core.collection.CollUtil; -import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import lombok.RequiredArgsConstructor; import org.apache.dubbo.config.annotation.DubboService; import org.dromara.common.core.utils.StreamUtils; @@ -38,11 +37,10 @@ public class RemotePostServiceImpl implements RemotePostService { if (CollUtil.isEmpty(postIds)) { return Collections.emptyMap(); } - List list = postMapper.selectList( - new LambdaQueryWrapper() - .select(SysPost::getPostId, SysPost::getPostName) - .in(SysPost::getPostId, postIds) - ); + List list = postMapper.lambda() + .select(SysPost::getPostId, SysPost::getPostName) + .in(SysPost::getPostId, postIds) + .list(); return StreamUtils.toMap(list, SysPost::getPostId, SysPost::getPostName); } diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/dubbo/RemoteRoleServiceImpl.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/dubbo/RemoteRoleServiceImpl.java index 277ec37fc..c2b01e4fd 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/dubbo/RemoteRoleServiceImpl.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/dubbo/RemoteRoleServiceImpl.java @@ -1,7 +1,6 @@ package org.dromara.system.dubbo; import cn.hutool.core.collection.CollUtil; -import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import lombok.RequiredArgsConstructor; import org.apache.dubbo.config.annotation.DubboService; import org.dromara.common.core.utils.StreamUtils; @@ -38,11 +37,10 @@ public class RemoteRoleServiceImpl implements RemoteRoleService { if (CollUtil.isEmpty(roleIds)) { return Collections.emptyMap(); } - List list = roleMapper.selectList( - new LambdaQueryWrapper() - .select(SysRole::getRoleId, SysRole::getRoleName) - .in(SysRole::getRoleId, roleIds) - ); + List list = roleMapper.lambda() + .select(SysRole::getRoleId, SysRole::getRoleName) + .in(SysRole::getRoleId, roleIds) + .list(); return StreamUtils.toMap(list, SysRole::getRoleId, SysRole::getRoleName); } diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/dubbo/RemoteUserServiceImpl.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/dubbo/RemoteUserServiceImpl.java index b499659eb..6326ae53f 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/dubbo/RemoteUserServiceImpl.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/dubbo/RemoteUserServiceImpl.java @@ -4,7 +4,6 @@ import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.lang.Opt; import cn.hutool.core.util.ObjectUtil; -import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import lombok.RequiredArgsConstructor; import org.apache.dubbo.config.annotation.DubboService; import org.dromara.common.core.constant.SystemConstants; @@ -65,7 +64,7 @@ public class RemoteUserServiceImpl implements RemoteUserService { */ @Override public LoginUser getUserInfo(String username) throws UserException { - SysUserVo sysUser = userMapper.selectVoOne(new LambdaQueryWrapper().eq(SysUser::getUserName, username)); + SysUserVo sysUser = userMapper.lambda().eq(SysUser::getUserName, username).voOne(); if (ObjectUtil.isNull(sysUser)) { throw new UserException("user.not.exists", username); } @@ -103,7 +102,7 @@ public class RemoteUserServiceImpl implements RemoteUserService { */ @Override public LoginUser getUserInfoByPhoneNumber(String phoneNumber) throws UserException { - SysUserVo sysUser = userMapper.selectVoOne(new LambdaQueryWrapper().eq(SysUser::getPhoneNumber, phoneNumber)); + SysUserVo sysUser = userMapper.lambda().eq(SysUser::getPhoneNumber, phoneNumber).voOne(); if (ObjectUtil.isNull(sysUser)) { throw new UserException("user.not.exists", phoneNumber); } @@ -123,7 +122,7 @@ public class RemoteUserServiceImpl implements RemoteUserService { */ @Override public LoginUser getUserInfoByEmail(String email) throws UserException { - SysUserVo user = userMapper.selectVoOne(new LambdaQueryWrapper().eq(SysUser::getEmail, email)); + SysUserVo user = userMapper.lambda().eq(SysUser::getEmail, email).voOne(); if (ObjectUtil.isNull(user)) { throw new UserException("user.not.exists", email); } @@ -175,8 +174,9 @@ public class RemoteUserServiceImpl implements RemoteUserService { if (!("true".equals(configService.selectConfigByKey("sys.account.registerUser")))) { throw new ServiceException("当前系统没有开启注册功能"); } - boolean exist = userMapper.exists(new LambdaQueryWrapper() - .eq(SysUser::getUserName, sysUserBo.getUserName())); + boolean exist = userMapper.lambda() + .eq(SysUser::getUserName, sysUserBo.getUserName()) + .exists(); if (exist) { throw new UserException("user.register.save.error", username); } @@ -299,13 +299,14 @@ public class RemoteUserServiceImpl implements RemoteUserService { if (CollUtil.isEmpty(userIds)) { return List.of(); } - List list = userMapper.selectVoList(new LambdaQueryWrapper() + List list = userMapper.lambda() .select(SysUser::getUserId, SysUser::getDeptId, SysUser::getUserName, SysUser::getNickName, SysUser::getUserType, SysUser::getEmail, SysUser::getPhoneNumber, SysUser::getGender, SysUser::getStatus, SysUser::getCreateTime) .eq(SysUser::getStatus, SystemConstants.NORMAL) - .in(SysUser::getUserId, userIds)); + .in(SysUser::getUserId, userIds) + .voList(); return MapstructUtils.convert(list, RemoteUserVo.class); } @@ -336,8 +337,9 @@ public class RemoteUserServiceImpl implements RemoteUserService { } // 通过角色ID获取用户角色信息 - List userRoles = userRoleMapper.selectList( - new LambdaQueryWrapper().in(SysUserRole::getRoleId, roleIds)); + List userRoles = userRoleMapper.lambda() + .in(SysUserRole::getRoleId, roleIds) + .list(); // 获取用户ID列表 Set userIds = StreamUtils.toSet(userRoles, SysUserRole::getUserId); @@ -356,10 +358,11 @@ public class RemoteUserServiceImpl implements RemoteUserService { if (CollUtil.isEmpty(deptIds)) { return List.of(); } - List list = userMapper.selectVoList(new LambdaQueryWrapper() + List list = userMapper.lambda() .select(SysUser::getUserId, SysUser::getUserName, SysUser::getNickName, SysUser::getEmail, SysUser::getPhoneNumber) .eq(SysUser::getStatus, SystemConstants.NORMAL) - .in(SysUser::getDeptId, deptIds)); + .in(SysUser::getDeptId, deptIds) + .voList(); return BeanUtil.copyToList(list, RemoteUserVo.class); } @@ -376,8 +379,9 @@ public class RemoteUserServiceImpl implements RemoteUserService { } // 通过岗位ID获取用户岗位信息 - List userPosts = userPostMapper.selectList( - new LambdaQueryWrapper().in(SysUserPost::getPostId, postIds)); + List userPosts = userPostMapper.lambda() + .in(SysUserPost::getPostId, postIds) + .list(); // 获取用户ID列表 Set userIds = StreamUtils.toSet(userPosts, SysUserPost::getUserId); @@ -395,11 +399,10 @@ public class RemoteUserServiceImpl implements RemoteUserService { if (CollUtil.isEmpty(userIds)) { return Map.of(); } - List list = userMapper.selectList( - new LambdaQueryWrapper() - .select(SysUser::getUserId, SysUser::getNickName) - .in(SysUser::getUserId, userIds) - ); + List list = userMapper.lambda() + .select(SysUser::getUserId, SysUser::getNickName) + .in(SysUser::getUserId, userIds) + .list(); return StreamUtils.toMap(list, SysUser::getUserId, SysUser::getNickName); } diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/SysDeptMapper.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/SysDeptMapper.java index 5777e6a90..74bbdfe47 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/SysDeptMapper.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/SysDeptMapper.java @@ -1,7 +1,6 @@ package org.dromara.system.mapper; import com.baomidou.mybatisplus.core.conditions.Wrapper; -import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.github.yulichang.base.MPJBaseMapper; import com.github.yulichang.toolkit.JoinWrappers; @@ -9,7 +8,6 @@ import org.dromara.common.core.utils.StreamUtils; import org.dromara.common.mybatis.annotation.DataColumn; import org.dromara.common.mybatis.annotation.DataPermission; import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; -import org.dromara.common.mybatis.helper.DataBaseHelper; import org.dromara.system.domain.SysDept; import org.dromara.system.domain.SysRole; import org.dromara.system.domain.SysRoleDept; @@ -66,7 +64,7 @@ public interface SysDeptMapper extends BaseMapperPlus, MPJBa @DataColumn(key = "deptName", value = "dept_id") }) default long countDeptById(Long deptId) { - return this.selectCount(new LambdaQueryWrapper().eq(SysDept::getDeptId, deptId)); + return this.lambda().eq(SysDept::getDeptId, deptId).count(); } /** @@ -76,9 +74,10 @@ public interface SysDeptMapper extends BaseMapperPlus, MPJBa * @return 包含子部门的列表 */ default List selectListByParentId(Long parentId) { - return this.selectList(new LambdaQueryWrapper() + return this.lambda() .select(SysDept::getDeptId) - .apply(DataBaseHelper.findInSet(parentId, "ancestors"))); + .findInSet(parentId, SysDept::getAncestors) + .list(); } /** diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/SysDictDataMapper.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/SysDictDataMapper.java index 7298db3d0..8d5eba362 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/SysDictDataMapper.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/SysDictDataMapper.java @@ -1,6 +1,5 @@ package org.dromara.system.mapper; -import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; import org.dromara.system.domain.SysDictData; import org.dromara.system.domain.vo.SysDictDataVo; @@ -21,9 +20,9 @@ public interface SysDictDataMapper extends BaseMapperPlus selectDictDataByType(String dictType) { - return selectVoList( - new LambdaQueryWrapper() - .eq(SysDictData::getDictType, dictType) - .orderByAsc(SysDictData::getDictSort)); + return this.lambda() + .eq(SysDictData::getDictType, dictType) + .orderByAsc(SysDictData::getDictSort) + .voList(); } } diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/SysMenuMapper.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/SysMenuMapper.java index a51b1352a..d0ccca37c 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/SysMenuMapper.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/SysMenuMapper.java @@ -1,7 +1,6 @@ package org.dromara.system.mapper; import cn.hutool.core.collection.CollUtil; -import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.github.yulichang.base.MPJBaseMapper; import com.github.yulichang.toolkit.JoinWrappers; import org.dromara.common.core.constant.SystemConstants; @@ -97,12 +96,12 @@ public interface SysMenuMapper extends BaseMapperPlus, MPJBa * @return 菜单列表 */ default List selectMenuTreeAll() { - LambdaQueryWrapper lqw = new LambdaQueryWrapper() + return this.lambda() .in(SysMenu::getMenuType, SystemConstants.TYPE_DIR, SystemConstants.TYPE_MENU) .eq(SysMenu::getStatus, SystemConstants.NORMAL) .orderByAsc(SysMenu::getParentId) - .orderByAsc(SysMenu::getOrderNum); - return this.selectList(lqw); + .orderByAsc(SysMenu::getOrderNum) + .list(); } /** diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/SysPostMapper.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/SysPostMapper.java index 8e740e0a4..ace0a4829 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/SysPostMapper.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/SysPostMapper.java @@ -1,7 +1,6 @@ package org.dromara.system.mapper; import com.baomidou.mybatisplus.core.conditions.Wrapper; -import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.github.yulichang.base.MPJBaseMapper; import com.github.yulichang.toolkit.JoinWrappers; @@ -62,7 +61,7 @@ public interface SysPostMapper extends BaseMapperPlus, MPJBa @DataColumn(key = "userName", value = "create_by") }) default long selectPostCount(Collection postIds) { - return this.selectCount(new LambdaQueryWrapper().in(SysPost::getPostId, postIds)); + return this.lambda().in(SysPost::getPostId, postIds).count(); } /** diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/SysRoleMapper.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/SysRoleMapper.java index 96d127a7a..b2242832e 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/SysRoleMapper.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/SysRoleMapper.java @@ -1,7 +1,6 @@ package org.dromara.system.mapper; import com.baomidou.mybatisplus.core.conditions.Wrapper; -import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.toolkit.Constants; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.github.yulichang.base.MPJBaseMapper; @@ -64,7 +63,7 @@ public interface SysRoleMapper extends BaseMapperPlus, MPJBa @DataColumn(key = "userName", value = "create_by") }) default long selectRoleCount(Collection roleIds) { - return this.selectCount(new LambdaQueryWrapper().in(SysRole::getRoleId, roleIds)); + return this.lambda().in(SysRole::getRoleId, roleIds).count(); } /** diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/SysRoleMenuMapper.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/SysRoleMenuMapper.java index 6b552965a..e5eb4b883 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/SysRoleMenuMapper.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/SysRoleMenuMapper.java @@ -1,6 +1,5 @@ package org.dromara.system.mapper; -import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; import org.dromara.system.domain.SysRoleMenu; @@ -20,7 +19,7 @@ public interface SysRoleMenuMapper extends BaseMapperPlus menuIds) { - return this.delete(new LambdaUpdateWrapper().in(SysRoleMenu::getMenuId, menuIds)); + return this.lambda().in(SysRoleMenu::getMenuId, menuIds).deleteCount(); } } diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/SysUserMapper.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/SysUserMapper.java index 5cd3b7b22..b7aedc1bf 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/SysUserMapper.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/SysUserMapper.java @@ -1,7 +1,6 @@ package org.dromara.system.mapper; import com.baomidou.mybatisplus.core.conditions.Wrapper; -import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.toolkit.Constants; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.github.yulichang.base.MPJBaseMapper; @@ -136,7 +135,7 @@ public interface SysUserMapper extends BaseMapperPlus, MPJBa @DataColumn(key = "userName", value = "create_by") }) default long countUserById(Long userId) { - return this.selectCount(new LambdaQueryWrapper().eq(SysUser::getUserId, userId)); + return lambda().eq(SysUser::getUserId, userId).count(); } /** diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/SysUserRoleMapper.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/SysUserRoleMapper.java index 4c1c8b9df..f5d048af2 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/SysUserRoleMapper.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/SysUserRoleMapper.java @@ -1,6 +1,6 @@ package org.dromara.system.mapper; -import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import cn.hutool.core.convert.Convert; import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; import org.dromara.system.domain.SysUserRole; @@ -20,9 +20,10 @@ public interface SysUserRoleMapper extends BaseMapperPlus selectUserIdsByRoleId(Long roleId) { - return this.selectObjs(new LambdaQueryWrapper() - .select(SysUserRole::getUserId).eq(SysUserRole::getRoleId, roleId) - ); + return this.lambda() + .select(SysUserRole::getUserId) + .eq(SysUserRole::getRoleId, roleId) + .objs(Convert::toLong); } } diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysClientServiceImpl.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysClientServiceImpl.java index 8fd3e8296..7a9a3d7a5 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysClientServiceImpl.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysClientServiceImpl.java @@ -39,14 +39,14 @@ public class SysClientServiceImpl implements ISysClientService { private static final String CLIENT_RULE_SEPARATOR_REGEX = "[,;\\r\\n]+"; - private final SysClientMapper baseMapper; + private final SysClientMapper clientMapper; /** * 查询客户端管理 */ @Override public SysClientVo queryById(Long id) { - SysClientVo vo = baseMapper.selectVoById(id); + SysClientVo vo = clientMapper.selectVoById(id); fillClientRuleFields(vo); return vo; } @@ -57,7 +57,7 @@ public class SysClientServiceImpl implements ISysClientService { @Cacheable(cacheNames = CacheNames.SYS_CLIENT, key = "#clientId") @Override public SysClientVo queryByClientId(String clientId) { - SysClientVo vo = baseMapper.selectVoOne(new LambdaQueryWrapper().eq(SysClient::getClientId, clientId)); + SysClientVo vo = clientMapper.lambda().eq(SysClient::getClientId, clientId).voOne(); fillClientRuleFields(vo); return vo; } @@ -68,7 +68,7 @@ public class SysClientServiceImpl implements ISysClientService { @Override public PageResult queryPageList(SysClientBo bo, PageQuery pageQuery) { LambdaQueryWrapper lqw = buildQueryWrapper(bo); - Page result = baseMapper.selectVoPage(pageQuery.build(), lqw); + Page result = clientMapper.selectVoPage(pageQuery.build(), lqw); result.getRecords().forEach(this::fillClientRuleFields); return PageResult.build(result.getRecords(), result.getTotal()); } @@ -79,7 +79,7 @@ public class SysClientServiceImpl implements ISysClientService { @Override public List queryList(SysClientBo bo) { LambdaQueryWrapper lqw = buildQueryWrapper(bo); - List list = baseMapper.selectVoList(lqw); + List list = clientMapper.selectVoList(lqw); list.forEach(this::fillClientRuleFields); return list; } @@ -107,7 +107,7 @@ public class SysClientServiceImpl implements ISysClientService { String clientKey = bo.getClientKey(); String clientSecret = bo.getClientSecret(); add.setClientId(SecureUtil.md5(clientKey + clientSecret)); - boolean flag = baseMapper.insert(add) > 0; + boolean flag = clientMapper.insert(add) > 0; if (flag) { bo.setId(add.getId()); } @@ -124,7 +124,7 @@ public class SysClientServiceImpl implements ISysClientService { update.setGrantType(StringUtils.joinComma(bo.getGrantTypeList())); update.setAccessPath(resolveRuleValue(bo.getAccessPath(), bo.getAccessPathList(), this::normalizeAccessPath)); update.setIpWhitelist(resolveRuleValue(bo.getIpWhitelist(), bo.getIpWhitelistList(), UnaryOperator.identity())); - return baseMapper.updateById(update) > 0; + return clientMapper.updateById(update) > 0; } /** @@ -133,7 +133,7 @@ public class SysClientServiceImpl implements ISysClientService { @CacheEvict(cacheNames = CacheNames.SYS_CLIENT, key = "#clientId") @Override public int updateClientStatus(String clientId, String status) { - return baseMapper.update(null, + return clientMapper.update(null, new LambdaUpdateWrapper() .set(SysClient::getStatus, status) .eq(SysClient::getClientId, clientId)); @@ -145,7 +145,7 @@ public class SysClientServiceImpl implements ISysClientService { @CacheEvict(cacheNames = CacheNames.SYS_CLIENT, allEntries = true) @Override public Boolean deleteWithValidByIds(Collection ids, Boolean isValid) { - return baseMapper.deleteByIds(ids) > 0; + return clientMapper.deleteByIds(ids) > 0; } /** @@ -156,7 +156,7 @@ public class SysClientServiceImpl implements ISysClientService { */ @Override public boolean checkClickKeyUnique(SysClientBo client) { - boolean exist = baseMapper.exists(new LambdaQueryWrapper() + boolean exist = clientMapper.exists(new LambdaQueryWrapper() .eq(SysClient::getClientKey, client.getClientKey()) .ne(ObjectUtil.isNotNull(client.getId()), SysClient::getId, client.getId())); return !exist; 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 d3f91a2af..5b2932c78 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 @@ -36,7 +36,7 @@ import java.util.Map; @Service public class SysConfigServiceImpl implements ISysConfigService { - private final SysConfigMapper baseMapper; + private final SysConfigMapper configMapper; /** * 分页查询参数配置列表 @@ -48,7 +48,7 @@ public class SysConfigServiceImpl implements ISysConfigService { @Override public PageResult selectPageConfigList(SysConfigBo config, PageQuery pageQuery) { LambdaQueryWrapper lqw = buildQueryWrapper(config); - Page page = baseMapper.selectVoPage(pageQuery.build(), lqw); + Page page = configMapper.selectVoPage(pageQuery.build(), lqw); return PageResult.build(page.getRecords(), page.getTotal()); } @@ -60,7 +60,7 @@ public class SysConfigServiceImpl implements ISysConfigService { */ @Override public SysConfigVo selectConfigById(Long configId) { - return baseMapper.selectVoById(configId); + return configMapper.selectVoById(configId); } /** @@ -72,7 +72,7 @@ public class SysConfigServiceImpl implements ISysConfigService { @Cacheable(cacheNames = CacheNames.SYS_CONFIG, key = "#configKey") @Override public String selectConfigByKey(String configKey) { - SysConfig retConfig = baseMapper.selectOne(new LambdaQueryWrapper() + SysConfig retConfig = configMapper.selectOne(new LambdaQueryWrapper() .eq(SysConfig::getConfigKey, configKey)); return ObjectUtils.notNullGetter(retConfig, SysConfig::getConfigValue, StringUtils.EMPTY); } @@ -97,7 +97,7 @@ public class SysConfigServiceImpl implements ISysConfigService { @Override public List selectConfigList(SysConfigBo config) { LambdaQueryWrapper lqw = buildQueryWrapper(config); - return baseMapper.selectVoList(lqw); + return configMapper.selectVoList(lqw); } private LambdaQueryWrapper buildQueryWrapper(SysConfigBo bo) { @@ -122,7 +122,7 @@ public class SysConfigServiceImpl implements ISysConfigService { @Override public String insertConfig(SysConfigBo bo) { SysConfig config = MapstructUtils.convert(bo, SysConfig.class); - int row = baseMapper.insert(config); + int row = configMapper.insert(config); if (row > 0) { return config.getConfigValue(); } @@ -141,14 +141,14 @@ public class SysConfigServiceImpl implements ISysConfigService { int row = 0; SysConfig config = MapstructUtils.convert(bo, SysConfig.class); if (config.getConfigId() != null) { - SysConfig temp = baseMapper.selectById(config.getConfigId()); + SysConfig temp = configMapper.selectById(config.getConfigId()); if (ObjectUtil.isNotNull(temp) && !StringUtils.equals(temp.getConfigKey(), config.getConfigKey())) { CacheUtils.evict(CacheNames.SYS_CONFIG, temp.getConfigKey()); } - row = baseMapper.updateById(config); + row = configMapper.updateById(config); } else { CacheUtils.evict(CacheNames.SYS_CONFIG, config.getConfigKey()); - row = baseMapper.update(config, new LambdaQueryWrapper() + row = configMapper.update(config, new LambdaQueryWrapper() .eq(SysConfig::getConfigKey, config.getConfigKey())); } if (row > 0) { @@ -164,14 +164,14 @@ public class SysConfigServiceImpl implements ISysConfigService { */ @Override public void deleteConfigByIds(List configIds) { - List list = baseMapper.selectByIds(configIds); + List list = configMapper.selectByIds(configIds); list.forEach(config -> { if (StringUtils.equals(SystemConstants.YES, config.getConfigType())) { throw new ServiceException("内置参数【{}】不能删除", config.getConfigKey()); } CacheUtils.evict(CacheNames.SYS_CONFIG, config.getConfigKey()); }); - baseMapper.deleteByIds(configIds); + configMapper.deleteByIds(configIds); } /** @@ -190,7 +190,7 @@ public class SysConfigServiceImpl implements ISysConfigService { */ @Override public boolean checkConfigKeyUnique(SysConfigBo config) { - boolean exist = baseMapper.exists(new LambdaQueryWrapper() + boolean exist = configMapper.exists(new LambdaQueryWrapper() .eq(SysConfig::getConfigKey, config.getConfigKey()) .ne(ObjectUtil.isNotNull(config.getConfigId()), SysConfig::getConfigId, config.getConfigId())); return !exist; diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysDeptServiceImpl.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysDeptServiceImpl.java index 556323603..1b30d5b9a 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysDeptServiceImpl.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysDeptServiceImpl.java @@ -47,7 +47,7 @@ import java.util.Map; @Service public class SysDeptServiceImpl implements ISysDeptService { - private final SysDeptMapper baseMapper; + private final SysDeptMapper deptMapper; private final SysRoleMapper roleMapper; private final SysUserMapper userMapper; @@ -60,7 +60,7 @@ public class SysDeptServiceImpl implements ISysDeptService { */ @Override public PageResult selectPageDeptList(SysDeptBo dept, PageQuery pageQuery) { - Page page = baseMapper.selectPageDeptList(pageQuery.build(), buildQueryWrapper(dept)); + Page page = deptMapper.selectPageDeptList(pageQuery.build(), buildQueryWrapper(dept)); return PageResult.build(page.getRecords(), page.getTotal()); } @@ -73,7 +73,7 @@ public class SysDeptServiceImpl implements ISysDeptService { @Override public List selectDeptList(SysDeptBo dept) { LambdaQueryWrapper lqw = buildQueryWrapper(dept); - return baseMapper.selectDeptList(lqw); + return deptMapper.selectDeptList(lqw); } /** @@ -85,7 +85,7 @@ public class SysDeptServiceImpl implements ISysDeptService { @Override public List> selectDeptTreeList(SysDeptBo bo) { LambdaQueryWrapper lqw = buildQueryWrapper(bo); - List depts = baseMapper.selectDeptList(lqw); + List depts = deptMapper.selectDeptList(lqw); return buildDeptTreeSelect(depts); } @@ -107,7 +107,7 @@ public class SysDeptServiceImpl implements ISysDeptService { if (ObjectUtil.isNotNull(bo.getBelongDeptId())) { //部门树搜索 lqw.and(x -> { - List deptIds = baseMapper.selectDeptAndChildById(bo.getBelongDeptId()); + List deptIds = deptMapper.selectDeptAndChildById(bo.getBelongDeptId()); x.in(SysDept::getDeptId, deptIds); }); } @@ -147,7 +147,7 @@ public class SysDeptServiceImpl implements ISysDeptService { @Override public List selectDeptListByRoleId(Long roleId) { SysRole role = roleMapper.selectById(roleId); - return baseMapper.selectDeptListByRoleId(roleId, role.getDeptCheckStrictly()); + return deptMapper.selectDeptListByRoleId(roleId, role.getDeptCheckStrictly()); } /** @@ -159,11 +159,11 @@ public class SysDeptServiceImpl implements ISysDeptService { @Cacheable(cacheNames = CacheNames.SYS_DEPT, key = "#deptId") @Override public SysDeptVo selectDeptById(Long deptId) { - SysDeptVo dept = baseMapper.selectVoById(deptId); + SysDeptVo dept = deptMapper.selectVoById(deptId); if (ObjectUtil.isNull(dept)) { return null; } - SysDeptVo parentDept = baseMapper.selectVoOne(new LambdaQueryWrapper() + SysDeptVo parentDept = deptMapper.selectVoOne(new LambdaQueryWrapper() .select(SysDept::getDeptName).eq(SysDept::getDeptId, dept.getParentId())); dept.setParentName(ObjectUtils.notNullGetter(parentDept, SysDeptVo::getDeptName)); return dept; @@ -177,7 +177,7 @@ public class SysDeptServiceImpl implements ISysDeptService { */ @Override public List selectDeptByIds(List deptIds) { - return baseMapper.selectDeptList(new LambdaQueryWrapper() + return deptMapper.selectDeptList(new LambdaQueryWrapper() .select(SysDept::getDeptId, SysDept::getDeptName, SysDept::getLeader) .eq(SysDept::getStatus, SystemConstants.NORMAL) .in(CollUtil.isNotEmpty(deptIds), SysDept::getDeptId, deptIds)); @@ -209,7 +209,7 @@ public class SysDeptServiceImpl implements ISysDeptService { */ @Override public long selectNormalChildrenDeptById(Long deptId) { - return baseMapper.selectCount(new LambdaQueryWrapper() + return deptMapper.selectCount(new LambdaQueryWrapper() .eq(SysDept::getStatus, SystemConstants.NORMAL) .apply(DataBaseHelper.findInSet(deptId, "ancestors"))); } @@ -222,7 +222,7 @@ public class SysDeptServiceImpl implements ISysDeptService { */ @Override public boolean hasChildByDeptId(Long deptId) { - return baseMapper.exists(new LambdaQueryWrapper() + return deptMapper.exists(new LambdaQueryWrapper() .eq(SysDept::getParentId, deptId)); } @@ -246,7 +246,7 @@ public class SysDeptServiceImpl implements ISysDeptService { */ @Override public boolean checkDeptNameUnique(SysDeptBo dept) { - boolean exist = baseMapper.exists(new LambdaQueryWrapper() + boolean exist = deptMapper.exists(new LambdaQueryWrapper() .eq(SysDept::getDeptName, dept.getDeptName()) .eq(SysDept::getParentId, dept.getParentId()) .ne(ObjectUtil.isNotNull(dept.getDeptId()), SysDept::getDeptId, dept.getDeptId())); @@ -266,7 +266,7 @@ public class SysDeptServiceImpl implements ISysDeptService { if (LoginHelper.isSuperAdmin()) { return; } - if (baseMapper.countDeptById(deptId) == 0) { + if (deptMapper.countDeptById(deptId) == 0) { throw new ServiceException("没有权限访问部门数据！"); } } @@ -280,7 +280,7 @@ public class SysDeptServiceImpl implements ISysDeptService { @CacheEvict(cacheNames = CacheNames.SYS_DEPT_AND_CHILD, allEntries = true) @Override public int insertDept(SysDeptBo bo) { - SysDept info = baseMapper.selectById(bo.getParentId()); + SysDept info = deptMapper.selectById(bo.getParentId()); // 如果父节点不存在或不为正常状态,则不允许新增子节点 if (ObjectUtil.isNull(info)) { throw new ServiceException("父部门不存在"); @@ -290,7 +290,7 @@ public class SysDeptServiceImpl implements ISysDeptService { } SysDept dept = MapstructUtils.convert(bo, SysDept.class); dept.setAncestors(info.getAncestors() + StringUtils.SEPARATOR + dept.getParentId()); - return baseMapper.insert(dept); + return deptMapper.insert(dept); } /** @@ -307,11 +307,11 @@ public class SysDeptServiceImpl implements ISysDeptService { @Transactional(rollbackFor = Exception.class) public int updateDept(SysDeptBo bo) { SysDept dept = MapstructUtils.convert(bo, SysDept.class); - SysDept oldDept = baseMapper.selectById(dept.getDeptId()); + SysDept oldDept = deptMapper.selectById(dept.getDeptId()); if (!oldDept.getParentId().equals(dept.getParentId())) { // 如果是新父部门 则校验是否具有新父部门权限 避免越权 this.checkDeptDataScope(dept.getParentId()); - SysDept newParentDept = baseMapper.selectById(dept.getParentId()); + SysDept newParentDept = deptMapper.selectById(dept.getParentId()); if (ObjectUtil.isNotNull(newParentDept) && ObjectUtil.isNotNull(oldDept)) { String newAncestors = newParentDept.getAncestors() + StringUtils.SEPARATOR + newParentDept.getDeptId(); String oldAncestors = oldDept.getAncestors(); @@ -321,7 +321,7 @@ public class SysDeptServiceImpl implements ISysDeptService { } else { dept.setAncestors(oldDept.getAncestors()); } - int result = baseMapper.updateById(dept); + int result = deptMapper.updateById(dept); // 如果部门状态为启用，且部门祖级列表不为空，且部门祖级列表不等于根部门祖级列表（如果部门祖级列表不等于根部门祖级列表，则说明存在上级部门） if (SystemConstants.NORMAL.equals(dept.getStatus()) && StringUtils.isNotEmpty(dept.getAncestors()) @@ -340,7 +340,7 @@ public class SysDeptServiceImpl implements ISysDeptService { private void updateParentDeptStatusNormal(SysDept dept) { String ancestors = dept.getAncestors(); Long[] deptIds = Convert.toLongArray(ancestors); - baseMapper.update(null, new LambdaUpdateWrapper() + deptMapper.update(null, new LambdaUpdateWrapper() .set(SysDept::getStatus, SystemConstants.NORMAL) .in(SysDept::getDeptId, Arrays.asList(deptIds))); } @@ -353,7 +353,7 @@ public class SysDeptServiceImpl implements ISysDeptService { * @param oldAncestors 旧的父ID集合 */ private void updateDeptChildren(Long deptId, String newAncestors, String oldAncestors) { - List children = baseMapper.selectList(new LambdaQueryWrapper() + List children = deptMapper.selectList(new LambdaQueryWrapper() .apply(DataBaseHelper.findInSet(deptId, "ancestors"))); List list = new ArrayList<>(); for (SysDept child : children) { @@ -363,7 +363,7 @@ public class SysDeptServiceImpl implements ISysDeptService { list.add(dept); } if (CollUtil.isNotEmpty(list)) { - if (baseMapper.updateBatchById(list)) { + if (deptMapper.updateBatchById(list)) { list.forEach(dept -> CacheUtils.evict(CacheNames.SYS_DEPT, dept.getDeptId())); } } @@ -381,7 +381,7 @@ public class SysDeptServiceImpl implements ISysDeptService { }) @Override public int deleteDeptById(Long deptId) { - return baseMapper.deleteById(deptId); + return deptMapper.deleteById(deptId); } } 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 1032a6526..34f874071 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 @@ -31,7 +31,7 @@ import java.util.List; @Service public class SysDictDataServiceImpl implements ISysDictDataService { - private final SysDictDataMapper baseMapper; + private final SysDictDataMapper dictDataMapper; /** * 分页查询字典数据列表 @@ -43,7 +43,7 @@ public class SysDictDataServiceImpl implements ISysDictDataService { @Override public PageResult selectPageDictDataList(SysDictDataBo dictData, PageQuery pageQuery) { LambdaQueryWrapper lqw = buildQueryWrapper(dictData); - Page page = baseMapper.selectVoPage(pageQuery.build(), lqw); + Page page = dictDataMapper.selectVoPage(pageQuery.build(), lqw); return PageResult.build(page.getRecords(), page.getTotal()); } @@ -56,7 +56,7 @@ public class SysDictDataServiceImpl implements ISysDictDataService { @Override public List selectDictDataList(SysDictDataBo dictData) { LambdaQueryWrapper lqw = buildQueryWrapper(dictData); - return baseMapper.selectVoList(lqw); + return dictDataMapper.selectVoList(lqw); } private LambdaQueryWrapper buildQueryWrapper(SysDictDataBo bo) { @@ -77,7 +77,7 @@ public class SysDictDataServiceImpl implements ISysDictDataService { */ @Override public String selectDictLabel(String dictType, String dictValue) { - return baseMapper.selectOne(new LambdaQueryWrapper() + return dictDataMapper.selectOne(new LambdaQueryWrapper() .select(SysDictData::getDictLabel) .eq(SysDictData::getDictType, dictType) .eq(SysDictData::getDictValue, dictValue)) @@ -92,7 +92,7 @@ public class SysDictDataServiceImpl implements ISysDictDataService { */ @Override public SysDictDataVo selectDictDataById(Long dictCode) { - return baseMapper.selectVoById(dictCode); + return dictDataMapper.selectVoById(dictCode); } /** @@ -102,8 +102,8 @@ public class SysDictDataServiceImpl implements ISysDictDataService { */ @Override public void deleteDictDataByIds(List dictCodes) { - List list = baseMapper.selectByIds(dictCodes); - baseMapper.deleteByIds(dictCodes); + List list = dictDataMapper.selectByIds(dictCodes); + dictDataMapper.deleteByIds(dictCodes); list.forEach(x -> CacheUtils.evict(CacheNames.SYS_DICT, x.getDictType())); } @@ -117,9 +117,9 @@ public class SysDictDataServiceImpl implements ISysDictDataService { @Override public List insertDictData(SysDictDataBo bo) { SysDictData data = MapstructUtils.convert(bo, SysDictData.class); - int row = baseMapper.insert(data); + int row = dictDataMapper.insert(data); if (row > 0) { - return baseMapper.selectDictDataByType(data.getDictType()); + return dictDataMapper.selectDictDataByType(data.getDictType()); } throw new ServiceException("操作失败"); } @@ -134,9 +134,9 @@ public class SysDictDataServiceImpl implements ISysDictDataService { @Override public List updateDictData(SysDictDataBo bo) { SysDictData data = MapstructUtils.convert(bo, SysDictData.class); - int row = baseMapper.updateById(data); + int row = dictDataMapper.updateById(data); if (row > 0) { - return baseMapper.selectDictDataByType(data.getDictType()); + return dictDataMapper.selectDictDataByType(data.getDictType()); } throw new ServiceException("操作失败"); } @@ -149,7 +149,7 @@ public class SysDictDataServiceImpl implements ISysDictDataService { */ @Override public boolean checkDictDataUnique(SysDictDataBo dict) { - boolean exist = baseMapper.exists(new LambdaQueryWrapper() + boolean exist = dictDataMapper.exists(new LambdaQueryWrapper() .eq(SysDictData::getDictType, dict.getDictType()) .eq(SysDictData::getDictValue, dict.getDictValue()) .ne(ObjectUtil.isNotNull(dict.getDictCode()), SysDictData::getDictCode, dict.getDictCode())); 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 eb41afea7..5047bab30 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 @@ -41,7 +41,7 @@ import java.util.Map; @Service public class SysDictTypeServiceImpl implements ISysDictTypeService { - private final SysDictTypeMapper baseMapper; + private final SysDictTypeMapper dictTypeMapper; private final SysDictDataMapper dictDataMapper; /** @@ -54,7 +54,7 @@ public class SysDictTypeServiceImpl implements ISysDictTypeService { @Override public PageResult selectPageDictTypeList(SysDictTypeBo dictType, PageQuery pageQuery) { LambdaQueryWrapper lqw = buildQueryWrapper(dictType); - Page page = baseMapper.selectVoPage(pageQuery.build(), lqw); + Page page = dictTypeMapper.selectVoPage(pageQuery.build(), lqw); return PageResult.build(page.getRecords(), page.getTotal()); } @@ -67,7 +67,7 @@ public class SysDictTypeServiceImpl implements ISysDictTypeService { @Override public List selectDictTypeList(SysDictTypeBo dictType) { LambdaQueryWrapper lqw = buildQueryWrapper(dictType); - return baseMapper.selectVoList(lqw); + return dictTypeMapper.selectVoList(lqw); } private LambdaQueryWrapper buildQueryWrapper(SysDictTypeBo bo) { @@ -88,7 +88,7 @@ public class SysDictTypeServiceImpl implements ISysDictTypeService { */ @Override public List selectDictTypeAll() { - return baseMapper.selectVoList(); + return dictTypeMapper.selectVoList(); } /** @@ -112,7 +112,7 @@ public class SysDictTypeServiceImpl implements ISysDictTypeService { */ @Override public SysDictTypeVo selectDictTypeById(Long dictId) { - return baseMapper.selectVoById(dictId); + return dictTypeMapper.selectVoById(dictId); } /** @@ -124,7 +124,7 @@ public class SysDictTypeServiceImpl implements ISysDictTypeService { @Cacheable(cacheNames = CacheNames.SYS_DICT_TYPE, key = "#dictType") @Override public SysDictTypeVo selectDictTypeByType(String dictType) { - return baseMapper.selectVoOne(new LambdaQueryWrapper().eq(SysDictType::getDictType, dictType)); + return dictTypeMapper.lambda().eq(SysDictType::getDictType, dictType).voOne(); } /** @@ -134,7 +134,7 @@ public class SysDictTypeServiceImpl implements ISysDictTypeService { */ @Override public void deleteDictTypeByIds(List dictIds) { - List list = baseMapper.selectByIds(dictIds); + List list = dictTypeMapper.selectByIds(dictIds); list.forEach(x -> { boolean assigned = dictDataMapper.exists(new LambdaQueryWrapper() .eq(SysDictData::getDictType, x.getDictType())); @@ -142,7 +142,7 @@ public class SysDictTypeServiceImpl implements ISysDictTypeService { throw new ServiceException("{}已分配,不能删除", x.getDictName()); } }); - baseMapper.deleteByIds(dictIds); + dictTypeMapper.deleteByIds(dictIds); list.forEach(x -> { CacheUtils.evict(CacheNames.SYS_DICT, x.getDictType()); CacheUtils.evict(CacheNames.SYS_DICT_TYPE, x.getDictType()); @@ -168,7 +168,7 @@ public class SysDictTypeServiceImpl implements ISysDictTypeService { @Override public List insertDictType(SysDictTypeBo bo) { SysDictType dict = MapstructUtils.convert(bo, SysDictType.class); - int row = baseMapper.insert(dict); + int row = dictTypeMapper.insert(dict); if (row > 0) { // 新增 type 下无 data 数据 返回空防止缓存穿透 return new ArrayList<>(); @@ -187,11 +187,11 @@ public class SysDictTypeServiceImpl implements ISysDictTypeService { @Transactional(rollbackFor = Exception.class) public List updateDictType(SysDictTypeBo bo) { SysDictType dict = MapstructUtils.convert(bo, SysDictType.class); - SysDictType oldDict = baseMapper.selectById(dict.getDictId()); + SysDictType oldDict = dictTypeMapper.selectById(dict.getDictId()); dictDataMapper.update(null, new LambdaUpdateWrapper() .set(SysDictData::getDictType, dict.getDictType()) .eq(SysDictData::getDictType, oldDict.getDictType())); - int row = baseMapper.updateById(dict); + int row = dictTypeMapper.updateById(dict); if (row > 0) { CacheUtils.evict(CacheNames.SYS_DICT, oldDict.getDictType()); return dictDataMapper.selectDictDataByType(dict.getDictType()); @@ -207,7 +207,7 @@ public class SysDictTypeServiceImpl implements ISysDictTypeService { */ @Override public boolean checkDictTypeUnique(SysDictTypeBo dictType) { - boolean exist = baseMapper.exists(new LambdaQueryWrapper() + boolean exist = dictTypeMapper.exists(new LambdaQueryWrapper() .eq(SysDictType::getDictType, dictType.getDictType()) .ne(ObjectUtil.isNotNull(dictType.getDictId()), SysDictType::getDictId, dictType.getDictId())); return !exist; diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysLoginInfoServiceImpl.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysLoginInfoServiceImpl.java index 92660af20..d13e15077 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysLoginInfoServiceImpl.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysLoginInfoServiceImpl.java @@ -30,7 +30,7 @@ import java.util.Map; @Service public class SysLoginInfoServiceImpl implements ISysLoginInfoService { - private final SysLoginInfoMapper baseMapper; + private final SysLoginInfoMapper loginInfoMapper; /** * 分页查询登录日志列表 @@ -51,7 +51,7 @@ public class SysLoginInfoServiceImpl implements ISysLoginInfoService { if (StringUtils.isBlank(pageQuery.getOrderByColumn())) { lqw.orderByDesc(SysLoginInfo::getInfoId); } - Page page = baseMapper.selectVoPage(pageQuery.build(), lqw); + Page page = loginInfoMapper.selectVoPage(pageQuery.build(), lqw); return PageResult.build(page.getRecords(), page.getTotal()); } @@ -64,7 +64,7 @@ public class SysLoginInfoServiceImpl implements ISysLoginInfoService { public void insertLoginInfo(SysLoginInfoBo bo) { SysLoginInfo loginInfo = MapstructUtils.convert(bo, SysLoginInfo.class); loginInfo.setLoginTime(LocalDateTime.now()); - baseMapper.insert(loginInfo); + loginInfoMapper.insert(loginInfo); } /** @@ -76,7 +76,7 @@ public class SysLoginInfoServiceImpl implements ISysLoginInfoService { @Override public List selectLoginInfoList(SysLoginInfoBo loginInfo) { Map params = loginInfo.getParams(); - return baseMapper.selectVoList(new LambdaQueryWrapper() + return loginInfoMapper.selectVoList(new LambdaQueryWrapper() .like(StringUtils.isNotBlank(loginInfo.getIpaddr()), SysLoginInfo::getIpaddr, loginInfo.getIpaddr()) .eq(StringUtils.isNotBlank(loginInfo.getStatus()), SysLoginInfo::getStatus, loginInfo.getStatus()) .like(StringUtils.isNotBlank(loginInfo.getUserName()), SysLoginInfo::getUserName, loginInfo.getUserName()) @@ -93,7 +93,7 @@ public class SysLoginInfoServiceImpl implements ISysLoginInfoService { */ @Override public int deleteLoginInfoByIds(Long[] infoIds) { - return baseMapper.deleteByIds(Arrays.asList(infoIds)); + return loginInfoMapper.deleteByIds(Arrays.asList(infoIds)); } /** @@ -101,6 +101,6 @@ public class SysLoginInfoServiceImpl implements ISysLoginInfoService { */ @Override public void cleanLoginInfo() { - baseMapper.delete(new LambdaQueryWrapper<>()); + loginInfoMapper.delete(new LambdaQueryWrapper<>()); } } diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysMenuServiceImpl.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysMenuServiceImpl.java index 44b19e7ef..be10282ac 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysMenuServiceImpl.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysMenuServiceImpl.java @@ -38,7 +38,7 @@ import java.util.*; @Service public class SysMenuServiceImpl implements ISysMenuService { - private final SysMenuMapper baseMapper; + private final SysMenuMapper menuMapper; private final SysRoleMapper roleMapper; private final SysRoleMenuMapper roleMenuMapper; @@ -64,7 +64,7 @@ public class SysMenuServiceImpl implements ISysMenuService { public List selectMenuList(SysMenuBo menu, Long userId) { // 管理员显示所有菜单信息 不是管理员 按用户id过滤菜单 if (LoginHelper.isSuperAdmin(userId)) { - return baseMapper.selectVoList( + return menuMapper.selectVoList( new LambdaQueryWrapper() .like(StringUtils.isNotBlank(menu.getMenuName()), SysMenu::getMenuName, menu.getMenuName()) .eq(StringUtils.isNotBlank(menu.getVisible()), SysMenu::getVisible, menu.getVisible()) @@ -74,7 +74,7 @@ public class SysMenuServiceImpl implements ISysMenuService { .orderByAsc(SysMenu::getParentId) .orderByAsc(SysMenu::getOrderNum)); } - return baseMapper.selectMenuListByUserId(menu, userId); + return menuMapper.selectMenuListByUserId(menu, userId); } /** @@ -85,7 +85,7 @@ public class SysMenuServiceImpl implements ISysMenuService { */ @Override public Set selectMenuPermsByUserId(Long userId) { - return baseMapper.selectMenuPermsByUserId(userId); + return menuMapper.selectMenuPermsByUserId(userId); } /** @@ -96,7 +96,7 @@ public class SysMenuServiceImpl implements ISysMenuService { */ @Override public Set selectMenuPermsByRoleId(Long roleId) { - return baseMapper.selectMenuPermsByRoleId(roleId); + return menuMapper.selectMenuPermsByRoleId(roleId); } /** @@ -107,7 +107,7 @@ public class SysMenuServiceImpl implements ISysMenuService { */ @Override public Map> selectMenuPermsByRoleIds(Collection roleIds) { - return baseMapper.selectMenuPermsByRoleIds(roleIds); + return menuMapper.selectMenuPermsByRoleIds(roleIds); } /** @@ -120,9 +120,9 @@ public class SysMenuServiceImpl implements ISysMenuService { public List selectMenuTreeByUserId(Long userId) { List menus; if (LoginHelper.isSuperAdmin(userId)) { - menus = baseMapper.selectMenuTreeAll(); + menus = menuMapper.selectMenuTreeAll(); } else { - menus = baseMapper.selectMenuTreeByUserId(userId); + menus = menuMapper.selectMenuTreeByUserId(userId); } return TreeBuildUtils.build(menus, Constants.TOP_PARENT_ID, SysMenu::getParentId, (menu, nodeTreeMaps) -> { @@ -146,7 +146,7 @@ public class SysMenuServiceImpl implements ISysMenuService { @Override public List selectMenuListByRoleId(Long roleId) { SysRole role = roleMapper.selectById(roleId); - return baseMapper.selectMenuListByRoleId(roleId, role.getMenuCheckStrictly()); + return menuMapper.selectMenuListByRoleId(roleId, role.getMenuCheckStrictly()); } /** @@ -235,7 +235,7 @@ public class SysMenuServiceImpl implements ISysMenuService { */ @Override public SysMenuVo selectMenuById(Long menuId) { - return baseMapper.selectVoById(menuId); + return menuMapper.selectVoById(menuId); } /** @@ -246,7 +246,7 @@ public class SysMenuServiceImpl implements ISysMenuService { */ @Override public boolean hasChildByMenuId(Long menuId) { - return baseMapper.exists(new LambdaQueryWrapper().eq(SysMenu::getParentId, menuId)); + return menuMapper.lambda().eq(SysMenu::getParentId, menuId).exists(); } /** @@ -257,7 +257,7 @@ public class SysMenuServiceImpl implements ISysMenuService { */ @Override public boolean hasChildByMenuId(Collection menuIds) { - return baseMapper.exists(new LambdaQueryWrapper().in(SysMenu::getParentId, menuIds).notIn(SysMenu::getMenuId, menuIds)); + return menuMapper.exists(new LambdaQueryWrapper().in(SysMenu::getParentId, menuIds).notIn(SysMenu::getMenuId, menuIds)); } /** @@ -268,7 +268,7 @@ public class SysMenuServiceImpl implements ISysMenuService { */ @Override public boolean checkMenuExistRole(Long menuId) { - return roleMenuMapper.exists(new LambdaQueryWrapper().eq(SysRoleMenu::getMenuId, menuId)); + return roleMenuMapper.lambda().eq(SysRoleMenu::getMenuId, menuId).exists(); } /** @@ -280,7 +280,7 @@ public class SysMenuServiceImpl implements ISysMenuService { @Override public int insertMenu(SysMenuBo bo) { SysMenu menu = MapstructUtils.convert(bo, SysMenu.class); - return baseMapper.insert(menu); + return menuMapper.insert(menu); } /** @@ -292,7 +292,7 @@ public class SysMenuServiceImpl implements ISysMenuService { @Override public int updateMenu(SysMenuBo bo) { SysMenu menu = MapstructUtils.convert(bo, SysMenu.class); - return baseMapper.updateById(menu); + return menuMapper.updateById(menu); } /** @@ -303,7 +303,7 @@ public class SysMenuServiceImpl implements ISysMenuService { */ @Override public int deleteMenuById(Long menuId) { - return baseMapper.deleteById(menuId); + return menuMapper.deleteById(menuId); } /** @@ -314,7 +314,7 @@ public class SysMenuServiceImpl implements ISysMenuService { @Override @Transactional(rollbackFor = Exception.class) public void deleteMenuById(Collection menuIds) { - baseMapper.deleteByIds(menuIds); + menuMapper.deleteByIds(menuIds); roleMenuMapper.deleteByMenuIds(menuIds); } @@ -326,7 +326,7 @@ public class SysMenuServiceImpl implements ISysMenuService { */ @Override public boolean checkMenuNameUnique(SysMenuBo menu) { - boolean exist = baseMapper.exists(new LambdaQueryWrapper() + boolean exist = menuMapper.exists(new LambdaQueryWrapper() .eq(SysMenu::getMenuName, menu.getMenuName()) .eq(SysMenu::getParentId, menu.getParentId()) .ne(ObjectUtil.isNotNull(menu.getMenuId()), SysMenu::getMenuId, menu.getMenuId())); @@ -349,7 +349,7 @@ public class SysMenuServiceImpl implements ISysMenuService { Long parentId = menu.getParentId(); String path = menu.getPath(); String routeName = StringUtils.isEmpty(menu.getRouteName()) ? path : menu.getRouteName(); - List sysMenuList = baseMapper.selectList( + List sysMenuList = menuMapper.selectList( new LambdaQueryWrapper() .in(SysMenu::getMenuType, SystemConstants.TYPE_DIR, SystemConstants.TYPE_MENU) .and(w -> diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysNoticeServiceImpl.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysNoticeServiceImpl.java index 90b0b1e68..21899cd20 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysNoticeServiceImpl.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysNoticeServiceImpl.java @@ -31,7 +31,7 @@ import java.util.List; @Service public class SysNoticeServiceImpl implements ISysNoticeService { - private final SysNoticeMapper baseMapper; + private final SysNoticeMapper noticeMapper; private final SysUserMapper userMapper; /** @@ -44,7 +44,7 @@ public class SysNoticeServiceImpl implements ISysNoticeService { @Override public PageResult selectPageNoticeList(SysNoticeBo notice, PageQuery pageQuery) { LambdaQueryWrapper lqw = buildQueryWrapper(notice); - Page page = baseMapper.selectVoPage(pageQuery.build(), lqw); + Page page = noticeMapper.selectVoPage(pageQuery.build(), lqw); return PageResult.build(page.getRecords(), page.getTotal()); } @@ -56,7 +56,7 @@ public class SysNoticeServiceImpl implements ISysNoticeService { */ @Override public SysNoticeVo selectNoticeById(Long noticeId) { - return baseMapper.selectVoById(noticeId); + return noticeMapper.selectVoById(noticeId); } /** @@ -68,7 +68,7 @@ public class SysNoticeServiceImpl implements ISysNoticeService { @Override public List selectNoticeList(SysNoticeBo notice) { LambdaQueryWrapper lqw = buildQueryWrapper(notice); - return baseMapper.selectVoList(lqw); + return noticeMapper.selectVoList(lqw); } private LambdaQueryWrapper buildQueryWrapper(SysNoticeBo bo) { @@ -76,7 +76,9 @@ public class SysNoticeServiceImpl implements ISysNoticeService { lqw.like(StringUtils.isNotBlank(bo.getNoticeTitle()), SysNotice::getNoticeTitle, bo.getNoticeTitle()); lqw.eq(StringUtils.isNotBlank(bo.getNoticeType()), SysNotice::getNoticeType, bo.getNoticeType()); if (StringUtils.isNotBlank(bo.getCreateByName())) { - SysUserVo sysUser = userMapper.selectVoOne(new LambdaQueryWrapper().eq(SysUser::getUserName, bo.getCreateByName())); + SysUserVo sysUser = userMapper.lambda() + .eq(SysUser::getUserName, bo.getCreateByName()) + .voOne(); lqw.eq(SysNotice::getCreateBy, ObjectUtils.notNullGetter(sysUser, SysUserVo::getUserId)); } lqw.orderByAsc(SysNotice::getNoticeId); @@ -92,7 +94,7 @@ public class SysNoticeServiceImpl implements ISysNoticeService { @Override public int insertNotice(SysNoticeBo bo) { SysNotice notice = MapstructUtils.convert(bo, SysNotice.class); - int rows = baseMapper.insert(notice); + int rows = noticeMapper.insert(notice); bo.setNoticeId(notice.getNoticeId()); return rows; } @@ -106,7 +108,7 @@ public class SysNoticeServiceImpl implements ISysNoticeService { @Override public int updateNotice(SysNoticeBo bo) { SysNotice notice = MapstructUtils.convert(bo, SysNotice.class); - return baseMapper.updateById(notice); + return noticeMapper.updateById(notice); } /** @@ -117,7 +119,7 @@ public class SysNoticeServiceImpl implements ISysNoticeService { */ @Override public int deleteNoticeById(Long noticeId) { - return baseMapper.deleteById(noticeId); + return noticeMapper.deleteById(noticeId); } /** @@ -128,6 +130,6 @@ public class SysNoticeServiceImpl implements ISysNoticeService { */ @Override public int deleteNoticeByIds(Long[] noticeIds) { - return baseMapper.deleteByIds(Arrays.asList(noticeIds)); + return noticeMapper.deleteByIds(Arrays.asList(noticeIds)); } } diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysOperLogServiceImpl.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysOperLogServiceImpl.java index cf80c09a4..d832ac35e 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysOperLogServiceImpl.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysOperLogServiceImpl.java @@ -29,7 +29,7 @@ import java.util.Map; @Service public class SysOperLogServiceImpl implements ISysOperLogService { - private final SysOperLogMapper baseMapper; + private final SysOperLogMapper operLogMapper; /** * 分页查询操作日志列表 @@ -44,7 +44,7 @@ public class SysOperLogServiceImpl implements ISysOperLogService { if (StringUtils.isBlank(pageQuery.getOrderByColumn())) { lqw.orderByDesc(SysOperLog::getOperId); } - Page page = baseMapper.selectVoPage(pageQuery.build(), lqw); + Page page = operLogMapper.selectVoPage(pageQuery.build(), lqw); return PageResult.build(page.getRecords(), page.getTotal()); } @@ -82,7 +82,7 @@ public class SysOperLogServiceImpl implements ISysOperLogService { public void insertOperlog(SysOperLogBo bo) { SysOperLog operLog = MapstructUtils.convert(bo, SysOperLog.class); operLog.setOperTime(LocalDateTime.now()); - baseMapper.insert(operLog); + operLogMapper.insert(operLog); } /** @@ -94,7 +94,7 @@ public class SysOperLogServiceImpl implements ISysOperLogService { @Override public List selectOperLogList(SysOperLogBo operLog) { LambdaQueryWrapper lqw = buildQueryWrapper(operLog); - return baseMapper.selectVoList(lqw.orderByDesc(SysOperLog::getOperId)); + return operLogMapper.selectVoList(lqw.orderByDesc(SysOperLog::getOperId)); } /** @@ -105,7 +105,7 @@ public class SysOperLogServiceImpl implements ISysOperLogService { */ @Override public int deleteOperLogByIds(Long[] operIds) { - return baseMapper.deleteByIds(Arrays.asList(operIds)); + return operLogMapper.deleteByIds(Arrays.asList(operIds)); } /** @@ -116,7 +116,7 @@ public class SysOperLogServiceImpl implements ISysOperLogService { */ @Override public SysOperLogVo selectOperLogById(Long operId) { - return baseMapper.selectVoById(operId); + return operLogMapper.selectVoById(operId); } /** @@ -124,6 +124,6 @@ public class SysOperLogServiceImpl implements ISysOperLogService { */ @Override public void cleanOperLog() { - baseMapper.delete(new LambdaQueryWrapper<>()); + operLogMapper.delete(new LambdaQueryWrapper<>()); } } 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 72898d9dd..0095f3911 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 @@ -35,7 +35,7 @@ import java.util.Map; @Service public class SysPostServiceImpl implements ISysPostService { - private final SysPostMapper baseMapper; + private final SysPostMapper postMapper; private final SysDeptMapper deptMapper; private final SysUserPostMapper userPostMapper; @@ -48,7 +48,7 @@ public class SysPostServiceImpl implements ISysPostService { */ @Override public PageResult selectPagePostList(SysPostBo post, PageQuery pageQuery) { - Page page = baseMapper.selectPagePostList(pageQuery.build(), buildQueryWrapper(post)); + Page page = postMapper.selectPagePostList(pageQuery.build(), buildQueryWrapper(post)); return PageResult.build(page.getRecords(), page.getTotal()); } @@ -60,7 +60,7 @@ public class SysPostServiceImpl implements ISysPostService { */ @Override public List selectPostList(SysPostBo post) { - return baseMapper.selectVoList(buildQueryWrapper(post)); + return postMapper.selectVoList(buildQueryWrapper(post)); } /** @@ -71,7 +71,7 @@ public class SysPostServiceImpl implements ISysPostService { */ @Override public List selectPostsByUserId(Long userId) { - return baseMapper.selectPostsByUserId(userId); + return postMapper.selectPostsByUserId(userId); } /** @@ -110,7 +110,7 @@ public class SysPostServiceImpl implements ISysPostService { */ @Override public List selectPostAll() { - return baseMapper.selectVoList(new QueryWrapper<>()); + return postMapper.selectVoList(new QueryWrapper<>()); } /** @@ -121,7 +121,7 @@ public class SysPostServiceImpl implements ISysPostService { */ @Override public SysPostVo selectPostById(Long postId) { - return baseMapper.selectVoById(postId); + return postMapper.selectVoById(postId); } /** @@ -132,7 +132,7 @@ public class SysPostServiceImpl implements ISysPostService { */ @Override public List selectPostListByUserId(Long userId) { - List list = baseMapper.selectPostsByUserId(userId); + List list = postMapper.selectPostsByUserId(userId); return StreamUtils.toList(list, SysPostVo::getPostId); } @@ -144,7 +144,7 @@ public class SysPostServiceImpl implements ISysPostService { */ @Override public List selectPostByIds(List postIds) { - return baseMapper.selectVoList(new LambdaQueryWrapper() + return postMapper.selectVoList(new LambdaQueryWrapper() .select(SysPost::getPostId, SysPost::getPostName, SysPost::getPostCode) .eq(SysPost::getStatus, SystemConstants.NORMAL) .in(CollUtil.isNotEmpty(postIds), SysPost::getPostId, postIds)); @@ -158,7 +158,7 @@ public class SysPostServiceImpl implements ISysPostService { */ @Override public boolean checkPostNameUnique(SysPostBo post) { - boolean exist = baseMapper.exists(new LambdaQueryWrapper() + boolean exist = postMapper.exists(new LambdaQueryWrapper() .eq(SysPost::getPostName, post.getPostName()) .eq(SysPost::getDeptId, post.getDeptId()) .ne(ObjectUtil.isNotNull(post.getPostId()), SysPost::getPostId, post.getPostId())); @@ -173,7 +173,7 @@ public class SysPostServiceImpl implements ISysPostService { */ @Override public boolean checkPostCodeUnique(SysPostBo post) { - boolean exist = baseMapper.exists(new LambdaQueryWrapper() + boolean exist = postMapper.exists(new LambdaQueryWrapper() .eq(SysPost::getPostCode, post.getPostCode()) .ne(ObjectUtil.isNotNull(post.getPostId()), SysPost::getPostId, post.getPostId())); return !exist; @@ -187,7 +187,7 @@ public class SysPostServiceImpl implements ISysPostService { */ @Override public long countUserPostById(Long postId) { - return userPostMapper.selectCount(new LambdaQueryWrapper().eq(SysUserPost::getPostId, postId)); + return userPostMapper.lambda().eq(SysUserPost::getPostId, postId).count(); } /** @@ -198,7 +198,7 @@ public class SysPostServiceImpl implements ISysPostService { */ @Override public long countPostByDeptId(Long deptId) { - return baseMapper.selectCount(new LambdaQueryWrapper().eq(SysPost::getDeptId, deptId)); + return postMapper.lambda().eq(SysPost::getDeptId, deptId).count(); } /** @@ -209,7 +209,7 @@ public class SysPostServiceImpl implements ISysPostService { */ @Override public int deletePostById(Long postId) { - return baseMapper.deleteById(postId); + return postMapper.deleteById(postId); } /** @@ -220,13 +220,13 @@ public class SysPostServiceImpl implements ISysPostService { */ @Override public int deletePostByIds(List postIds) { - List list = baseMapper.selectByIds(postIds); + List list = postMapper.selectByIds(postIds); for (SysPost post : list) { if (this.countUserPostById(post.getPostId()) > 0) { throw new ServiceException("{}已分配，不能删除!", post.getPostName()); } } - return baseMapper.deleteByIds(postIds); + return postMapper.deleteByIds(postIds); } /** @@ -238,7 +238,7 @@ public class SysPostServiceImpl implements ISysPostService { @Override public int insertPost(SysPostBo bo) { SysPost post = MapstructUtils.convert(bo, SysPost.class); - return baseMapper.insert(post); + return postMapper.insert(post); } /** @@ -250,6 +250,6 @@ public class SysPostServiceImpl implements ISysPostService { @Override public int updatePost(SysPostBo bo) { SysPost post = MapstructUtils.convert(bo, SysPost.class); - return baseMapper.updateById(post); + return postMapper.updateById(post); } } 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 52aa30688..6c417bbb9 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 @@ -47,7 +47,7 @@ import java.util.*; @Service public class SysRoleServiceImpl implements ISysRoleService { - private final SysRoleMapper baseMapper; + private final SysRoleMapper roleMapper; private final SysRoleMenuMapper roleMenuMapper; private final SysUserRoleMapper userRoleMapper; private final SysRoleDeptMapper roleDeptMapper; @@ -61,7 +61,7 @@ public class SysRoleServiceImpl implements ISysRoleService { */ @Override public PageResult selectPageRoleList(SysRoleBo role, PageQuery pageQuery) { - Page page = baseMapper.selectPageRoleList(pageQuery.build(), this.buildQueryWrapper(role)); + Page page = roleMapper.selectPageRoleList(pageQuery.build(), this.buildQueryWrapper(role)); return PageResult.build(page.getRecords(), page.getTotal()); } @@ -73,7 +73,7 @@ public class SysRoleServiceImpl implements ISysRoleService { */ @Override public List selectRoleList(SysRoleBo role) { - return baseMapper.selectRoleList(this.buildQueryWrapper(role)); + return roleMapper.selectRoleList(this.buildQueryWrapper(role)); } private Wrapper buildQueryWrapper(SysRoleBo bo) { @@ -97,7 +97,7 @@ public class SysRoleServiceImpl implements ISysRoleService { */ @Override public List selectRolesByUserId(Long userId) { - return baseMapper.selectRolesByUserId(userId); + return roleMapper.selectRolesByUserId(userId); } /** @@ -108,7 +108,7 @@ public class SysRoleServiceImpl implements ISysRoleService { */ @Override public List selectRolesAuthByUserId(Long userId) { - List userRoles = baseMapper.selectRolesByUserId(userId); + List userRoles = roleMapper.selectRolesByUserId(userId); List roles = selectRoleAll(); // 使用HashSet提高查找效率 Set userRoleIds = StreamUtils.toSet(userRoles, SysRoleVo::getRoleId); @@ -128,7 +128,7 @@ public class SysRoleServiceImpl implements ISysRoleService { */ @Override public Set selectRolePermissionByUserId(Long userId) { - List perms = baseMapper.selectRolesByUserId(userId); + List perms = roleMapper.selectRolesByUserId(userId); Set permsSet = new HashSet<>(); for (SysRoleVo perm : perms) { if (ObjectUtil.isNotNull(perm)) { @@ -156,7 +156,7 @@ public class SysRoleServiceImpl implements ISysRoleService { */ @Override public List selectRoleListByUserId(Long userId) { - List list = baseMapper.selectRolesByUserId(userId); + List list = roleMapper.selectRolesByUserId(userId); return StreamUtils.toList(list, SysRoleVo::getRoleId); } @@ -168,7 +168,7 @@ public class SysRoleServiceImpl implements ISysRoleService { */ @Override public SysRoleVo selectRoleById(Long roleId) { - return baseMapper.selectRoleById(roleId); + return roleMapper.selectRoleById(roleId); } /** @@ -179,7 +179,7 @@ public class SysRoleServiceImpl implements ISysRoleService { */ @Override public List selectRoleByIds(List roleIds) { - return baseMapper.selectRoleList(new LambdaQueryWrapper() + return roleMapper.selectRoleList(new LambdaQueryWrapper() .eq(SysRole::getStatus, SystemConstants.NORMAL) .in(CollUtil.isNotEmpty(roleIds), SysRole::getRoleId, roleIds)); } @@ -192,7 +192,7 @@ public class SysRoleServiceImpl implements ISysRoleService { */ @Override public boolean checkRoleNameUnique(SysRoleBo role) { - boolean exist = baseMapper.exists(new LambdaQueryWrapper() + boolean exist = roleMapper.exists(new LambdaQueryWrapper() .eq(SysRole::getRoleName, role.getRoleName()) .ne(ObjectUtil.isNotNull(role.getRoleId()), SysRole::getRoleId, role.getRoleId())); return !exist; @@ -206,7 +206,7 @@ public class SysRoleServiceImpl implements ISysRoleService { */ @Override public boolean checkRoleKeyUnique(SysRoleBo role) { - boolean exist = baseMapper.exists(new LambdaQueryWrapper() + boolean exist = roleMapper.exists(new LambdaQueryWrapper() .eq(SysRole::getRoleKey, role.getRoleKey()) .ne(ObjectUtil.isNotNull(role.getRoleId()), SysRole::getRoleId, role.getRoleId())); return !exist; @@ -230,7 +230,7 @@ public class SysRoleServiceImpl implements ISysRoleService { } // 修改不允许修改 管理员标识符 if (ObjectUtil.isNotNull(role.getRoleId())) { - SysRole sysRole = baseMapper.selectById(role.getRoleId()); + SysRole sysRole = roleMapper.selectById(role.getRoleId()); // 如果标识符不相等 判断为修改了管理员标识符 if (!StringUtils.equals(sysRole.getRoleKey(), role.getRoleKey())) { if (StringUtils.equalsAny(sysRole.getRoleKey(), keys)) { @@ -265,7 +265,7 @@ public class SysRoleServiceImpl implements ISysRoleService { if (CollUtil.isEmpty(roleIds) || LoginHelper.isSuperAdmin()) { return; } - long count = baseMapper.selectRoleCount(roleIds); + long count = roleMapper.selectRoleCount(roleIds); if (count != roleIds.size()) { throw new ServiceException("没有权限访问部分角色数据！"); } @@ -279,7 +279,7 @@ public class SysRoleServiceImpl implements ISysRoleService { */ @Override public long countUserRoleByRoleId(Long roleId) { - return userRoleMapper.selectCount(new LambdaQueryWrapper().eq(SysUserRole::getRoleId, roleId)); + return userRoleMapper.lambda().eq(SysUserRole::getRoleId, roleId).count(); } /** @@ -293,7 +293,7 @@ public class SysRoleServiceImpl implements ISysRoleService { public int insertRole(SysRoleBo bo) { SysRole role = MapstructUtils.convert(bo, SysRole.class); // 新增角色信息 - baseMapper.insert(role); + roleMapper.insert(role); bo.setRoleId(role.getRoleId()); return insertRoleMenu(bo); } @@ -313,7 +313,7 @@ public class SysRoleServiceImpl implements ISysRoleService { throw new ServiceException("角色已分配，不能禁用!"); } // 仅更新角色基础字段，避免影响权限分配。 - return baseMapper.updateById(role); + return roleMapper.updateById(role); } /** @@ -328,12 +328,12 @@ public class SysRoleServiceImpl implements ISysRoleService { public int updateRolePermission(SysRoleBo bo) { SysRole role = MapstructUtils.convert(bo, SysRole.class); // 更新权限相关配置字段（数据范围、树联动）。 - baseMapper.updateById(role); + roleMapper.updateById(role); // 先清理旧菜单权限，再重建。 - roleMenuMapper.delete(new LambdaQueryWrapper().eq(SysRoleMenu::getRoleId, role.getRoleId())); + roleMenuMapper.lambda().eq(SysRoleMenu::getRoleId, role.getRoleId()).deleteCount(); insertRoleMenu(bo); // 先清理旧数据权限，再按当前配置重建。 - roleDeptMapper.delete(new LambdaQueryWrapper().eq(SysRoleDept::getRoleId, role.getRoleId())); + roleDeptMapper.lambda().eq(SysRoleDept::getRoleId, role.getRoleId()).deleteCount(); return insertRoleDept(bo); } @@ -349,7 +349,7 @@ public class SysRoleServiceImpl implements ISysRoleService { if (SystemConstants.DISABLE.equals(status) && this.countUserRoleByRoleId(roleId) > 0) { throw new ServiceException("角色已分配，不能禁用!"); } - return baseMapper.update(null, + return roleMapper.update(null, new LambdaUpdateWrapper() .set(SysRole::getStatus, status) .eq(SysRole::getRoleId, roleId)); @@ -408,10 +408,10 @@ public class SysRoleServiceImpl implements ISysRoleService { @Transactional(rollbackFor = Exception.class) public int deleteRoleById(Long roleId) { // 删除角色与菜单关联 - roleMenuMapper.delete(new LambdaQueryWrapper().eq(SysRoleMenu::getRoleId, roleId)); + roleMenuMapper.lambda().eq(SysRoleMenu::getRoleId, roleId).deleteCount(); // 删除角色与部门关联 - roleDeptMapper.delete(new LambdaQueryWrapper().eq(SysRoleDept::getRoleId, roleId)); - return baseMapper.deleteById(roleId); + roleDeptMapper.lambda().eq(SysRoleDept::getRoleId, roleId).deleteCount(); + return roleMapper.deleteById(roleId); } /** @@ -425,7 +425,7 @@ public class SysRoleServiceImpl implements ISysRoleService { @Transactional(rollbackFor = Exception.class) public int deleteRoleByIds(List roleIds) { checkRoleDataScope(roleIds); - List roles = baseMapper.selectByIds(roleIds); + List roles = roleMapper.selectByIds(roleIds); for (SysRole role : roles) { checkRoleAllowed(BeanUtil.toBean(role, SysRoleBo.class)); if (countUserRoleByRoleId(role.getRoleId()) > 0) { @@ -436,7 +436,7 @@ public class SysRoleServiceImpl implements ISysRoleService { roleMenuMapper.delete(new LambdaQueryWrapper().in(SysRoleMenu::getRoleId, roleIds)); // 删除角色与部门关联 roleDeptMapper.delete(new LambdaQueryWrapper().in(SysRoleDept::getRoleId, roleIds)); - return baseMapper.deleteByIds(roleIds); + return roleMapper.deleteByIds(roleIds); } /** @@ -525,7 +525,7 @@ public class SysRoleServiceImpl implements ISysRoleService { @Override public void cleanOnlineUserByRole(Long roleId) { // 如果角色未绑定用户 直接返回 - Long num = userRoleMapper.selectCount(new LambdaQueryWrapper().eq(SysUserRole::getRoleId, roleId)); + Long num = userRoleMapper.lambda().eq(SysUserRole::getRoleId, roleId).count(); if (num == 0) { return; } diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysSocialServiceImpl.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysSocialServiceImpl.java index 365045ceb..278c28142 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysSocialServiceImpl.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysSocialServiceImpl.java @@ -24,7 +24,7 @@ import java.util.List; @Service public class SysSocialServiceImpl implements ISysSocialService { - private final SysSocialMapper baseMapper; + private final SysSocialMapper socialMapper; /** * 根据ID查询社会化关系 @@ -34,7 +34,7 @@ public class SysSocialServiceImpl implements ISysSocialService { */ @Override public SysSocialVo queryById(String id) { - return baseMapper.selectVoById(id); + return socialMapper.selectVoById(id); } /** @@ -49,7 +49,7 @@ public class SysSocialServiceImpl implements ISysSocialService { .eq(ObjectUtil.isNotNull(bo.getUserId()), SysSocial::getUserId, bo.getUserId()) .eq(StringUtils.isNotBlank(bo.getAuthId()), SysSocial::getAuthId, bo.getAuthId()) .eq(StringUtils.isNotBlank(bo.getSource()), SysSocial::getSource, bo.getSource()); - return baseMapper.selectVoList(lqw); + return socialMapper.selectVoList(lqw); } /** @@ -60,7 +60,7 @@ public class SysSocialServiceImpl implements ISysSocialService { */ @Override public List queryListByUserId(Long userId) { - return baseMapper.selectVoList(new LambdaQueryWrapper().eq(SysSocial::getUserId, userId)); + return socialMapper.selectVoList(new LambdaQueryWrapper().eq(SysSocial::getUserId, userId)); } /** @@ -73,7 +73,7 @@ public class SysSocialServiceImpl implements ISysSocialService { public Boolean insertByBo(SysSocialBo bo) { SysSocial add = MapstructUtils.convert(bo, SysSocial.class); validEntityBeforeSave(add); - boolean flag = baseMapper.insert(add) > 0; + boolean flag = socialMapper.insert(add) > 0; if (flag) { if (add != null) { bo.setId(add.getId()); @@ -94,7 +94,7 @@ public class SysSocialServiceImpl implements ISysSocialService { public Boolean updateByBo(SysSocialBo bo) { SysSocial update = MapstructUtils.convert(bo, SysSocial.class); validEntityBeforeSave(update); - return baseMapper.updateById(update) > 0; + return socialMapper.updateById(update) > 0; } /** @@ -112,7 +112,7 @@ public class SysSocialServiceImpl implements ISysSocialService { */ @Override public Boolean deleteWithValidById(Long id) { - return baseMapper.deleteById(id) > 0; + return socialMapper.deleteById(id) > 0; } /** @@ -123,7 +123,7 @@ public class SysSocialServiceImpl implements ISysSocialService { */ @Override public List selectByAuthId(String authId) { - return baseMapper.selectVoList(new LambdaQueryWrapper().eq(SysSocial::getAuthId, authId)); + return socialMapper.selectVoList(new LambdaQueryWrapper().eq(SysSocial::getAuthId, authId)); } } diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysUserServiceImpl.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysUserServiceImpl.java index 36e5ea3c6..71a1b56be 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysUserServiceImpl.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysUserServiceImpl.java @@ -45,7 +45,7 @@ import java.util.*; @Service public class SysUserServiceImpl implements ISysUserService { - private final SysUserMapper baseMapper; + private final SysUserMapper userMapper; private final SysDeptMapper deptMapper; private final SysRoleMapper roleMapper; private final SysPostMapper postMapper; @@ -54,7 +54,7 @@ public class SysUserServiceImpl implements ISysUserService { @Override public PageResult selectPageUserList(SysUserBo user, PageQuery pageQuery) { - Page page = baseMapper.selectPageUserList(pageQuery.build(), this.buildQueryWrapper(user)); + Page page = userMapper.selectPageUserList(pageQuery.build(), this.buildQueryWrapper(user)); return PageResult.build(page.getRecords(), page.getTotal()); } @@ -67,7 +67,7 @@ public class SysUserServiceImpl implements ISysUserService { @Override public List selectUserExportList(SysUserBo user) { List deptIds = ObjectUtil.isNotNull(user.getDeptId()) ? deptMapper.selectDeptAndChildById(user.getDeptId()) : null; - return baseMapper.selectUserExportList(user, deptIds); + return userMapper.selectUserExportList(user, deptIds); } private Wrapper buildQueryWrapper(SysUserBo user) { @@ -100,7 +100,7 @@ public class SysUserServiceImpl implements ISysUserService { */ @Override public PageResult selectAllocatedList(SysUserBo user, PageQuery pageQuery) { - Page page = baseMapper.selectAllocatedList(pageQuery.build(), user); + Page page = userMapper.selectAllocatedList(pageQuery.build(), user); return PageResult.build(page.getRecords(), page.getTotal()); } @@ -113,7 +113,7 @@ public class SysUserServiceImpl implements ISysUserService { @Override public PageResult selectUnallocatedList(SysUserBo user, PageQuery pageQuery) { List userIds = userRoleMapper.selectUserIdsByRoleId(user.getRoleId()); - Page page = baseMapper.selectUnallocatedList(pageQuery.build(), user, userIds); + Page page = userMapper.selectUnallocatedList(pageQuery.build(), user, userIds); return PageResult.build(page.getRecords(), page.getTotal()); } @@ -125,7 +125,7 @@ public class SysUserServiceImpl implements ISysUserService { */ @Override public SysUserVo selectUserByUserName(String userName) { - return baseMapper.selectVoOne(new LambdaQueryWrapper().eq(SysUser::getUserName, userName)); + return userMapper.lambda().eq(SysUser::getUserName, userName).voOne(); } /** @@ -136,7 +136,7 @@ public class SysUserServiceImpl implements ISysUserService { */ @Override public SysUserVo selectUserByPhoneNumber(String phoneNumber) { - return baseMapper.selectVoOne(new LambdaQueryWrapper().eq(SysUser::getPhoneNumber, phoneNumber)); + return userMapper.lambda().eq(SysUser::getPhoneNumber, phoneNumber).voOne(); } /** @@ -147,7 +147,7 @@ public class SysUserServiceImpl implements ISysUserService { */ @Override public SysUserVo selectUserById(Long userId) { - SysUserVo user = baseMapper.selectVoById(userId); + SysUserVo user = userMapper.selectVoById(userId); if (ObjectUtil.isNull(user)) { return user; } @@ -164,7 +164,7 @@ public class SysUserServiceImpl implements ISysUserService { */ @Override public List selectUserByIds(List userIds, Long deptId) { - return baseMapper.selectUserList(new LambdaQueryWrapper() + return userMapper.selectUserList(new LambdaQueryWrapper() .select(SysUser::getUserId, SysUser::getUserName, SysUser::getNickName, SysUser::getEmail, SysUser::getPhoneNumber) .eq(SysUser::getStatus, SystemConstants.NORMAL) .eq(ObjectUtil.isNotNull(deptId), SysUser::getDeptId, deptId) @@ -209,7 +209,7 @@ public class SysUserServiceImpl implements ISysUserService { */ @Override public boolean checkUserNameUnique(SysUserBo user) { - boolean exist = baseMapper.exists(new LambdaQueryWrapper() + boolean exist = userMapper.exists(new LambdaQueryWrapper() .eq(SysUser::getUserName, user.getUserName()) .ne(ObjectUtil.isNotNull(user.getUserId()), SysUser::getUserId, user.getUserId())); return !exist; @@ -222,7 +222,7 @@ public class SysUserServiceImpl implements ISysUserService { */ @Override public boolean checkPhoneUnique(SysUserBo user) { - boolean exist = baseMapper.exists(new LambdaQueryWrapper() + boolean exist = userMapper.exists(new LambdaQueryWrapper() .eq(SysUser::getPhoneNumber, user.getPhoneNumber()) .ne(ObjectUtil.isNotNull(user.getUserId()), SysUser::getUserId, user.getUserId())); return !exist; @@ -235,7 +235,7 @@ public class SysUserServiceImpl implements ISysUserService { */ @Override public boolean checkEmailUnique(SysUserBo user) { - boolean exist = baseMapper.exists(new LambdaQueryWrapper() + boolean exist = userMapper.exists(new LambdaQueryWrapper() .eq(SysUser::getEmail, user.getEmail()) .ne(ObjectUtil.isNotNull(user.getUserId()), SysUser::getUserId, user.getUserId())); return !exist; @@ -266,7 +266,7 @@ public class SysUserServiceImpl implements ISysUserService { if (LoginHelper.isSuperAdmin()) { return; } - if (baseMapper.countUserById(userId) == 0) { + if (userMapper.countUserById(userId) == 0) { throw new ServiceException("没有权限访问用户数据！"); } } @@ -282,7 +282,7 @@ public class SysUserServiceImpl implements ISysUserService { public int insertUser(SysUserBo user) { SysUser sysUser = MapstructUtils.convert(user, SysUser.class); // 新增用户信息 - int rows = baseMapper.insert(sysUser); + int rows = userMapper.insert(sysUser); user.setUserId(sysUser.getUserId()); // 新增用户岗位关联 insertUserPost(user, false); @@ -302,7 +302,7 @@ public class SysUserServiceImpl implements ISysUserService { user.setCreateBy(0L); user.setUpdateBy(0L); SysUser sysUser = MapstructUtils.convert(user, SysUser.class); - return baseMapper.insert(sysUser) > 0; + return userMapper.insert(sysUser) > 0; } /** @@ -321,7 +321,7 @@ public class SysUserServiceImpl implements ISysUserService { insertUserPost(user, true); SysUser sysUser = MapstructUtils.convert(user, SysUser.class); // 防止错误更新后导致的数据误删除 - int flag = baseMapper.updateById(sysUser); + int flag = userMapper.updateById(sysUser); if (flag < 1) { throw new ServiceException("修改用户{}信息失败", user.getUserName()); } @@ -349,7 +349,7 @@ public class SysUserServiceImpl implements ISysUserService { */ @Override public int updateUserStatus(Long userId, String status) { - return baseMapper.update(null, + return userMapper.update(null, new LambdaUpdateWrapper() .set(SysUser::getStatus, status) .eq(SysUser::getUserId, userId)); @@ -364,7 +364,7 @@ public class SysUserServiceImpl implements ISysUserService { @CacheEvict(cacheNames = CacheNames.SYS_NICKNAME, key = "#user.userId") @Override public int updateUserProfile(SysUserBo user) { - return baseMapper.update(null, + return userMapper.update(null, new LambdaUpdateWrapper() .set(ObjectUtil.isNotNull(user.getNickName()), SysUser::getNickName, user.getNickName()) .set(SysUser::getPhoneNumber, user.getPhoneNumber()) @@ -382,7 +382,7 @@ public class SysUserServiceImpl implements ISysUserService { */ @Override public boolean updateUserAvatar(Long userId, Long avatar) { - return baseMapper.update(null, + return userMapper.update(null, new LambdaUpdateWrapper() .set(SysUser::getAvatar, avatar) .eq(SysUser::getUserId, userId)) > 0; @@ -397,7 +397,7 @@ public class SysUserServiceImpl implements ISysUserService { */ @Override public int resetUserPwd(Long userId, String password) { - return baseMapper.update(null, + return userMapper.update(null, new LambdaUpdateWrapper() .set(SysUser::getPassword, password) .eq(SysUser::getUserId, userId)); @@ -433,7 +433,7 @@ public class SysUserServiceImpl implements ISysUserService { // 是否清除旧的用户岗位绑定 if (clear) { - userPostMapper.delete(new LambdaQueryWrapper().eq(SysUserPost::getUserId, user.getUserId())); + userPostMapper.lambda().eq(SysUserPost::getUserId, user.getUserId()).deleteCount(); } // 构建用户岗位关联列表并批量插入 @@ -478,7 +478,7 @@ public class SysUserServiceImpl implements ISysUserService { // 是否清除原有绑定 if (clear) { - userRoleMapper.delete(new LambdaQueryWrapper().eq(SysUserRole::getUserId, userId)); + userRoleMapper.lambda().eq(SysUserRole::getUserId, userId).deleteCount(); } // 批量插入用户-角色关联 @@ -502,11 +502,11 @@ public class SysUserServiceImpl implements ISysUserService { @Transactional(rollbackFor = Exception.class) public int deleteUserById(Long userId) { // 删除用户与角色关联 - userRoleMapper.delete(new LambdaQueryWrapper().eq(SysUserRole::getUserId, userId)); + userRoleMapper.lambda().eq(SysUserRole::getUserId, userId).deleteCount(); // 删除用户与岗位表 - userPostMapper.delete(new LambdaQueryWrapper().eq(SysUserPost::getUserId, userId)); + userPostMapper.lambda().eq(SysUserPost::getUserId, userId).deleteCount(); // 防止更新失败导致的数据删除 - int flag = baseMapper.deleteById(userId); + int flag = userMapper.deleteById(userId); if (flag < 1) { throw new ServiceException("删除用户失败!"); } @@ -532,7 +532,7 @@ public class SysUserServiceImpl implements ISysUserService { // 删除用户与岗位表 userPostMapper.delete(new LambdaQueryWrapper().in(SysUserPost::getUserId, ids)); // 防止更新失败导致的数据删除 - int flag = baseMapper.deleteByIds(ids); + int flag = userMapper.deleteByIds(ids); if (flag < 1) { throw new ServiceException("删除用户失败!"); } @@ -550,7 +550,7 @@ public class SysUserServiceImpl implements ISysUserService { LambdaQueryWrapper lqw = Wrappers.lambdaQuery(); lqw.eq(SysUser::getDeptId, deptId); lqw.orderByAsc(SysUser::getUserId); - return baseMapper.selectVoList(lqw); + return userMapper.selectVoList(lqw); } @Override @@ -569,7 +569,7 @@ public class SysUserServiceImpl implements ISysUserService { @Cacheable(cacheNames = CacheNames.SYS_USER_NAME, key = "#userId") @Override public String selectUserNameById(Long userId) { - SysUser sysUser = baseMapper.selectOne(new LambdaQueryWrapper() + SysUser sysUser = userMapper.selectOne(new LambdaQueryWrapper() .select(SysUser::getUserName).eq(SysUser::getUserId, userId)); return ObjectUtils.notNullGetter(sysUser, SysUser::getUserName); } @@ -583,7 +583,7 @@ public class SysUserServiceImpl implements ISysUserService { @Override @Cacheable(cacheNames = CacheNames.SYS_NICKNAME, key = "#userId") public String selectNicknameById(Long userId) { - SysUser sysUser = baseMapper.selectOne(new LambdaQueryWrapper() + SysUser sysUser = userMapper.selectOne(new LambdaQueryWrapper() .select(SysUser::getNickName).eq(SysUser::getUserId, userId)); return ObjectUtils.notNullGetter(sysUser, SysUser::getNickName); } @@ -608,7 +608,7 @@ public class SysUserServiceImpl implements ISysUserService { */ @Override public String selectPhonenumberById(Long userId) { - SysUser sysUser = baseMapper.selectOne(new LambdaQueryWrapper() + SysUser sysUser = userMapper.selectOne(new LambdaQueryWrapper() .select(SysUser::getPhoneNumber).eq(SysUser::getUserId, userId)); return ObjectUtils.notNullGetter(sysUser, SysUser::getPhoneNumber); } @@ -621,7 +621,7 @@ public class SysUserServiceImpl implements ISysUserService { */ @Override public String selectEmailById(Long userId) { - SysUser sysUser = baseMapper.selectOne(new LambdaQueryWrapper() + SysUser sysUser = userMapper.selectOne(new LambdaQueryWrapper() .select(SysUser::getEmail).eq(SysUser::getUserId, userId)); return ObjectUtils.notNullGetter(sysUser, SysUser::getEmail); } diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/mapper/FlwCategoryMapper.java b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/mapper/FlwCategoryMapper.java index c7a3d2642..d618fafea 100644 --- a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/mapper/FlwCategoryMapper.java +++ b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/mapper/FlwCategoryMapper.java @@ -1,8 +1,6 @@ package org.dromara.workflow.mapper; -import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; -import org.dromara.common.mybatis.helper.DataBaseHelper; import org.dromara.workflow.domain.FlowCategory; import org.dromara.workflow.domain.vo.FlowCategoryVo; @@ -25,9 +23,10 @@ public interface FlwCategoryMapper extends BaseMapperPlus selectListByParentId(Long parentId) { - return this.selectList(new LambdaQueryWrapper() + return this.lambda() .select(FlowCategory::getCategoryId) - .apply(DataBaseHelper.findInSet(parentId, "ancestors"))); + .findInSet(parentId, FlowCategory::getAncestors) + .list(); } /** diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/mapper/FlwInstanceBizExtMapper.java b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/mapper/FlwInstanceBizExtMapper.java index e11613cf4..a895f57e6 100644 --- a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/mapper/FlwInstanceBizExtMapper.java +++ b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/mapper/FlwInstanceBizExtMapper.java @@ -1,11 +1,10 @@ package org.dromara.workflow.mapper; import cn.hutool.core.util.ObjectUtil; -import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; import org.dromara.workflow.domain.FlowInstanceBizExt; -import java.util.List; +import java.util.Collection; /** * 流程实例业务扩展Mapper接口 @@ -23,8 +22,9 @@ public interface FlwInstanceBizExtMapper extends BaseMapperPlus() - .eq(FlowInstanceBizExt::getInstanceId, entity.getInstanceId())); + FlowInstanceBizExt exist = this.lambda() + .eq(FlowInstanceBizExt::getInstanceId, entity.getInstanceId()) + .one(); if (ObjectUtil.isNotNull(exist)) { // 存在就带上主键更新 @@ -43,8 +43,7 @@ public interface FlwInstanceBizExtMapper extends BaseMapperPlus() - .eq(FlowInstanceBizExt::getInstanceId, instanceId)); + return this.lambda().eq(FlowInstanceBizExt::getInstanceId, instanceId).deleteCount(); } /** @@ -53,9 +52,8 @@ public interface FlwInstanceBizExtMapper extends BaseMapperPlus instanceIds) { - return this.delete(new LambdaQueryWrapper() - .in(FlowInstanceBizExt::getInstanceId, instanceIds)); + default int deleteByInstIds(Collection instanceIds) { + return this.lambda().in(FlowInstanceBizExt::getInstanceId, instanceIds).deleteCount(); } } diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/FlwCategoryServiceImpl.java b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/FlwCategoryServiceImpl.java index 89f519dbe..316bd2937 100644 --- a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/FlwCategoryServiceImpl.java +++ b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/FlwCategoryServiceImpl.java @@ -39,7 +39,7 @@ import java.util.*; public class FlwCategoryServiceImpl implements IFlwCategoryService, CategoryService { private final DefService defService; - private final FlwCategoryMapper baseMapper; + private final FlwCategoryMapper categoryMapper; /** * 查询流程分类 @@ -49,11 +49,11 @@ public class FlwCategoryServiceImpl implements IFlwCategoryService, CategoryServ */ @Override public FlowCategoryVo queryById(Long categoryId) { - FlowCategoryVo category = baseMapper.selectVoById(categoryId); + FlowCategoryVo category = categoryMapper.selectVoById(categoryId); if (ObjectUtil.isNull(category)) { return null; } - FlowCategoryVo parentCategory = baseMapper.selectVoOne(new LambdaQueryWrapper() + FlowCategoryVo parentCategory = categoryMapper.selectVoOne(new LambdaQueryWrapper() .select(FlowCategory::getCategoryName).eq(FlowCategory::getCategoryId, category.getParentId())); category.setParentName(ObjectUtils.notNullGetter(parentCategory, FlowCategoryVo::getCategoryName)); return category; @@ -71,7 +71,7 @@ public class FlwCategoryServiceImpl implements IFlwCategoryService, CategoryServ if (ObjectUtil.isNull(categoryId)) { return null; } - FlowCategory category = baseMapper.selectOne(new LambdaQueryWrapper() + FlowCategory category = categoryMapper.selectOne(new LambdaQueryWrapper() .select(FlowCategory::getCategoryName).eq(FlowCategory::getCategoryId, categoryId)); return ObjectUtils.notNullGetter(category, FlowCategory::getCategoryName); } @@ -87,7 +87,7 @@ public class FlwCategoryServiceImpl implements IFlwCategoryService, CategoryServ if (CollUtil.isEmpty(categoryIds)) { return Collections.emptyMap(); } - List list = baseMapper.selectList(new LambdaQueryWrapper() + List list = categoryMapper.selectList(new LambdaQueryWrapper() .select(FlowCategory::getCategoryId, FlowCategory::getCategoryName) .in(FlowCategory::getCategoryId, categoryIds)); return StreamUtils.toMap(list, FlowCategory::getCategoryId, FlowCategory::getCategoryName); @@ -103,7 +103,7 @@ public class FlwCategoryServiceImpl implements IFlwCategoryService, CategoryServ @Override public List queryList(FlowCategoryBo bo) { LambdaQueryWrapper lqw = buildQueryWrapper(bo); - return baseMapper.selectVoList(lqw); + return categoryMapper.selectVoList(lqw); } /** @@ -153,7 +153,7 @@ public class FlwCategoryServiceImpl implements IFlwCategoryService, CategoryServ */ @Override public boolean checkCategoryNameUnique(FlowCategoryBo category) { - boolean exist = baseMapper.exists(new LambdaQueryWrapper() + boolean exist = categoryMapper.exists(new LambdaQueryWrapper() .eq(FlowCategory::getCategoryName, category.getCategoryName()) .eq(FlowCategory::getParentId, category.getParentId()) .ne(ObjectUtil.isNotNull(category.getCategoryId()), FlowCategory::getCategoryId, category.getCategoryId())); @@ -181,7 +181,7 @@ public class FlwCategoryServiceImpl implements IFlwCategoryService, CategoryServ */ @Override public boolean hasChildByCategoryId(Long categoryId) { - return baseMapper.exists(new LambdaQueryWrapper() + return categoryMapper.exists(new LambdaQueryWrapper() .eq(FlowCategory::getParentId, categoryId)); } @@ -206,13 +206,13 @@ public class FlwCategoryServiceImpl implements IFlwCategoryService, CategoryServ */ @Override public int insertByBo(FlowCategoryBo bo) { - FlowCategory info = baseMapper.selectById(bo.getParentId()); + FlowCategory info = categoryMapper.selectById(bo.getParentId()); if (ObjectUtil.isNull(info)) { throw new ServiceException("父级流程分类不存在!"); } FlowCategory category = MapstructUtils.convert(bo, FlowCategory.class); category.setAncestors(info.getAncestors() + StringUtils.SEPARATOR + category.getParentId()); - return baseMapper.insert(category); + return categoryMapper.insert(category); } /** @@ -226,7 +226,7 @@ public class FlwCategoryServiceImpl implements IFlwCategoryService, CategoryServ @Transactional(rollbackFor = Exception.class) public int updateByBo(FlowCategoryBo bo) { FlowCategory category = MapstructUtils.convert(bo, FlowCategory.class); - FlowCategory oldCategory = baseMapper.selectById(category.getCategoryId()); + FlowCategory oldCategory = categoryMapper.selectById(category.getCategoryId()); if (ObjectUtil.isNull(oldCategory)) { throw new ServiceException("流程分类不存在，无法修改"); } @@ -234,7 +234,7 @@ public class FlwCategoryServiceImpl implements IFlwCategoryService, CategoryServ throw new ServiceException("不允许修改顶级分类的父级节点"); } if (!oldCategory.getParentId().equals(category.getParentId())) { - FlowCategory newParentCategory = baseMapper.selectById(category.getParentId()); + FlowCategory newParentCategory = categoryMapper.selectById(category.getParentId()); if (ObjectUtil.isNotNull(newParentCategory)) { String newAncestors = newParentCategory.getAncestors() + StringUtils.SEPARATOR + newParentCategory.getCategoryId(); String oldAncestors = oldCategory.getAncestors(); @@ -246,7 +246,7 @@ public class FlwCategoryServiceImpl implements IFlwCategoryService, CategoryServ } else { category.setAncestors(oldCategory.getAncestors()); } - return baseMapper.updateById(category); + return categoryMapper.updateById(category); } /** @@ -257,7 +257,7 @@ public class FlwCategoryServiceImpl implements IFlwCategoryService, CategoryServ * @param oldAncestors 旧的父ID集合 */ private void updateCategoryChildren(Long categoryId, String newAncestors, String oldAncestors) { - List children = baseMapper.selectList(new LambdaQueryWrapper() + List children = categoryMapper.selectList(new LambdaQueryWrapper() .apply(DataBaseHelper.findInSet(categoryId, "ancestors"))); List list = new ArrayList<>(); for (FlowCategory child : children) { @@ -267,7 +267,7 @@ public class FlwCategoryServiceImpl implements IFlwCategoryService, CategoryServ list.add(category); } if (CollUtil.isNotEmpty(list)) { - baseMapper.updateBatchById(list); + categoryMapper.updateBatchById(list); } } @@ -280,6 +280,6 @@ public class FlwCategoryServiceImpl implements IFlwCategoryService, CategoryServ @CacheEvict(cacheNames = FlowConstant.FLOW_CATEGORY_NAME, key = "#categoryId") @Override public int deleteWithValidById(Long categoryId) { - return baseMapper.deleteById(categoryId); + return categoryMapper.deleteById(categoryId); } } 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 3cf8f663b..3dfab77e6 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 @@ -15,6 +15,7 @@ import org.dromara.common.core.utils.StreamUtils; import org.dromara.common.core.utils.StringUtils; import org.dromara.common.json.utils.JsonUtils; import org.dromara.common.mybatis.core.page.PageQuery; +import org.dromara.common.mybatis.core.query.QueryBuilder; import org.dromara.common.core.domain.PageResult; import org.dromara.warm.flow.core.dto.DefJson; import org.dromara.warm.flow.core.enums.NodeType; @@ -116,7 +117,8 @@ public class FlwDefinitionServiceImpl implements IFlwDefinitionService { @Override @Transactional(rollbackFor = Exception.class) public boolean publish(Long id) { - List flowNodes = flowNodeMapper.selectList(new LambdaQueryWrapper().eq(FlowNode::getDefinitionId, id)); + List flowNodes = flowNodeMapper.selectList( + QueryBuilder.lambda(FlowNode.class).eq(FlowNode::getDefinitionId, id).build()); List errorMsg = new ArrayList<>(); if (CollUtil.isNotEmpty(flowNodes)) { String applyNodeCode = flwCommonService.applyNodeCode(id); diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/FlwSpelServiceImpl.java b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/FlwSpelServiceImpl.java index 005f15216..b9da53dec 100644 --- a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/FlwSpelServiceImpl.java +++ b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/FlwSpelServiceImpl.java @@ -41,7 +41,7 @@ import java.util.Map; @Service public class FlwSpelServiceImpl implements IFlwSpelService { - private final FlwSpelMapper baseMapper; + private final FlwSpelMapper spelMapper; /** * 查询流程spel表达式定义 @@ -51,7 +51,7 @@ public class FlwSpelServiceImpl implements IFlwSpelService { */ @Override public FlowSpelVo queryById(Long id){ - return baseMapper.selectVoById(id); + return spelMapper.selectVoById(id); } /** @@ -64,7 +64,7 @@ public class FlwSpelServiceImpl implements IFlwSpelService { @Override public PageResult queryPageList(FlowSpelBo bo, PageQuery pageQuery) { LambdaQueryWrapper lqw = buildQueryWrapper(bo); - Page result = baseMapper.selectVoPage(pageQuery.build(), lqw); + Page result = spelMapper.selectVoPage(pageQuery.build(), lqw); return PageResult.build(result.getRecords(), result.getTotal()); } @@ -77,7 +77,7 @@ public class FlwSpelServiceImpl implements IFlwSpelService { @Override public List queryList(FlowSpelBo bo) { LambdaQueryWrapper lqw = buildQueryWrapper(bo); - return baseMapper.selectVoList(lqw); + return spelMapper.selectVoList(lqw); } private LambdaQueryWrapper buildQueryWrapper(FlowSpelBo bo) { @@ -103,7 +103,7 @@ public class FlwSpelServiceImpl implements IFlwSpelService { public Boolean insertByBo(FlowSpelBo bo) { FlowSpel add = MapstructUtils.convert(bo, FlowSpel.class); validEntityBeforeSave(add); - boolean flag = baseMapper.insert(add) > 0; + boolean flag = spelMapper.insert(add) > 0; if (flag) { bo.setId(add.getId()); } @@ -120,7 +120,7 @@ public class FlwSpelServiceImpl implements IFlwSpelService { public Boolean updateByBo(FlowSpelBo bo) { FlowSpel update = MapstructUtils.convert(bo, FlowSpel.class); validEntityBeforeSave(update); - return baseMapper.updateById(update) > 0; + return spelMapper.updateById(update) > 0; } /** @@ -128,7 +128,7 @@ public class FlwSpelServiceImpl implements IFlwSpelService { */ private void validEntityBeforeSave(FlowSpel entity) { if (StringUtils.isNotBlank(entity.getViewSpel())) { - boolean exists = baseMapper.exists(new LambdaQueryWrapper() + boolean exists = spelMapper.exists(new LambdaQueryWrapper() .eq(FlowSpel::getViewSpel, entity.getViewSpel()) .ne(ObjectUtil.isNotNull(entity.getId()), FlowSpel::getId, entity.getId())); if (exists) { @@ -149,7 +149,7 @@ public class FlwSpelServiceImpl implements IFlwSpelService { if (isValid) { //TODO 做一些业务上的校验,判断是否需要校验 } - return baseMapper.deleteByIds(ids) > 0; + return spelMapper.deleteByIds(ids) > 0; } /** @@ -186,7 +186,7 @@ public class FlwSpelServiceImpl implements IFlwSpelService { if (CollUtil.isEmpty(viewSpels)) { return Collections.emptyMap(); } - List list = baseMapper.selectList( + List list = spelMapper.selectList( new LambdaQueryWrapper() .select(FlowSpel::getViewSpel, FlowSpel::getRemark) .in(FlowSpel::getViewSpel, viewSpels) diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/TestLeaveServiceImpl.java b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/TestLeaveServiceImpl.java index 957c5e166..1f542ba24 100644 --- a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/TestLeaveServiceImpl.java +++ b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/TestLeaveServiceImpl.java @@ -49,7 +49,7 @@ import java.util.Map; @Slf4j public class TestLeaveServiceImpl implements ITestLeaveService { - private final TestLeaveMapper baseMapper; + private final TestLeaveMapper leaveMapper; private final WorkflowService workflowService; /** @@ -70,7 +70,7 @@ public class TestLeaveServiceImpl implements ITestLeaveService { */ @Override public TestLeaveVo queryById(Long id) { - return baseMapper.selectVoById(id); + return leaveMapper.selectVoById(id); } /** @@ -79,7 +79,7 @@ public class TestLeaveServiceImpl implements ITestLeaveService { @Override public PageResult queryPageList(TestLeaveBo bo, PageQuery pageQuery) { LambdaQueryWrapper lqw = buildQueryWrapper(bo); - Page result = baseMapper.selectVoPage(pageQuery.build(), lqw); + Page result = leaveMapper.selectVoPage(pageQuery.build(), lqw); return PageResult.build(result.getRecords(), result.getTotal()); } @@ -89,7 +89,7 @@ public class TestLeaveServiceImpl implements ITestLeaveService { @Override public List queryList(TestLeaveBo bo) { LambdaQueryWrapper lqw = buildQueryWrapper(bo); - return baseMapper.selectVoList(lqw); + return leaveMapper.selectVoList(lqw); } private LambdaQueryWrapper buildQueryWrapper(TestLeaveBo bo) { @@ -114,7 +114,7 @@ public class TestLeaveServiceImpl implements ITestLeaveService { if (StringUtils.isBlank(add.getStatus())) { add.setStatus(BusinessStatusEnum.DRAFT.getStatus()); } - boolean flag = baseMapper.insert(add) > 0; + boolean flag = leaveMapper.insert(add) > 0; if (flag) { bo.setId(add.getId()); } @@ -131,7 +131,7 @@ public class TestLeaveServiceImpl implements ITestLeaveService { bo.setApplyCode(System.currentTimeMillis() + StrUtil.EMPTY); } TestLeave leave = MapstructUtils.convert(bo, TestLeave.class); - boolean flag = baseMapper.insertOrUpdate(leave); + boolean flag = leaveMapper.insertOrUpdate(leave); if (flag) { bo.setId(leave.getId()); // 后端发起需要忽略权限 @@ -158,7 +158,7 @@ public class TestLeaveServiceImpl implements ITestLeaveService { @Override public TestLeaveVo updateByBo(TestLeaveBo bo) { TestLeave update = MapstructUtils.convert(bo, TestLeave.class); - baseMapper.updateById(update); + leaveMapper.updateById(update); return MapstructUtils.convert(update, TestLeaveVo.class); } @@ -169,7 +169,7 @@ public class TestLeaveServiceImpl implements ITestLeaveService { @Transactional(rollbackFor = Exception.class) public Boolean deleteWithValidByIds(List ids) { workflowService.deleteInstance(StreamUtils.toList(ids, Convert::toStr)); - return baseMapper.deleteByIds(ids) > 0; + return leaveMapper.deleteByIds(ids) > 0; } /** @@ -182,7 +182,7 @@ public class TestLeaveServiceImpl implements ITestLeaveService { @EventListener(condition = "#processEvent.flowCode.startsWith('leave')") public void processHandler(ProcessEvent processEvent) { log.info("当前任务执行了{}", processEvent.toString()); - TestLeave testLeave = baseMapper.selectById(Convert.toLong(processEvent.getBusinessId())); + TestLeave testLeave = leaveMapper.selectById(Convert.toLong(processEvent.getBusinessId())); testLeave.setStatus(processEvent.getStatus()); // 用于例如审批附件 审批意见等 存储到业务表内 自行根据业务实现存储流程 Map params = processEvent.getParams(); @@ -204,7 +204,7 @@ public class TestLeaveServiceImpl implements ITestLeaveService { } String status = BusinessStatusEnum.findByStatus(processEvent.getStatus()); log.info("当前流程状态为{}", status); - baseMapper.updateById(testLeave); + leaveMapper.updateById(testLeave); } /** @@ -232,11 +232,11 @@ public class TestLeaveServiceImpl implements ITestLeaveService { @EventListener(condition = "#processDeleteEvent.flowCode.startsWith('leave')") public void processDeleteHandler(ProcessDeleteEvent processDeleteEvent) { log.info("监听删除流程事件，当前任务执行了{}", processDeleteEvent.toString()); - TestLeave testLeave = baseMapper.selectById(Long.valueOf(processDeleteEvent.getBusinessId())); + TestLeave testLeave = leaveMapper.selectById(Long.valueOf(processDeleteEvent.getBusinessId())); if (ObjectUtil.isNull(testLeave)) { return; } - baseMapper.deleteById(testLeave.getId()); + leaveMapper.deleteById(testLeave.getId()); } }