航线定时任务调整，视频播放接口返回地址修改

rain

2024-06-19 cbbb9003b44d7c9d7adc80188343f0065732b0ce

 src/main/java/com/dji/sample/patches/utils/TimerUtil.java

@@ -14,9 +14,11 @@
import com.dji.sample.territory.pojo.TerritoryConfigPojo;
import com.dji.sample.territory.service.ITbFJService;
import com.dji.sample.wayline.model.dto.WaylineFileDTO;
import com.dji.sample.wayline.model.dto.WaylineJobDTO;
import com.dji.sample.wayline.model.entity.WaylineFileEntity;
import com.dji.sample.wayline.model.param.CreateJobParam;
import com.dji.sample.wayline.service.IWaylineFileService;
import com.dji.sample.wayline.service.IWaylineJobBreakPointService;
import com.dji.sample.wayline.service.IWaylineJobService;

import org.springframework.beans.factory.annotation.Autowired;
@@ -42,10 +44,7 @@
import java.time.ZoneId;
import java.time.ZonedDateTime;
import java.time.format.DateTimeFormatter;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.*;
import java.util.concurrent.ExecutorService;
import java.util.concurrent.Executors;
import java.util.stream.Collectors;
@@ -76,7 +75,8 @@
    private IWaylineJobService waylineJobService;
    @Autowired
    private TerritoryConfigPojo territoryConfigPojo;

    @Autowired
    private IWaylineJobBreakPointService jobBreakPointService;

    /**
     * 定时器，将没有规划的图斑生成航线，并将航线飞完后的成果数据进行保存推送
@@ -93,9 +93,7 @@
        List<List<LotInfo>> lists = getNoPlan(workspaceId);
        List<List<LotInfo>> convertedLists = convertToLists(lists);
        for (List<LotInfo> list : convertedLists) {
            long timestamp = System.currentTimeMillis();
            time = addOneHourToTimestamp(time);
            String waylineName = "云飞行调查" + timestamp;
            String waylineName = getNowTimeName();
            //根据获取的图斑集合获得kmz航线文件
            MultipartFile multipartFile = null;
            try {
@@ -113,8 +111,9 @@
            List<Long> lists1 = new ArrayList<>();
            lists1.add(time);
            String times = convertTimestampToFormattedString(time);
            sendPostWithParameters("云飞行计划" + timestamp, waylineFile.getWaylineId(), times, lists1, listOfLists);
            sendPostWithParameters(waylineName, waylineFile.getWaylineId(), times, lists1, listOfLists);
            updatePatchesStatu(list);
            time = addOneHourToTimestamp(time);
        }

    }
@@ -130,6 +129,17 @@
            }
        });
        executor.shutdown();
    }

    public void myTask3() throws SQLException {
        String workspaceId = "4a574db8-4ad3-48f7-9f16-3edbcd8056e1";
        String name = getNowDay();
        List<String> jobs = waylineJobService.selectJobIdByName(name);
        List<String> jobIds = jobBreakPointService.selectHaveBreak(jobs);
        for (String jobid : jobIds) {
            Optional<WaylineJobDTO> waylineJobDTO = waylineJobService.getJobByJobId(workspaceId, jobid, true);
            waylineJobService.publishOneFlightTask(waylineJobDTO.get());
        }
    }

    /**
@@ -533,7 +543,7 @@
        ZonedDateTime zonedDateTime = instant.atZone(ZoneId.systemDefault());

        // 加上一小时
        ZonedDateTime zonedDateTimePlusOneHour = zonedDateTime.plusHours(1);
        ZonedDateTime zonedDateTimePlusOneHour = zonedDateTime.plusHours(1).plusMinutes(30);

        // 将ZonedDateTime对象转换回秒级时间戳
        return zonedDateTimePlusOneHour.toInstant().getEpochSecond();
@@ -552,4 +562,26 @@
        return chinaTime.format(formatter);
    }

    public static String getNowTimeName() {
        LocalDateTime currentTime = LocalDateTime.now();

        // 格式化时间，生成当前时间
        return "云飞行计划" + currentTime.format(DateTimeFormatter.ofPattern("MMddHHmmssSS"));
    }

    public static String getNowDay() {
        LocalDateTime currentTime = LocalDateTime.now();

        // 格式化时间，生成当前时间
        return "云飞行计划" + currentTime.format(DateTimeFormatter.ofPattern("MMdd"));
    }

    public static void main(String[] args) {
        // 获取当前时间
        LocalDateTime currentTime = LocalDateTime.now();

        // 格式化时间，生成文件夹名字
        String folderName = currentTime.format(DateTimeFormatter.ofPattern("MMddHHmmssSS"));
        System.out.println(folderName);
    }
}