diff --git a/dk-modules/business/src/main/java/org/dromara/business/service/impl/BusinessAlertServiceImpl.java b/dk-modules/business/src/main/java/org/dromara/business/service/impl/BusinessAlertServiceImpl.java index 974d174..ab2a626 100644 --- a/dk-modules/business/src/main/java/org/dromara/business/service/impl/BusinessAlertServiceImpl.java +++ b/dk-modules/business/src/main/java/org/dromara/business/service/impl/BusinessAlertServiceImpl.java @@ -8,6 +8,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import lombok.RequiredArgsConstructor; +import lombok.extern.slf4j.Slf4j; import org.apache.dubbo.config.annotation.DubboReference; import org.dromara.business.api.domain.bo.RemoteBusinessAlertBo; import org.dromara.business.api.domain.vo.RemoteBusinessAlertVo; @@ -54,6 +55,7 @@ import java.util.stream.Collectors; */ @RequiredArgsConstructor @Service +@Slf4j public class BusinessAlertServiceImpl implements IBusinessAlertService { private final BusinessAlertMapper baseMapper; @@ -218,7 +220,7 @@ public class BusinessAlertServiceImpl implements IBusinessAlertService { } }); } catch (Exception e) { - + log.error(e.getMessage(),e); } return TableDataInfo.build(page); @@ -255,7 +257,7 @@ public class BusinessAlertServiceImpl implements IBusinessAlertService { } }); } catch (Exception e) { - + log.error(e.getMessage(),e); } return TableDataInfo.build(page); @@ -294,7 +296,7 @@ public class BusinessAlertServiceImpl implements IBusinessAlertService { } }); } catch (Exception e) { - + log.error(e.getMessage(),e); } return TableDataInfo.build(page); @@ -346,7 +348,7 @@ public class BusinessAlertServiceImpl implements IBusinessAlertService { } }); } catch (Exception e) { - + log.error(e.getMessage(),e); } return TableDataInfo.build(page); diff --git a/dk-modules/workflow/src/main/java/org/dromara/workflow/service/impl/FlwInstanceServiceImpl.java b/dk-modules/workflow/src/main/java/org/dromara/workflow/service/impl/FlwInstanceServiceImpl.java index 2319630..137ec97 100644 --- a/dk-modules/workflow/src/main/java/org/dromara/workflow/service/impl/FlwInstanceServiceImpl.java +++ b/dk-modules/workflow/src/main/java/org/dromara/workflow/service/impl/FlwInstanceServiceImpl.java @@ -332,28 +332,6 @@ public class FlwInstanceServiceImpl implements IFlwInstanceService { list.addAll(BeanUtil.copyToList(flowHisTasks, FlowHisTaskVo.class)); } String flowChart = chartService.chartIns(instanceId); - list.forEach(flowHisTaskVo -> { - if (ObjectUtil.isNotNull(flowHisTaskVo.getExt())) { - try { - String[] extArr = flowHisTaskVo.getExt().split(","); - - List> fileList = new ArrayList<>(); - Arrays.asList(extArr).forEach(ext->{ - Map map = new HashMap<>(); - List remoteFiles = remoteFileService.selectByIds(ext); - if (ObjectUtil.isNotEmpty(remoteFiles)) { - map.put("imageUrl",MinioUntil.getObjectUrlOne(MinIOConstants.BUCKET_MINIO, remoteFiles.get(0).getFileName(), 3600).toString()); - map.put("fileName",remoteFiles.get(0).getOriginalName()); - fileList.add(map); - } - }); - flowHisTaskVo.setExt(JSON.toJSONString(fileList)); - } catch (Exception e) { - log.error("获取: {}", e.getMessage(), e); - flowHisTaskVo.setExt(JSON.toJSONString(ListUtil.empty())); - } - } - }); return Map.of("list", list, "image", flowChart); }