From 8d9a2d656e4ae007590c622e5f7c228adacdca49 Mon Sep 17 00:00:00 2001
From: rain <167982779@qq.com>
Date: Fri, 14 Jun 2024 10:11:36 +0800
Subject: [PATCH] 统一风格
---
src/main/java/com/dji/sample/wayline/service/impl/WaylineJobServiceImpl.java | 128 +++++++++++++++++++++++++++++++-----------
1 files changed, 94 insertions(+), 34 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 a009206..1799c73 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
@@ -3,8 +3,10 @@
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.baomidou.mybatisplus.extension.conditions.query.LambdaQueryChainWrapper;
import com.baomidou.mybatisplus.extension.conditions.update.LambdaUpdateChainWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.dji.sample.common.error.CommonErrorEnum;
@@ -12,17 +14,22 @@
import com.dji.sample.common.model.Pagination;
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.param.DrcModeParam;
-import com.dji.sample.control.model.param.FlyToPointParam;
-import com.dji.sample.control.model.param.TakeoffToPointParam;
+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;
import com.dji.sample.geo.entity.GeoJson;
+import com.dji.sample.log.dao.IDroneFlightLogMapper;
+import com.dji.sample.log.model.entity.DroneFlightLogEntity;
import com.dji.sample.manage.model.dto.DeviceDTO;
import com.dji.sample.manage.model.enums.DeviceModeCodeEnum;
import com.dji.sample.manage.model.enums.DockModeCodeEnum;
@@ -38,10 +45,12 @@
import com.dji.sample.geo.utils.GeoUtils;
import com.dji.sample.wayline.dao.IWaylineJobMapper;
import com.dji.sample.wayline.model.dto.*;
+import com.dji.sample.wayline.model.entity.WaylineJobBreakPointEntity;
import com.dji.sample.wayline.model.entity.WaylineJobEntity;
import com.dji.sample.wayline.model.enums.*;
import com.dji.sample.wayline.model.param.*;
import com.dji.sample.wayline.service.IWaylineFileService;
+import com.dji.sample.wayline.service.IWaylineJobBreakPointService;
import com.dji.sample.wayline.service.IWaylineJobService;
import com.dji.sample.wayline.service.IWaylineRedisService;
import com.fasterxml.jackson.core.type.TypeReference;
@@ -104,6 +113,12 @@
@Autowired
private IControlService controlService;
+ @Autowired
+ private IDroneFlightLogMapper flightLogMapper;
+
+ @Autowired
+ private IWaylineJobBreakPointService waylineJobBreakPointService;
+
private Optional<WaylineJobDTO> insertWaylineJob(WaylineJobEntity jobEntity) {
int id = mapper.insert(jobEntity);
if (id <= 0) {
@@ -134,7 +149,9 @@
.rthAltitude(param.getRthAltitude())
.mediaCount(0)
.build();
-
+ if (StringUtils.hasText(param.getJobId())){
+ jobEntity.setJobId(param.getJobId());
+ }
return insertWaylineJob(jobEntity);
}
@@ -321,7 +338,7 @@
if (WaylineTaskTypeEnum.IMMEDIATE == waylineJob.getTaskType()) {
boolean isExecuted = executeFlightTask(waylineJob.getWorkspaceId(), waylineJob.getJobId());
if (!isExecuted) {
- return ResponseResult.error("执行任务失败");
+ return ResponseResult.error("当前状态不支持飞行，请检查是否已有正在执行的飞行任务！");
}
}
@@ -330,10 +347,10 @@
private Boolean prepareFlightTask(WaylineJobDTO waylineJob) throws SQLException {
- boolean isOnline = deviceRedisService.checkDeviceOnline(waylineJob.getDockSn());
+ /*boolean isOnline = deviceRedisService.checkDeviceOnline(waylineJob.getDockSn());
if (!isOnline) {
throw new RuntimeException("设备离线。");
- }
+ }*/
// get wayline file
Optional<WaylineFileDTO> waylineFile = waylineFileService.getWaylineByWaylineId(waylineJob.getWorkspaceId(), waylineJob.getFileId());
@@ -344,19 +361,27 @@
// get file url
//获取航线文件地址
URL url = waylineFileService.getObjectUrl(waylineJob.getWorkspaceId(), waylineFile.get().getWaylineId());
-
- WaylineTaskCreateDTO flightTask = WaylineTaskCreateDTO.builder()
- .flightId(waylineJob.getJobId())
+ WaylineTaskCreateDTO.WaylineTaskCreateDTOBuilder flightTaskBuilder = WaylineTaskCreateDTO.builder().flightId(waylineJob.getJobId())
.executeTime(waylineJob.getBeginTime().atZone(ZoneId.systemDefault()).toInstant().toEpochMilli())
.taskType(waylineJob.getTaskType())
.waylineType(waylineJob.getWaylineType())
.rthAltitude(waylineJob.getRthAltitude())
.outOfControlAction(waylineJob.getOutOfControlAction())
.file(WaylineTaskFileDTO.builder()
- .url(url.toString())
+ .url(MinioUrlUtils.getUrl(url))
.fingerprint(waylineFile.get().getSign())
- .build())
- .build();
+ .build());
+ WaylineJobBreakPointEntity entity = waylineJob.getWaylineJobBreakPointEntity();
+ if (null != entity) {
+ flightTaskBuilder.breakPoint(BreakPointJobDTO.builder()
+ .index(entity.getBpIndex())
+ .state(entity.getState())
+ .progress(entity.getProgress())
+ .waylineId(entity.getWaylineId())
+ .build());
+ }
+
+ WaylineTaskCreateDTO flightTask = flightTaskBuilder.build();
//当任务类型为条件时
if (WaylineTaskTypeEnum.CONDITION == waylineJob.getTaskType()) {
@@ -411,7 +436,7 @@
.status(WaylineJobStatusEnum.FAILED.getVal())
.completedTime(LocalDateTime.now())
.code(serviceReply.getResult()).build());
- // The conditional task fails and enters the blocking status.
+ // 条件任务失败，进入阻塞状态。
if (WaylineTaskTypeEnum.CONDITION == job.getTaskType()
&& WaylineErrorCodeEnum.find(serviceReply.getResult()).isBlock()) {
waylineRedisService.setBlockedWaylineJob(job.getDockSn(), jobId);
@@ -492,6 +517,25 @@
}
@Override
+ public Optional<WaylineJobDTO> getJobByJobId(String workspaceId, String jobId,Boolean isBreakPoint) {
+ WaylineJobEntity jobEntity = mapper.selectOne(
+ new LambdaQueryWrapper<WaylineJobEntity>()
+ .eq(WaylineJobEntity::getWorkspaceId, workspaceId)
+ .eq(WaylineJobEntity::getJobId, jobId));
+ WaylineJobDTO waylineJobDTO = entity2Dto(jobEntity);
+ if (isBreakPoint) {
+ QueryWrapper queryWrapper = new QueryWrapper();
+ queryWrapper.eq("job_id", jobId);
+ WaylineJobBreakPointEntity waylineJobBreakPointEntity = waylineJobBreakPointService.getOne(queryWrapper);
+ waylineJobDTO.setWaylineJobBreakPointEntity(waylineJobBreakPointEntity);
+ }
+
+ //设置当前时间为执行时间
+ waylineJobDTO.setBeginTime(LocalDateTime.now());
+ return Optional.ofNullable(waylineJobDTO);
+ }
+
+ @Override
public Boolean updateJob(WaylineJobDTO dto) {
try {
@@ -516,6 +560,23 @@
.stream()
.map(this::entity2Dto)
.collect(Collectors.toList());
+
+ return new PaginationData<WaylineJobDTO>(records, new Pagination(pageData));
+ }
+
+ @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);
+
+ List<WaylineJobDTO> records = pageData.getRecords()
+ .stream()
+ .map(this::entity2Dto)
+ .collect(Collectors.toList());
+
+ // 是否需要断点续飞
+ records.forEach(wjd -> wjd.setBreakPoint(waylineJobBreakPointService.count(
+ new LambdaQueryWrapper<WaylineJobBreakPointEntity>().eq(WaylineJobBreakPointEntity::getJobId,wjd.getJobId())) > 0));
+
return new PaginationData<WaylineJobDTO>(records, new Pagination(pageData));
}
@@ -576,7 +637,7 @@
url = waylineFileService.getObjectUrl(waylineJob.getWorkspaceId(), waylineFile.get().getWaylineId());
builder.data(RequestsReply.success(WaylineTaskCreateDTO.builder()
.file(WaylineTaskFileDTO.builder()
- .url(url.toString())
+ .url(MinioUrlUtils.getUrl(url))
.fingerprint(waylineFile.get().getSign())
.build())
.build()));
@@ -701,7 +762,7 @@
}
@Override
- public ResponseResult flyByArea(String sn, FlyAreaParam flyAreaParam, String deviceSn) {
+ public ResponseResult flyByArea(String sn, FlyAreaParam flyAreaParam, String deviceSn) throws Exception {
//获取所有中心点
// List<PointPOJO> targetList = GeoUtils.caculatePointList(flyAreaParam);
@@ -727,7 +788,7 @@
List<PointDTO> pointDTOS = new ArrayList<>();
PointDTO pointDTO = new PointDTO();
- pointDTO.setHeight(150.0);
+ pointDTO.setHeight(120.0);
pointDTO.setLongitude(targetList.get(0).getLon());
pointDTO.setLatitude(targetList.get(0).getLat());
pointDTOS.add(pointDTO);
@@ -738,25 +799,17 @@
if (flyToRes.getCode() == ResponseResult.CODE_SUCCESS) {
//第一个点指令飞行成功后，把数组存到redis中
- /**
- * {
- * targetList:[],
- * curIndex:
- * }
- */
-
JSONObject jsonObject = new JSONObject();
jsonObject.put("targetList",targetList);
+ jsonObject.put("payloadIndex",flyAreaParam.getPayloadIndex());
jsonObject.put("curIndex",0);
-
-
RedisOpsUtils.set("tuban:"+sn,jsonObject);
}
break;
}
}
- return ResponseResult.success();
+ return ResponseResult.success(targetList);
}
public TakeoffToPointParam buildTakeoffToPointParam(PointPOJO dockPoint) {
@@ -900,18 +953,25 @@
@Override
- public WaylineJobCountDTO patrolStatistics(String workspaceId, String queryTime) {
+ public WaylineJobCountDTO patrolStatistics(String workspaceId, String queryTime,String deviceSn) {
WaylineJobCountDTO waylineJobCountDTO = new WaylineJobCountDTO();
- List<WaylineJobEntity> list = mapper.patrolStatistics(workspaceId, queryTime);
+ List<DroneFlightLogEntity> list = flightLogMapper.patrolStatistics(workspaceId,queryTime,deviceSn);
if (!CollectionUtils.isEmpty(list)) {
waylineJobCountDTO.setTotalNumber(list.size());
- long totalTime = list.stream().mapToLong(s -> s.getEndTime() - s.getBeginTime()).sum() / 1000;
- StringBuffer buffer = new StringBuffer();
+ 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;
- buffer.append(h).append(" h ");
- buffer.append(m).append(" min");
- waylineJobCountDTO.setTotalDuration(buffer.toString());
+ 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;
+ }
+ }
+ waylineJobCountDTO.setTotalDistance((int) sum);
}
return waylineJobCountDTO;
}
--
Gitblit v1.9.3