定时四个九洲巡查任务，新增媒体文件任务查询、搜索接口

rain

2024-06-24 1fc2b9a38ce7fb5f0a78361a731e98750fbd20c1

 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;
@@ -66,7 +62,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.*;
@@ -149,7 +144,7 @@
                .rthAltitude(param.getRthAltitude())
                .mediaCount(0)
                .build();
        if (StringUtils.hasText(param.getJobId())){
        if (StringUtils.hasText(param.getJobId())) {
            jobEntity.setJobId(param.getJobId());
        }
        return insertWaylineJob(jobEntity);
@@ -338,7 +333,7 @@
        if (WaylineTaskTypeEnum.IMMEDIATE == waylineJob.getTaskType()) {
            boolean isExecuted = executeFlightTask(waylineJob.getWorkspaceId(), waylineJob.getJobId());
            if (!isExecuted) {
                return ResponseResult.error("执行任务失败");
                return ResponseResult.error("当前状态不支持飞行，请检查是否已有正在执行的飞行任务！");
            }
        }

@@ -517,7 +512,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 +561,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 +570,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));
@@ -652,6 +647,17 @@
        messageSender.publish(topic, builder.build());

    }

    @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) {
@@ -756,6 +762,32 @@
    }

    @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> getJobId(String jobName) {
        List<Object> jobIdList = mapper.selectObjs(
                new LambdaQueryWrapper<WaylineJobEntity>()
                        .select(WaylineJobEntity::getJobId)
                        .eq(WaylineJobEntity::getName, jobName)
        );

// 将 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;
@@ -800,10 +832,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 +985,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);