From cc7b680aa5b2a6ad599c394715bb4327de8670bf Mon Sep 17 00:00:00 2001
From: rain <167982779@qq.com>
Date: Tue, 25 Jun 2024 14:37:32 +0800
Subject: [PATCH] 调查取证手动航线更新图斑调查状态，新增媒体查询接口视频图片筛查，调整定时任务时间，新增航线任务错误代码识别
---
src/main/java/com/dji/sample/wayline/service/impl/WaylineJobServiceImpl.java | 49 +++++++++++++++++++++++++++++++++++++++++++------
1 files changed, 43 insertions(+), 6 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 f55eefa..589c259 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
@@ -15,15 +15,11 @@
import com.dji.sample.common.model.PaginationData;
import com.dji.sample.common.model.ResponseResult;
import com.dji.sample.common.util.MinioUrlUtils;
-import com.dji.sample.common.util.SpringBeanUtils;
import com.dji.sample.component.mqtt.model.*;
import com.dji.sample.component.mqtt.service.IMessageSenderService;
import com.dji.sample.component.redis.RedisConst;
import com.dji.sample.component.redis.RedisOpsUtils;
import com.dji.sample.control.model.dto.PointDTO;
-import com.dji.sample.control.model.enums.CameraModeEnum;
-import com.dji.sample.control.model.enums.DroneAuthorityEnum;
-import com.dji.sample.control.model.enums.PayloadCommandsEnum;
import com.dji.sample.control.model.param.*;
import com.dji.sample.control.service.IControlService;
import com.dji.sample.control.service.IDrcService;
@@ -53,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;
@@ -66,7 +63,6 @@
import org.springframework.util.CollectionUtils;
import org.springframework.util.StringUtils;
-import java.io.File;
import java.net.URL;
import java.sql.SQLException;
import java.time.*;
@@ -170,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();
}
/**
@@ -664,7 +665,6 @@
}
-
@Override
public void uploadMediaHighestPriority(String workspaceId, String jobId) {
Optional<WaylineJobDTO> jobOpt = getJobByJobId(workspaceId, jobId);
@@ -742,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())) {
@@ -768,6 +777,34 @@
}
@Override
+ public String getName(String jobId) {
+ WaylineJobEntity entity = mapper.selectOne(
+ new LambdaQueryWrapper<WaylineJobEntity>()
+ .select(WaylineJobEntity::getName)
+ .eq(WaylineJobEntity::getJobId, jobId)
+ );
+ return entity != null ? entity.getName() : null;
+ }
+
+ @Override
+ public List<String> getJobIds(String jobNames) {
+ List<String> names = getJobNamesByPartialName(jobNames);
+ // 使用 LambdaQueryWrapper 进行查询
+ List<Object> jobIdList = mapper.selectObjs(
+ new LambdaQueryWrapper<WaylineJobEntity>()
+ .select(WaylineJobEntity::getJobId)
+ .in(WaylineJobEntity::getName, names) // 使用 IN 子句
+ );
+
+ // 将 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) {
WaylineJobEntity waylineJobEntity = mapper.getLatest(workspaceId, waylineJobQueryParam);
return waylineJobEntity;
--
Gitblit v1.9.3