From 12c17fa208e060a2c4407e2ae70e61957935ae7c Mon Sep 17 00:00:00 2001
From: rain <167982779@qq.com>
Date: Tue, 25 Jun 2024 16:53:24 +0800
Subject: [PATCH] 航线错误码修改，图斑规划状态修改
---
src/main/java/com/dji/sample/wayline/service/impl/WaylineJobServiceImpl.java | 24 +++++++++++++++++++++---
1 files changed, 21 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..9213b00 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,14 +787,16 @@
}
@Override
- public List<String> getJobId(String jobName) {
+ public List<String> getJobIds(String jobNames) {
+ List<String> names = getJobNamesByPartialName(jobNames);
+ // 使用 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));
@@ -1061,6 +1078,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