From efb0d6f50d446e56949e23f3f8cb230d719a7b2d Mon Sep 17 00:00:00 2001
From: rain <167982779@qq.com>
Date: Tue, 02 Jul 2024 17:21:12 +0800
Subject: [PATCH] 增加国标直播接口，完成人工图片与图斑绑定，修改图片获取接口，获取前更新人工图片的图斑绑定
---
src/main/java/com/dji/sample/wayline/service/impl/WaylineJobServiceImpl.java | 31 ++++++++++++++++++++++++++++---
1 files changed, 28 insertions(+), 3 deletions(-)
diff --git a/src/main/java/com/dji/sample/wayline/service/impl/WaylineJobServiceImpl.java b/src/main/java/com/dji/sample/wayline/service/impl/WaylineJobServiceImpl.java
index 9e22c2e..91cf612 100644
--- a/src/main/java/com/dji/sample/wayline/service/impl/WaylineJobServiceImpl.java
+++ b/src/main/java/com/dji/sample/wayline/service/impl/WaylineJobServiceImpl.java
@@ -49,6 +49,7 @@
import com.dji.sample.wayline.service.IWaylineJobBreakPointService;
import com.dji.sample.wayline.service.IWaylineJobService;
import com.dji.sample.wayline.service.IWaylineRedisService;
+import com.dji.sample.wayline.util.ErrorCodeUtil;
import com.fasterxml.jackson.core.type.TypeReference;
import com.fasterxml.jackson.databind.ObjectMapper;
import lombok.extern.slf4j.Slf4j;
@@ -165,6 +166,11 @@
jobEntity.setParentId(parentId);
return this.insertWaylineJob(jobEntity);
+ }
+ @Override
+ public String getWaylineId(String jobId){
+ WaylineJobEntity waylineJob=mapper.selectOne(new LambdaQueryWrapper<WaylineJobEntity>().select(WaylineJobEntity::getFileId).eq(WaylineJobEntity::getJobId,jobId));
+ return waylineJob.getFileId();
}
/**
@@ -736,6 +742,15 @@
}
+ @Override
+ public List<String> getJobNamesByPartialName(String partialJobName) {
+ LambdaQueryWrapper<WaylineJobEntity> queryWrapper = new LambdaQueryWrapper<>();
+ queryWrapper.like(WaylineJobEntity::getName, partialJobName);
+ return mapper.selectList(queryWrapper).stream()
+ .map(WaylineJobEntity::getName)
+ .collect(Collectors.toList());
+ }
+
public WaylineJobStatusEnum getWaylineState(String dockSn) {
Optional<DeviceDTO> dockOpt = deviceRedisService.getDeviceOnline(dockSn);
if (dockOpt.isEmpty() || !StringUtils.hasText(dockOpt.get().getChildDeviceSn())) {
@@ -772,20 +787,29 @@
}
@Override
- public List<String> getJobId(String jobName) {
+ public List<String> getJobIds(String jobNames) {
+ List<String> names = getJobNamesByPartialName(jobNames);
+
+ // 如果 names 列表为空，直接返回空的 jobIdStringList
+ if (names.isEmpty()) {
+ return new ArrayList<>();
+ }
+
+ // 使用 LambdaQueryWrapper 进行查询
List<Object> jobIdList = mapper.selectObjs(
new LambdaQueryWrapper<WaylineJobEntity>()
.select(WaylineJobEntity::getJobId)
- .eq(WaylineJobEntity::getName, jobName)
+ .in(WaylineJobEntity::getName, names) // 使用 IN 子句
);
-// 将 Object 类型的 jobId 转换为 String 类型，并放入 List<String> 中
+ // 将 Object 类型的 jobId 转换为 String 类型，并放入 List<String> 中
List<String> jobIdStringList = new ArrayList<>();
for (Object jobIdObj : jobIdList) {
jobIdStringList.add(String.valueOf(jobIdObj));
}
return jobIdStringList;
}
+
@Override
public WaylineJobEntity getLatestJob(String workspaceId, WaylineJobQueryParam waylineJobQueryParam) {
@@ -1061,6 +1085,7 @@
WaylineJobDTO.WaylineJobDTOBuilder builder = WaylineJobDTO.builder()
.jobId(entity.getJobId())
+ .reason(ErrorCodeUtil.codeToReason(entity.getErrorCode()))
.jobName(entity.getName())
.fileId(entity.getFileId())
.fileName(waylineFileService.getWaylineByWaylineId(entity.getWorkspaceId(), entity.getFileId())
--
Gitblit v1.9.3