From e192e2f080774b0dbb7c0f03f4c6895e6923b373 Mon Sep 17 00:00:00 2001
From: xieb <vip_xiaobin810@163.com>
Date: Wed, 22 Nov 2023 17:29:12 +0800
Subject: [PATCH] 飞行里程
---
src/main/java/com/dji/sample/wayline/service/impl/WaylineJobServiceImpl.java | 27 ++++++++++++++++++++-------
1 files changed, 20 insertions(+), 7 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 7123c9a..f0c7a10 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
@@ -5,6 +5,7 @@
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
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;
@@ -25,6 +26,8 @@
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;
@@ -105,6 +108,9 @@
@Autowired
private IControlService controlService;
+
+ @Autowired
+ private IDroneFlightLogMapper flightLogMapper;
private Optional<WaylineJobDTO> insertWaylineJob(WaylineJobEntity jobEntity) {
int id = mapper.insert(jobEntity);
@@ -894,18 +900,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