From 973caddffafba85e75a84c09d77e3ea53c27903f Mon Sep 17 00:00:00 2001 From: xiangpei <xiangpei@timesnew.cn> Date: 星期三, 12 二月 2025 22:29:09 +0800 Subject: [PATCH] flowable模块中的流程日志移动到business模块,新增流程推进日志接口 --- business/src/main/java/com/ycl/service/impl/ProcessLogServiceImpl.java | 41 ++++++++++++++++++++++++++++++++++------- 1 files changed, 34 insertions(+), 7 deletions(-) diff --git a/flowable/src/main/java/com/ycl/service/impl/ProcessLogServiceImpl.java b/business/src/main/java/com/ycl/service/impl/ProcessLogServiceImpl.java similarity index 72% rename from flowable/src/main/java/com/ycl/service/impl/ProcessLogServiceImpl.java rename to business/src/main/java/com/ycl/service/impl/ProcessLogServiceImpl.java index c9dbe97..7037772 100644 --- a/flowable/src/main/java/com/ycl/service/impl/ProcessLogServiceImpl.java +++ b/business/src/main/java/com/ycl/service/impl/ProcessLogServiceImpl.java @@ -1,19 +1,25 @@ package com.ycl.service.impl; +import com.alibaba.fastjson2.JSON; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.conditions.query.LambdaQueryChainWrapper; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.ycl.common.base.Result; import com.ycl.common.enums.business.ProcessLogEventTypeEnum; import com.ycl.domain.entity.ProcessLog; +import com.ycl.domain.json.DelegateData; +import com.ycl.domain.json.JumpData; +import com.ycl.domain.json.RejectData; +import com.ycl.domain.json.SuperviseData; +import com.ycl.domain.query.ProcessLogQuery; +import com.ycl.domain.vo.ProcessLogVO; +import com.ycl.framework.utils.PageUtil; import com.ycl.mapper.ProcessLogMapper; import com.ycl.service.ProcessLogService; -import com.ycl.common.base.Result; -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.ycl.domain.vo.ProcessLogVO; -import com.ycl.domain.query.ProcessLogQuery; -import org.apache.commons.collections4.CollectionUtils; -import org.springframework.stereotype.Service; import lombok.RequiredArgsConstructor; -import com.ycl.framework.utils.PageUtil; +import org.apache.commons.collections4.CollectionUtils; +import org.apache.commons.lang3.StringUtils; +import org.springframework.stereotype.Service; import org.springframework.util.Assert; import java.util.List; @@ -118,4 +124,25 @@ .list(); return CollectionUtils.isNotEmpty(list); } + + + @Override + public Result projectProcessLogPage(ProcessLogQuery query) { + List<ProcessLogVO> list = baseMapper.projectProcessLogPage(query); + // json鍙嶅簭鍒楀寲 + list.stream().forEach(log -> { + if (StringUtils.isNotBlank(log.getEventDataJson())) { + if (ProcessLogEventTypeEnum.DELEGATE.equals(log.getEventType())) { + log.setEventDataObj(JSON.parseObject(log.getEventDataJson(), DelegateData.class)); + } else if (ProcessLogEventTypeEnum.JUMP.equals(log.getEventType())) { + log.setEventDataObj(JSON.parseObject(log.getEventDataJson(), JumpData.class)); + } else if (ProcessLogEventTypeEnum.REJECT.equals(log.getEventType())) { + log.setEventDataObj(JSON.parseObject(log.getEventDataJson(), RejectData.class)); + } else if (ProcessLogEventTypeEnum.SUPERVISE.equals(log.getEventType())) { + log.setEventDataObj(JSON.parseObject(log.getEventDataJson(), SuperviseData.class)); + } + } + }); + return Result.ok().data(list); + } } -- Gitblit v1.8.0