From de934e6c328340afd94d0b476bdbc473223e37e0 Mon Sep 17 00:00:00 2001 From: yq183 <645046984@qq.com> Date: Sun, 30 Mar 2025 11:39:10 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E4=BA=A4=EF=BC=9Ajob=E6=9F=A5?= =?UTF-8?q?=E8=AF=A2=E6=95=B0=E6=8D=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- dk-api/api-bom/pom.xml | 5 + dk-api/api-sample/pom.xml | 31 ++++++ .../dromara/sample/api/RemoteJobService.java | 19 ++++ .../api/domain/vo/RemoteMediaFileVo.java | 100 ++++++++++++++++++ dk-api/pom.xml | 2 + .../service/impl/BusinessTaskServiceImpl.java | 2 +- dk-modules/sample/pom.xml | 8 ++ .../sample/dubbo/RemoteJobServiceImpl.java | 30 ++++++ .../sample/media/service/IFileService.java | 4 +- .../media/service/impl/FileServiceImpl.java | 8 ++ 10 files changed, 207 insertions(+), 2 deletions(-) create mode 100644 dk-api/api-sample/pom.xml create mode 100644 dk-api/api-sample/src/main/java/org/dromara/sample/api/RemoteJobService.java create mode 100644 dk-api/api-sample/src/main/java/org/dromara/sample/api/domain/vo/RemoteMediaFileVo.java create mode 100644 dk-modules/sample/src/main/java/org/dromara/sample/dubbo/RemoteJobServiceImpl.java diff --git a/dk-api/api-bom/pom.xml b/dk-api/api-bom/pom.xml index 3e6a7b4..9efdd68 100644 --- a/dk-api/api-bom/pom.xml +++ b/dk-api/api-bom/pom.xml @@ -45,6 +45,11 @@ org.dromara api-business ${revision} + · + + org.dromara + api-sample + ${revision} diff --git a/dk-api/api-sample/pom.xml b/dk-api/api-sample/pom.xml new file mode 100644 index 0000000..4b7b718 --- /dev/null +++ b/dk-api/api-sample/pom.xml @@ -0,0 +1,31 @@ + + + + org.dromara + dk-api + ${revision} + + 4.0.0 + + api-sample + api-sample + + + + + + + org.dromara + common-core + + + + org.dromara + common-excel + + + + + diff --git a/dk-api/api-sample/src/main/java/org/dromara/sample/api/RemoteJobService.java b/dk-api/api-sample/src/main/java/org/dromara/sample/api/RemoteJobService.java new file mode 100644 index 0000000..5c43d28 --- /dev/null +++ b/dk-api/api-sample/src/main/java/org/dromara/sample/api/RemoteJobService.java @@ -0,0 +1,19 @@ +package org.dromara.sample.api; + +import org.dromara.sample.api.domain.vo.RemoteMediaFileVo; + +import java.util.List; + +/** + * @auther yq + * @data 2025/3/30 + */ +public interface RemoteJobService { + + /** + * @param jobId + * @param fileType 文件类型jpeg、mp4、RTK、OBS、NAV、MRK、DAT + * */ + List getRemoteMediaFileVo(String jobId,String fileType); + +} diff --git a/dk-api/api-sample/src/main/java/org/dromara/sample/api/domain/vo/RemoteMediaFileVo.java b/dk-api/api-sample/src/main/java/org/dromara/sample/api/domain/vo/RemoteMediaFileVo.java new file mode 100644 index 0000000..1d2b311 --- /dev/null +++ b/dk-api/api-sample/src/main/java/org/dromara/sample/api/domain/vo/RemoteMediaFileVo.java @@ -0,0 +1,100 @@ +package org.dromara.sample.api.domain.vo; + +import lombok.Data; + +import java.io.Serializable; +import java.util.Date; + +/** + * @auther yq + * @data 2025/3/30 + */ +@Data +public class RemoteMediaFileVo implements Serializable { + + private Integer id; + + + private String fileId; + + + private String fileName; + + + private String filePath; + + + private String workspaceId; + + + private String fingerprint; + + + private String tinnyFingerprint; + + + private String objectKey; + + + private Integer subFileType; + + + private Boolean isOriginal; + + + private String drone; + + + private String payload; + + + private String jobId; + + + private Date createTime; + + + private Date updateTime; + + + private Double lat; + + + private Double lng; + + + private Double absoluteAltitude; + + + private Double relativeAltitude; + + + private Date shootTime; + + private Double gimbalYawDegree; + + + private String cloudToCloudId; + + + private Integer uploadedFileCount; + + private Integer expectedFileCount; + + private Integer flightType; + + /** + * 文件类型jpeg、mp4、RTK、OBS、NAV、MRK、DAT + */ + + private String fileType; + + /** + * 后缀类型广角 W、广角 V、红外 T、变焦 Z、RTCM文件 D 、PPK + */ + + private String fileStatus; + + + private Integer fileIndex; +} diff --git a/dk-api/pom.xml b/dk-api/pom.xml index b68ef7c..35c8820 100644 --- a/dk-api/pom.xml +++ b/dk-api/pom.xml @@ -15,6 +15,8 @@ api-workflow api-business api-rocketmq + api-sample + dk-api diff --git a/dk-modules/business/src/main/java/org/dromara/business/service/impl/BusinessTaskServiceImpl.java b/dk-modules/business/src/main/java/org/dromara/business/service/impl/BusinessTaskServiceImpl.java index bc36d80..c53435e 100644 --- a/dk-modules/business/src/main/java/org/dromara/business/service/impl/BusinessTaskServiceImpl.java +++ b/dk-modules/business/src/main/java/org/dromara/business/service/impl/BusinessTaskServiceImpl.java @@ -48,7 +48,7 @@ public class BusinessTaskServiceImpl implements IBusinessTaskService { @Override public BusinessTaskVo queryById(Long id){ BusinessTaskVo businessTaskVo = baseMapper.selectVoById(id); - return ; + return businessTaskVo; } /** diff --git a/dk-modules/sample/pom.xml b/dk-modules/sample/pom.xml index 7249b87..5b8cc62 100644 --- a/dk-modules/sample/pom.xml +++ b/dk-modules/sample/pom.xml @@ -7,6 +7,10 @@ dk-modules ${revision} + pom + + ../../dk-api/api-sample + 4.0.0 sample @@ -103,6 +107,10 @@ org.dromara api-business + + org.dromara + api-sample + org.dromara api-resource diff --git a/dk-modules/sample/src/main/java/org/dromara/sample/dubbo/RemoteJobServiceImpl.java b/dk-modules/sample/src/main/java/org/dromara/sample/dubbo/RemoteJobServiceImpl.java new file mode 100644 index 0000000..42e4da4 --- /dev/null +++ b/dk-modules/sample/src/main/java/org/dromara/sample/dubbo/RemoteJobServiceImpl.java @@ -0,0 +1,30 @@ +package org.dromara.sample.dubbo; + +import lombok.RequiredArgsConstructor; +import org.apache.dubbo.config.annotation.DubboService; +import org.dromara.common.core.utils.MapstructUtils; +import org.dromara.sample.api.RemoteJobService; +import org.dromara.sample.api.domain.vo.RemoteMediaFileVo; +import org.dromara.sample.media.model.MediaFileEntity; +import org.dromara.sample.media.service.IFileService; +import org.springframework.stereotype.Service; + +import java.util.List; + +/** + * @auther yq + * @data 2025/3/30 + */ +@RequiredArgsConstructor +@Service +@DubboService +public class RemoteJobServiceImpl implements RemoteJobService { + private final IFileService fileService; + + @Override + public List getRemoteMediaFileVo(String jobId, String fileType) { + List remoteMediaFileVo = fileService.getRemoteMediaFileVo(jobId, fileType); + List mediaFileEntities = MapstructUtils.convert(remoteMediaFileVo, RemoteMediaFileVo.class); + return mediaFileEntities; + } +} diff --git a/dk-modules/sample/src/main/java/org/dromara/sample/media/service/IFileService.java b/dk-modules/sample/src/main/java/org/dromara/sample/media/service/IFileService.java index dead30b..71017fc 100644 --- a/dk-modules/sample/src/main/java/org/dromara/sample/media/service/IFileService.java +++ b/dk-modules/sample/src/main/java/org/dromara/sample/media/service/IFileService.java @@ -3,7 +3,9 @@ package org.dromara.sample.media.service; import org.dromara.common.sdk.cloudapi.media.FlightTask; import org.dromara.common.sdk.cloudapi.media.MediaUploadCallbackRequest; import org.dromara.common.sdk.common.PaginationData; +import org.dromara.sample.api.domain.vo.RemoteMediaFileVo; import org.dromara.sample.media.model.MediaFileDTO; +import org.dromara.sample.media.model.MediaFileEntity; import java.net.URL; import java.util.List; @@ -79,5 +81,5 @@ public interface IFileService { */ URL getObjectUrlOne(String bucket,String pathUrl,Integer seconds); - + List getRemoteMediaFileVo(String jobId, String fileType); } diff --git a/dk-modules/sample/src/main/java/org/dromara/sample/media/service/impl/FileServiceImpl.java b/dk-modules/sample/src/main/java/org/dromara/sample/media/service/impl/FileServiceImpl.java index 524fa2b..ac32589 100644 --- a/dk-modules/sample/src/main/java/org/dromara/sample/media/service/impl/FileServiceImpl.java +++ b/dk-modules/sample/src/main/java/org/dromara/sample/media/service/impl/FileServiceImpl.java @@ -1,6 +1,7 @@ package org.dromara.sample.media.service.impl; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import org.dromara.common.oss.core.OssClient; import org.dromara.common.oss.factory.OssFactory; @@ -10,6 +11,7 @@ import org.dromara.common.sdk.cloudapi.media.MediaSubFileTypeEnum; import org.dromara.common.sdk.cloudapi.media.MediaUploadCallbackRequest; import org.dromara.common.sdk.common.Pagination; import org.dromara.common.sdk.common.PaginationData; +import org.dromara.sample.api.domain.vo.RemoteMediaFileVo; import org.dromara.sample.manage.model.dto.DeviceDictionaryDTO; import org.dromara.sample.manage.service.IDeviceDictionaryService; import org.dromara.sample.media.mapper.IFileMapper; @@ -149,6 +151,12 @@ public class FileServiceImpl implements IFileService { return storage.getPrivateUrlURL(pathUrl,seconds); } + @Override + public List getRemoteMediaFileVo(String jobId, String fileType) { + QueryWrapper wrapper = new QueryWrapper().eq("job_id", jobId).in("file_type", fileType).orderByAsc("file_index"); + return mapper.selectList(wrapper); + } + /** * Convert the received file object into a database entity object. * @param file