From d4447ca99df2cfe978ca51790dd2891e9df0d492 Mon Sep 17 00:00:00 2001
From: rain <167982779@qq.com>
Date: Thu, 25 Jul 2024 16:19:05 +0800
Subject: [PATCH] 修改人工拍照图片保存,新增面状航线保存、修改接口，图斑文件上传格式修改
---
src/main/java/com/dji/sample/wayline/service/impl/WaylineJobServiceImpl.java | 100 ++++++++++++++++++++++++++++++++++++++++----------
1 files changed, 80 insertions(+), 20 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 3806eea..459ddb0 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.*;
@@ -147,9 +143,10 @@
.waylineType(param.getWaylineType().getVal())
.outOfControlAction(param.getOutOfControlAction())
.rthAltitude(param.getRthAltitude())
+ .rthMode(param.getRthMode())
.mediaCount(0)
.build();
- if (StringUtils.hasText(param.getJobId())){
+ if (StringUtils.hasText(param.getJobId())) {
jobEntity.setJobId(param.getJobId());
}
return insertWaylineJob(jobEntity);
@@ -170,6 +167,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();
}
/**
@@ -338,7 +340,7 @@
if (WaylineTaskTypeEnum.IMMEDIATE == waylineJob.getTaskType()) {
boolean isExecuted = executeFlightTask(waylineJob.getWorkspaceId(), waylineJob.getJobId());
if (!isExecuted) {
- return ResponseResult.error("执行任务失败");
+ return ResponseResult.error("当前状态不支持飞行，请检查是否已有正在执行的飞行任务！");
}
}
@@ -366,6 +368,7 @@
.taskType(waylineJob.getTaskType())
.waylineType(waylineJob.getWaylineType())
.rthAltitude(waylineJob.getRthAltitude())
+ .rthMode(waylineJob.getRthMode())
.outOfControlAction(waylineJob.getOutOfControlAction())
.file(WaylineTaskFileDTO.builder()
.url(MinioUrlUtils.getUrl(url))
@@ -517,7 +520,7 @@
}
@Override
- public Optional<WaylineJobDTO> getJobByJobId(String workspaceId, String jobId,Boolean isBreakPoint) {
+ public Optional<WaylineJobDTO> getJobByJobId(String workspaceId, String jobId, Boolean isBreakPoint) {
WaylineJobEntity jobEntity = mapper.selectOne(
new LambdaQueryWrapper<WaylineJobEntity>()
.eq(WaylineJobEntity::getWorkspaceId, workspaceId)
@@ -566,7 +569,7 @@
@Override
public PaginationData<WaylineJobDTO> getJobsByWorkspaceIdNew(String workspaceId, long page, long pageSize, WaylineJobQueryParam waylineJobQueryParam, String order) {
- Page<WaylineJobEntity> pageData = mapper.getPageNew(new Page<WaylineJobEntity>(page, pageSize), waylineJobQueryParam, workspaceId,order);
+ Page<WaylineJobEntity> pageData = mapper.getPageNew(new Page<WaylineJobEntity>(page, pageSize), waylineJobQueryParam, workspaceId, order);
List<WaylineJobDTO> records = pageData.getRecords()
.stream()
@@ -575,7 +578,7 @@
// 是否需要断点续飞
records.forEach(wjd -> wjd.setBreakPoint(waylineJobBreakPointService.count(
- new LambdaQueryWrapper<WaylineJobBreakPointEntity>().eq(WaylineJobBreakPointEntity::getJobId,wjd.getJobId())) > 0));
+ new LambdaQueryWrapper<WaylineJobBreakPointEntity>().eq(WaylineJobBreakPointEntity::getJobId, wjd.getJobId())) > 0));
return new PaginationData<WaylineJobDTO>(records, new Pagination(pageData));
@@ -654,6 +657,17 @@
}
@Override
+ public List<String> selectJobIdByName(String name) {
+ List<WaylineJobEntity> waylineJobs = mapper.selectList(new LambdaQueryWrapper<WaylineJobEntity>()
+ .select(WaylineJobEntity::getJobId)
+ .like(WaylineJobEntity::getName, name));
+ return waylineJobs.stream()
+ .map(WaylineJobEntity::getJobId)
+ .collect(Collectors.toList());
+ }
+
+
+ @Override
public void uploadMediaHighestPriority(String workspaceId, String jobId) {
Optional<WaylineJobDTO> jobOpt = getJobByJobId(workspaceId, jobId);
if (jobOpt.isEmpty()) {
@@ -730,6 +744,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())) {
@@ -754,6 +777,41 @@
}
return WaylineJobStatusEnum.UNKNOWN;
}
+
+ @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);
+
+ // 如果 names 列表为空，直接返回空的 jobIdStringList
+ if (names.isEmpty()) {
+ return new ArrayList<>();
+ }
+
+ // 使用 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) {
@@ -800,10 +858,10 @@
if (flyToRes.getCode() == ResponseResult.CODE_SUCCESS) {
//第一个点指令飞行成功后，把数组存到redis中
JSONObject jsonObject = new JSONObject();
- jsonObject.put("targetList",targetList);
- jsonObject.put("payloadIndex",flyAreaParam.getPayloadIndex());
- jsonObject.put("curIndex",0);
- RedisOpsUtils.set("tuban:"+sn,jsonObject);
+ jsonObject.put("targetList", targetList);
+ jsonObject.put("payloadIndex", flyAreaParam.getPayloadIndex());
+ jsonObject.put("curIndex", 0);
+ RedisOpsUtils.set("tuban:" + sn, jsonObject);
}
break;
}
@@ -953,22 +1011,22 @@
@Override
- public WaylineJobCountDTO patrolStatistics(String workspaceId, String queryTime,String deviceSn) {
+ public WaylineJobCountDTO patrolStatistics(String workspaceId, String queryTime, String deviceSn) {
WaylineJobCountDTO waylineJobCountDTO = new WaylineJobCountDTO();
- List<DroneFlightLogEntity> list = flightLogMapper.patrolStatistics(workspaceId,queryTime,deviceSn);
+ List<DroneFlightLogEntity> list = flightLogMapper.patrolStatistics(workspaceId, queryTime, deviceSn);
if (!CollectionUtils.isEmpty(list)) {
waylineJobCountDTO.setTotalNumber(list.size());
- long totalTime = list.stream().filter(task -> task.getEndTime()!= null && task.getStartTime()!= null).mapToLong(s -> s.getEndTime() - s.getStartTime()).sum() / 1000;
+ long totalTime = list.stream().filter(task -> task.getEndTime() != null && task.getStartTime() != null).mapToLong(s -> s.getEndTime() - s.getStartTime()).sum() / 1000;
long h = totalTime / 3600;
long m = (totalTime % 3600) / 60;
- waylineJobCountDTO.setTotalDuration( String.format("%02d h %02d min", h, m));
+ waylineJobCountDTO.setTotalDuration(String.format("%02d h %02d min", h, m));
List<String> deviceSns = list.stream().map(DroneFlightLogEntity::getDeviceSn).distinct().collect(Collectors.toList());
double sum = 0.0;
for (String sn : deviceSns) {
Double totalFlightDistance = new LambdaQueryChainWrapper<>(flightLogMapper)
.eq(DroneFlightLogEntity::getDeviceSn, sn).orderByDesc(DroneFlightLogEntity::getEndTime).last("limit 1").one().getTotalFlightDistance();
- if (totalFlightDistance!= null){
- sum+=totalFlightDistance;
+ if (totalFlightDistance != null) {
+ sum += totalFlightDistance;
}
}
waylineJobCountDTO.setTotalDistance((int) sum);
@@ -1029,6 +1087,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())
@@ -1052,6 +1111,7 @@
.taskType(WaylineTaskTypeEnum.find(entity.getTaskType()))
.waylineType(WaylineTemplateTypeEnum.find(entity.getWaylineType()))
.rthAltitude(entity.getRthAltitude())
+ .rthMode(entity.getRthMode())
.outOfControlAction(entity.getOutOfControlAction())
.mediaCount(entity.getMediaCount())
.hasChildren(entity.getHasChildren());
--
Gitblit v1.9.3