diff --git a/dk-api/api-business/src/main/java/org/dromara/business/api/domain/vo/RemoteBusinessAlertVo.java b/dk-api/api-business/src/main/java/org/dromara/business/api/domain/vo/RemoteBusinessAlertVo.java index 6ef5b3d..f75e6a4 100644 --- a/dk-api/api-business/src/main/java/org/dromara/business/api/domain/vo/RemoteBusinessAlertVo.java +++ b/dk-api/api-business/src/main/java/org/dromara/business/api/domain/vo/RemoteBusinessAlertVo.java @@ -53,12 +53,12 @@ public class RemoteBusinessAlertVo implements Serializable { /** * 纬度 */ - private Long lat; + private String lat; /** * 精度 */ - private Long lng; + private String lng; /** * 标签名-中 @@ -156,6 +156,9 @@ public class RemoteBusinessAlertVo implements Serializable { */ private Date handleTime; + private Date createTime; + + /** * 其他：内容 */ diff --git a/dk-modules/business/pom.xml b/dk-modules/business/pom.xml index 2d00876..78874bb 100644 --- a/dk-modules/business/pom.xml +++ b/dk-modules/business/pom.xml @@ -30,7 +30,10 @@ org.dromara common-log - + + org.dromara + common-oss + org.dromara common-dict diff --git a/dk-modules/business/src/main/java/org/dromara/business/domain/BusinessAlert.java b/dk-modules/business/src/main/java/org/dromara/business/domain/BusinessAlert.java index 9ac836b..41629d6 100644 --- a/dk-modules/business/src/main/java/org/dromara/business/domain/BusinessAlert.java +++ b/dk-modules/business/src/main/java/org/dromara/business/domain/BusinessAlert.java @@ -169,6 +169,7 @@ public class BusinessAlert { */ private String taskHandle; + private Date createTime; /** * 像素坐标 */ diff --git a/dk-modules/business/src/main/java/org/dromara/business/dubbo/RemoteBusinessAlertServiceImpl.java b/dk-modules/business/src/main/java/org/dromara/business/dubbo/RemoteBusinessAlertServiceImpl.java index 741842b..7f262dd 100644 --- a/dk-modules/business/src/main/java/org/dromara/business/dubbo/RemoteBusinessAlertServiceImpl.java +++ b/dk-modules/business/src/main/java/org/dromara/business/dubbo/RemoteBusinessAlertServiceImpl.java @@ -6,15 +6,16 @@ import org.apache.dubbo.config.annotation.DubboService; import org.dromara.business.api.RemoteBusinessAlertService; import org.dromara.business.api.domain.bo.RemoteBusinessAlertBo; import org.dromara.business.api.domain.vo.RemoteBusinessAlertVo; -import org.dromara.business.domain.BusinessAlert; + import org.dromara.business.domain.vo.BusinessAlertVo; import org.dromara.business.service.IBusinessAlertService; -import org.dromara.common.core.enums.BusinessStatusEnum; -import org.dromara.common.core.utils.MapstructUtils; -import org.dromara.system.api.domain.vo.RemotePostVo; +import org.dromara.business.utils.MinioUntil; +import org.dromara.business.utils.constants.MinIOConstants; + import org.springframework.beans.BeanUtils; import org.springframework.stereotype.Service; +import java.net.URL; import java.util.List; import java.util.stream.Collectors; @@ -54,6 +55,9 @@ public class RemoteBusinessAlertServiceImpl implements RemoteBusinessAlertServic List businessAlerts = businessAlertService.listVerifyAlert(businessAlertBo); return businessAlerts.stream() .map(businessAlertVo -> { + System.out.println(businessAlertVo.getImages()); + URL url = MinioUntil.getObjectUrlOne(MinIOConstants.BUCKET_ALERT, businessAlertVo.getImages(), 3600); + businessAlertVo.setImages(url.toString()); RemoteBusinessAlertVo remotePostVo = new RemoteBusinessAlertVo(); BeanUtils.copyProperties(businessAlertVo, remotePostVo); return remotePostVo; 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 5dd532d..982642d 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 @@ -79,6 +79,8 @@ public class BusinessAlertServiceImpl implements IBusinessAlertService { public Boolean batchAddBusinessAlert(List alertVoList) { List businessAlerts = alertVoList.stream().map(alert -> { BusinessAlert businessAlert = new BusinessAlert(); + alert.setCreateTime(new Date()); + alert.setHandleType(BusinessStatusEnum.VERIFY.getStatus()); BeanUtils.copyProperties(alert, businessAlert); return businessAlert; diff --git a/dk-modules/business/src/main/java/org/dromara/business/utils/MinioUntil.java b/dk-modules/business/src/main/java/org/dromara/business/utils/MinioUntil.java new file mode 100644 index 0000000..b34afac --- /dev/null +++ b/dk-modules/business/src/main/java/org/dromara/business/utils/MinioUntil.java @@ -0,0 +1,16 @@ +package org.dromara.business.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); + } +} diff --git a/dk-modules/business/src/main/java/org/dromara/business/utils/constants/MinIOConstants.java b/dk-modules/business/src/main/java/org/dromara/business/utils/constants/MinIOConstants.java new file mode 100644 index 0000000..367c04a --- /dev/null +++ b/dk-modules/business/src/main/java/org/dromara/business/utils/constants/MinIOConstants.java @@ -0,0 +1,20 @@ +package org.dromara.business.utils.constants; + +import lombok.Data; + + +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/sample/src/main/java/org/dromara/sample/CloudApiSampleApplication.java b/dk-modules/sample/src/main/java/org/dromara/sample/CloudApiSampleApplication.java index 36f54ec..aa1e7b4 100644 --- a/dk-modules/sample/src/main/java/org/dromara/sample/CloudApiSampleApplication.java +++ b/dk-modules/sample/src/main/java/org/dromara/sample/CloudApiSampleApplication.java @@ -1,7 +1,7 @@ package org.dromara.sample; import org.apache.dubbo.config.spring.context.annotation.EnableDubbo; -import org.mybatis.spring.annotation.MapperScan; + import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; import org.springframework.context.annotation.ComponentScan; diff --git a/dk-modules/sample/src/main/java/org/dromara/sample/wayline/service/impl/AiCompareServiceImpl.java b/dk-modules/sample/src/main/java/org/dromara/sample/wayline/service/impl/AiCompareServiceImpl.java index c793c8c..130fbf9 100644 --- a/dk-modules/sample/src/main/java/org/dromara/sample/wayline/service/impl/AiCompareServiceImpl.java +++ b/dk-modules/sample/src/main/java/org/dromara/sample/wayline/service/impl/AiCompareServiceImpl.java @@ -247,7 +247,7 @@ public class AiCompareServiceImpl implements IAiCompareService { @Override public Boolean commitAlert(List> alertList) { List startProcessList = alertList.stream().map(map -> { - String flowCode = remoteWorkflowService.getFlowCode(map.get("labelCn").toString()); + String flowCode = remoteWorkflowService.getFlowCode(map.get("labelEn").toString()); RemoteStartProcess remoteStartProcess = new RemoteStartProcess(); remoteStartProcess.setBusinessId(map.get("id").toString()); remoteStartProcess.setFlowCode(flowCode);