From 7141e855bb09198ffee510e3047c503cf97e0831 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: Mon, 7 Jul 2025 09:18:42 +0800 Subject: [PATCH] =?UTF-8?q?update=20=E4=BC=98=E5=8C=96=20SpEL=E8=A1=A8?= =?UTF-8?q?=E8=BE=BE=E5=BC=8F=E5=9B=9E=E6=98=BE=E5=90=8D=E7=A7=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../common/enums/TaskAssigneeEnum.java | 2 +- .../workflow/service/IFlwSpelService.java | 20 +++++- .../service/impl/FlwSpelServiceImpl.java | 65 +++++++++++++------ 3 files changed, 64 insertions(+), 23 deletions(-) diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/common/enums/TaskAssigneeEnum.java b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/common/enums/TaskAssigneeEnum.java index c86e73e4..c604f97e 100644 --- a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/common/enums/TaskAssigneeEnum.java +++ b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/common/enums/TaskAssigneeEnum.java @@ -40,7 +40,7 @@ public enum TaskAssigneeEnum { /** * SPEL表达式 */ - SPEL("SPEL表达式", ""); + SPEL("SpEL表达式", ""); private final String desc; private final String code; diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/IFlwSpelService.java b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/IFlwSpelService.java index 10882472..26ca38de 100644 --- a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/IFlwSpelService.java +++ b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/IFlwSpelService.java @@ -9,6 +9,7 @@ import org.dromara.workflow.domain.vo.FlowSpelVo; import java.util.Collection; import java.util.List; +import java.util.Map; /** * 流程spel达式定义Service接口 @@ -18,8 +19,6 @@ import java.util.List; */ public interface IFlwSpelService { - RemoteTaskAssigneeVo selectSpelByTaskAssigneeList(RemoteTaskAssigneeBo taskQuery); - /** * 查询流程spel达式定义 * @@ -69,4 +68,21 @@ public interface IFlwSpelService { * @return 是否删除成功 */ Boolean deleteWithValidByIds(Collection ids, Boolean isValid); + + /** + * 查询spel并返回任务指派的列表，支持分页 + * + * @param taskQuery 查询条件 + * @return 办理人 + */ + RemoteTaskAssigneeVo selectSpelByTaskAssigneeList(RemoteTaskAssigneeBo taskQuery); + + /** + * 根据视图 SpEL 表达式列表，查询对应的备注信息 + * + * @param viewSpels SpEL 表达式列表 + * @return 映射表：key 为 SpEL 表达式，value 为对应备注；若为空则返回空 Map + */ + Map selectRemarksBySpels(List viewSpels); + } 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 7441beb9..7ecbbfdf 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 @@ -1,5 +1,6 @@ package org.dromara.workflow.service.impl; +import cn.hutool.core.collection.CollUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; @@ -7,6 +8,7 @@ import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.dromara.common.core.constant.SystemConstants; import org.dromara.common.core.utils.MapstructUtils; +import org.dromara.common.core.utils.StreamUtils; import org.dromara.common.core.utils.StringUtils; import org.dromara.common.mybatis.core.page.PageQuery; import org.dromara.common.mybatis.core.page.TableDataInfo; @@ -21,6 +23,7 @@ import org.dromara.workflow.service.IFlwSpelService; import org.springframework.stereotype.Service; import java.util.Collection; +import java.util.Collections; import java.util.List; import java.util.Map; @@ -38,26 +41,6 @@ public class FlwSpelServiceImpl implements IFlwSpelService { private final FlwSpelMapper baseMapper; - /** - * 查询流程spel达式定义列表 - */ - @Override - public RemoteTaskAssigneeVo selectSpelByTaskAssigneeList(RemoteTaskAssigneeBo taskQuery) { - PageQuery pageQuery = new PageQuery(taskQuery.getPageSize(), taskQuery.getPageNum()); - FlowSpelBo bo = new FlowSpelBo(); - bo.setViewSpel(taskQuery.getHandlerCode()); - bo.setRemark(taskQuery.getHandlerName()); - bo.setStatus(SystemConstants.NORMAL); - Map params = bo.getParams(); - params.put("beginTime", taskQuery.getBeginTime()); - params.put("endTime", taskQuery.getEndTime()); - TableDataInfo page = this.queryPageList(bo, pageQuery); - // 使用封装的字段映射方法进行转换 - List handlers = RemoteTaskAssigneeVo.convertToHandlerList(page.getRows(), - FlowSpelVo::getViewSpel, c -> "", FlowSpelVo::getRemark, null, FlowSpelVo::getCreateTime); - return new RemoteTaskAssigneeVo(page.getTotal(), handlers); - } - /** * 查询流程spel达式定义 * @@ -159,4 +142,46 @@ public class FlwSpelServiceImpl implements IFlwSpelService { } return baseMapper.deleteByIds(ids) > 0; } + + /** + * 查询spel并返回任务指派的列表，支持分页 + * + * @param taskQuery 查询条件 + * @return 办理人 + */ + @Override + public RemoteTaskAssigneeVo selectSpelByTaskAssigneeList(RemoteTaskAssigneeBo taskQuery) { + PageQuery pageQuery = new PageQuery(taskQuery.getPageSize(), taskQuery.getPageNum()); + FlowSpelBo bo = new FlowSpelBo(); + bo.setViewSpel(taskQuery.getHandlerCode()); + bo.setRemark(taskQuery.getHandlerName()); + bo.setStatus(SystemConstants.NORMAL); + Map params = bo.getParams(); + params.put("beginTime", taskQuery.getBeginTime()); + params.put("endTime", taskQuery.getEndTime()); + TableDataInfo page = this.queryPageList(bo, pageQuery); + // 使用封装的字段映射方法进行转换 + List handlers = RemoteTaskAssigneeVo.convertToHandlerList(page.getRows(), + FlowSpelVo::getViewSpel, c -> "", FlowSpelVo::getRemark, null, FlowSpelVo::getCreateTime); + return new RemoteTaskAssigneeVo(page.getTotal(), handlers); + } + + /** + * 根据视图 SpEL 表达式列表，查询对应的备注信息 + * + * @param viewSpels SpEL 表达式列表 + * @return 映射表：key 为 SpEL 表达式，value 为对应备注；若为空则返回空 Map + */ + @Override + public Map selectRemarksBySpels(List viewSpels) { + if (CollUtil.isEmpty(viewSpels)) { + return Collections.emptyMap(); + } + List list = baseMapper.selectList( + new LambdaQueryWrapper() + .select(FlowSpel::getViewSpel, FlowSpel::getRemark) + ); + return StreamUtils.toMap(list, FlowSpel::getViewSpel, FlowSpel::getRemark); + } + }