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 ad7c797..f291ecc 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 @@ -300,7 +300,8 @@ public class BusinessAlertServiceImpl implements IBusinessAlertService { if (ObjectUtil.isNotEmpty(bo.getPostCode())){ //根据当前用户职能获取识别类型 - List postVoList = remoteLablePostService.selectLabelByList(bo.getPostCode(), LoginHelper.getDeptId()); +// List postVoList = remoteLablePostService.selectLabelByList(bo.getPostCode(), LoginHelper.getDeptId()); + List postVoList = remoteLablePostService.selectLabelByList(bo.getPostCode(), null); if (ObjectUtil.isEmpty(postVoList)) { return null; diff --git a/dk-modules/business/src/main/java/org/dromara/business/service/impl/BusinessAlertStatisticsServiceImpl.java b/dk-modules/business/src/main/java/org/dromara/business/service/impl/BusinessAlertStatisticsServiceImpl.java index 14dcade..5304f9f 100644 --- a/dk-modules/business/src/main/java/org/dromara/business/service/impl/BusinessAlertStatisticsServiceImpl.java +++ b/dk-modules/business/src/main/java/org/dromara/business/service/impl/BusinessAlertStatisticsServiceImpl.java @@ -316,14 +316,11 @@ public class BusinessAlertStatisticsServiceImpl implements IBusinessAlertStatist return ListUtil.empty(); } - AtomicInteger number = new AtomicInteger(1); - postVoList.forEach(postVo -> { List labelList = getAiLabel(postVo.getPostCode()).stream().map(RemoteAiLabelPostVo::getLabelEn).collect(Collectors.toList()); businessAlertBo.setAiLabelEnList(labelList); Map dayMap = this.baseMapper.countCurrentDayAlert(businessAlertBo); - number.getAndIncrement(); - result.add(new StatObj(postVo.getPostName(), ObjectUtil.isEmpty(dayMap.get("total"))? number.get() + 1:dayMap.get("total"))); + result.add(new StatObj(postVo.getPostName(), dayMap.get("total"))); }); return result; @@ -358,11 +355,7 @@ public class BusinessAlertStatisticsServiceImpl implements IBusinessAlertStatist endTime = dateMap.get("endTime"); } - AtomicInteger number = new AtomicInteger(1); - postVoList.forEach(postVo -> { - number.getAndIncrement(); - List labelList = getAiLabel(postVo.getPostCode()).stream().map(RemoteAiLabelPostVo::getLabelEn).collect(Collectors.toList()); Map dateMap = new HashMap<>(); if (ObjectUtil.isEmpty(labelList)) { @@ -375,8 +368,8 @@ public class BusinessAlertStatisticsServiceImpl implements IBusinessAlertStatist result.add(new StatObj( postVo.getPostName(), - ObjectUtil.isEmpty(dateMap.get("todoCount"))?number.get() + 1:dateMap.get("todoCount"), - ObjectUtil.isEmpty(dateMap.get("finishCount"))?number.get() + 2:dateMap.get("finishCount") + dateMap.get("todoCount"), + dateMap.get("finishCount") )); }); @@ -409,29 +402,16 @@ public class BusinessAlertStatisticsServiceImpl implements IBusinessAlertStatist if (ObjectUtil.isEmpty(labelList)){ monthList.forEach(month -> { - int randomValue = 90 + (int)(Math.random() * 31); // 90~120（含120） - data.add(randomValue); + data.add(0.0); }); }else { businessAlertBo.setAiLabelEnList(labelList); List> rateList = baseMapper.handlerRate(businessAlertBo,monthList); if (ObjectUtil.isNotEmpty(rateList)) { - rateList.forEach(p->{ - if (ObjectUtil.isNotEmpty(p.get("avgInfo"))){ - data.add(p.get("avgInfo")); - }else { - int randomValue = 90 + (int)(Math.random() * 31); - data.add(randomValue); - } - }); -// data.addAll(rateList.stream().map(p-> p.get("avgInfo")).toList()); + data.addAll(rateList.stream().map(p-> p.get("avgInfo")).toList()); }else { -// monthList.forEach(month -> { -// data.add(0.0); -// }); monthList.forEach(month -> { - int randomValue = 90 + (int)(Math.random() * 31); - data.add(randomValue); + data.add(0.0); }); } } @@ -696,6 +676,6 @@ public class BusinessAlertStatisticsServiceImpl implements IBusinessAlertStatist } private List getAiLabel(String postCode) { - return remoteLabelPostService.selectLabelByList(postCode,LoginHelper.getDeptId()); + return remoteLabelPostService.selectLabelByList(postCode,null); } } diff --git a/dk-modules/workflow/pom.xml b/dk-modules/workflow/pom.xml index f9235ac..c0160e2 100644 --- a/dk-modules/workflow/pom.xml +++ b/dk-modules/workflow/pom.xml @@ -54,6 +54,11 @@ org.dromara common-log + + + org.dromara + common-oss + org.dromara common-idempotent diff --git a/dk-modules/workflow/src/main/java/org/dromara/workflow/common/constant/MinIOConstants.java b/dk-modules/workflow/src/main/java/org/dromara/workflow/common/constant/MinIOConstants.java new file mode 100644 index 0000000..eff025a --- /dev/null +++ b/dk-modules/workflow/src/main/java/org/dromara/workflow/common/constant/MinIOConstants.java @@ -0,0 +1,18 @@ +package org.dromara.workflow.common.constant; + + +public interface MinIOConstants { + //桶名称 无人机图片 + String BUCKET_MEDIAFILE = "mediafile"; + String BUCKET_DKCY = "dkcy"; + //桶名称 默认数据 + String BUCKET_MINIO = "minio"; + + //桶名称 航线文件 + String BUCKET_WAYLINEFILE = "waylinefile"; + + //桶名称 预警文件 + String BUCKET_ALERT = "alert"; + //桶名称 图斑 + String BUCKET_PATTERN = "pattern"; +} 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 3e5152c..16d1831 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 @@ -36,6 +36,7 @@ import org.dromara.warm.flow.orm.entity.FlowTask; import org.dromara.warm.flow.orm.mapper.FlowHisTaskMapper; import org.dromara.warm.flow.orm.mapper.FlowInstanceMapper; import org.dromara.workflow.common.ConditionalOnEnable; +import org.dromara.workflow.common.constant.MinIOConstants; import org.dromara.workflow.common.enums.TaskStatusEnum; import org.dromara.workflow.domain.bo.FlowCancelBo; import org.dromara.workflow.domain.bo.FlowInstanceBo; @@ -48,6 +49,7 @@ import org.dromara.workflow.mapper.FlwCategoryMapper; import org.dromara.workflow.mapper.FlwInstanceMapper; import org.dromara.workflow.service.IFlwInstanceService; import org.dromara.workflow.service.IFlwTaskService; +import org.dromara.workflow.utils.MinioUntil; import org.dromara.workflow.utils.WorkflowUtils; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -322,6 +324,17 @@ 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())) { + String[] extArr = flowHisTaskVo.getExt().split(","); + StringBuilder sb = new StringBuilder(); + Arrays.asList(extArr).forEach(ext->{ + sb.append(MinioUntil.getObjectUrlOne(MinIOConstants.BUCKET_MINIO, ext, 3600).toString()).append(","); + }); + flowHisTaskVo.setExt(sb.toString()); + } + }); + return Map.of("list", list, "image", flowChart); } diff --git a/dk-modules/workflow/src/main/java/org/dromara/workflow/utils/MinioUntil.java b/dk-modules/workflow/src/main/java/org/dromara/workflow/utils/MinioUntil.java new file mode 100644 index 0000000..3c90e18 --- /dev/null +++ b/dk-modules/workflow/src/main/java/org/dromara/workflow/utils/MinioUntil.java @@ -0,0 +1,14 @@ +package org.dromara.workflow.utils; + +import org.dromara.common.oss.core.OssClient; +import org.dromara.common.oss.factory.OssFactory; + +import java.net.URL; + +public class MinioUntil { + + public static URL getObjectUrlOne(String bucket, String pathUrl, Integer seconds) { + OssClient storage = OssFactory.instance(bucket); + return storage.getPrivateUrlURL(pathUrl,seconds); + } +}