|
@ -11,6 +11,7 @@ import com.baomidou.mybatisplus.core.toolkit.Wrappers; |
|
|
import com.baomidou.mybatisplus.extension.plugins.pagination.Page; |
|
|
import com.baomidou.mybatisplus.extension.plugins.pagination.Page; |
|
|
import lombok.RequiredArgsConstructor; |
|
|
import lombok.RequiredArgsConstructor; |
|
|
import lombok.extern.slf4j.Slf4j; |
|
|
import lombok.extern.slf4j.Slf4j; |
|
|
|
|
|
import org.apache.dubbo.config.annotation.DubboReference; |
|
|
import org.dromara.common.core.enums.BusinessStatusEnum; |
|
|
import org.dromara.common.core.enums.BusinessStatusEnum; |
|
|
import org.dromara.common.core.exception.ServiceException; |
|
|
import org.dromara.common.core.exception.ServiceException; |
|
|
import org.dromara.common.core.utils.StreamUtils; |
|
|
import org.dromara.common.core.utils.StreamUtils; |
|
@ -18,6 +19,8 @@ import org.dromara.common.core.utils.StringUtils; |
|
|
import org.dromara.common.mybatis.core.page.PageQuery; |
|
|
import org.dromara.common.mybatis.core.page.PageQuery; |
|
|
import org.dromara.common.mybatis.core.page.TableDataInfo; |
|
|
import org.dromara.common.mybatis.core.page.TableDataInfo; |
|
|
import org.dromara.common.satoken.utils.LoginHelper; |
|
|
import org.dromara.common.satoken.utils.LoginHelper; |
|
|
|
|
|
import org.dromara.resource.api.RemoteFileService; |
|
|
|
|
|
import org.dromara.resource.api.domain.RemoteFile; |
|
|
import org.dromara.system.api.domain.vo.RemoteUserVo; |
|
|
import org.dromara.system.api.domain.vo.RemoteUserVo; |
|
|
import org.dromara.warm.flow.core.FlowEngine; |
|
|
import org.dromara.warm.flow.core.FlowEngine; |
|
|
import org.dromara.warm.flow.core.constant.ExceptionCons; |
|
|
import org.dromara.warm.flow.core.constant.ExceptionCons; |
|
@ -78,6 +81,8 @@ public class FlwInstanceServiceImpl implements IFlwInstanceService { |
|
|
private final IFlwTaskService flwTaskService; |
|
|
private final IFlwTaskService flwTaskService; |
|
|
private final FlwInstanceMapper flwInstanceMapper; |
|
|
private final FlwInstanceMapper flwInstanceMapper; |
|
|
private final FlwCategoryMapper flwCategoryMapper; |
|
|
private final FlwCategoryMapper flwCategoryMapper; |
|
|
|
|
|
@DubboReference |
|
|
|
|
|
private RemoteFileService remoteFileService; |
|
|
|
|
|
|
|
|
/** |
|
|
/** |
|
|
* 分页查询正在运行的流程实例 |
|
|
* 分页查询正在运行的流程实例 |
|
@ -326,12 +331,18 @@ public class FlwInstanceServiceImpl implements IFlwInstanceService { |
|
|
String flowChart = chartService.chartIns(instanceId); |
|
|
String flowChart = chartService.chartIns(instanceId); |
|
|
list.forEach(flowHisTaskVo -> { |
|
|
list.forEach(flowHisTaskVo -> { |
|
|
if (ObjectUtil.isNotNull(flowHisTaskVo.getExt())) { |
|
|
if (ObjectUtil.isNotNull(flowHisTaskVo.getExt())) { |
|
|
String[] extArr = flowHisTaskVo.getExt().split(","); |
|
|
try { |
|
|
StringBuilder sb = new StringBuilder(); |
|
|
String[] extArr = flowHisTaskVo.getExt().split(","); |
|
|
Arrays.asList(extArr).forEach(ext->{ |
|
|
StringBuilder sb = new StringBuilder(); |
|
|
sb.append(MinioUntil.getObjectUrlOne(MinIOConstants.BUCKET_MINIO, ext, 3600).toString()).append(","); |
|
|
|
|
|
}); |
|
|
Arrays.asList(extArr).forEach(ext->{ |
|
|
flowHisTaskVo.setExt(sb.toString()); |
|
|
List<RemoteFile> remoteFiles = remoteFileService.selectByIds(ext); |
|
|
|
|
|
sb.append(MinioUntil.getObjectUrlOne(MinIOConstants.BUCKET_MINIO, remoteFiles.get(0).getFileName(), 3600).toString()).append(","); |
|
|
|
|
|
}); |
|
|
|
|
|
flowHisTaskVo.setExt(sb.toString()); |
|
|
|
|
|
} catch (Exception e) { |
|
|
|
|
|
log.error("获取: {}", e.getMessage(), e); |
|
|
|
|
|
} |
|
|
} |
|
|
} |
|
|
}); |
|
|
}); |
|
|
|
|
|
|
|
|