aix
2024-07-09 2aaaaf4598b869085ae35871de018cd35847c232
src/main/java/com/dji/sample/patches/utils/TimerUtil.java
@@ -64,8 +64,7 @@
    private PatchesConfigPojo patchesConfigPojo;
    @Autowired
    public IWaylineFileService waylineFileService;
    @Autowired
    private IFileMapper fileMapper;
    @Autowired
    private ITbFJService tbFJService;
    @Autowired
@@ -99,7 +98,7 @@
            //根据获取的图斑集合获得kmz航线文件
            MultipartFile multipartFile = null;
            try {
                multipartFile = getFile(waylineName, list);
                multipartFile = getFile(waylineName, list,28.62452712442823, 115.85666327144976);
            } catch (IOException e) {
                throw new RuntimeException(e);
            }
@@ -115,12 +114,12 @@
            String times = convertTimestampToFormattedString(time);
            sendPostWithParameters(waylineName, waylineFile.getWaylineId(), times, lists1, listOfLists);
            updatePatchesStatu(list);
            time = addOneHourToTimestamp(time, 1, 30);
            time = addOneHourToTimestamp(time, 1, 0);
        }
    }
    @Scheduled(cron = "0 0 0 * * ?")
    @Scheduled(cron = "0 1 0 * * ?")
    public void myTask2() {
        ExecutorService executor = Executors.newSingleThreadExecutor();
        executor.execute(() -> {
@@ -143,9 +142,9 @@
//            waylineJobService.publishOneFlightTask(waylineJobDTO.get());
//        }
//    }
    @Scheduled(cron = "0 0 0 * * ?")
    @Scheduled(cron = "0 0 1 * * ?")
    public void mytask4() throws IOException {
        Long time = getCurrentTimestampPlus8Hours(9);
        Long time = getCurrentTimestampPlus8Hours(8);
        List<List<Long>> listOfLists = new ArrayList<>();
        List<Long> sublist = new ArrayList<>();
        sublist.add(time); // 添加整数值
@@ -153,13 +152,12 @@
        List<Long> lists1 = new ArrayList<>();
        lists1.add(time);
        String times = convertTimestampToFormattedString(time);
        sendPostWithParameters("别墅巡查一段", "a07229af-471a-4058-9da6-5a2b84308b9e", times, lists1, listOfLists);
        sendPostWithParameters("别墅巡查一段", "c1b9c70e-2e58-4147-b43e-aa4f639726bb", times, lists1, listOfLists);
    }
    @Scheduled(cron = "0 0 0 * * ?")
    @Scheduled(cron = "0 50 0 * * ?")
    public void mytask5() throws IOException {
        Long time = getCurrentTimestampPlus8Hours(9);
        time = addOneHourToTimestamp(time, 0, 50);
        List<List<Long>> listOfLists = new ArrayList<>();
        List<Long> sublist = new ArrayList<>();
        sublist.add(time); // 添加整数值
@@ -167,13 +165,12 @@
        List<Long> lists1 = new ArrayList<>();
        lists1.add(time);
        String times = convertTimestampToFormattedString(time);
        sendPostWithParameters("别墅巡查二段", "561ecb37-d673-40f8-a859-05dbfc7d9976", times, lists1, listOfLists);
        sendPostWithParameters("别墅巡查二段", "a07229af-471a-4058-9da6-5a2b84308b9e", times, lists1, listOfLists);
    }
    @Scheduled(cron = "0 0 0 * * ?")
    @Scheduled(cron = "0 40 1 * * ?")
    public void mytask6() throws IOException {
        Long time = getCurrentTimestampPlus8Hours(9);
        time = addOneHourToTimestamp(time, 1, 40);
        List<List<Long>> listOfLists = new ArrayList<>();
        List<Long> sublist = new ArrayList<>();
        sublist.add(time); // 添加整数值
@@ -184,10 +181,9 @@
        sendPostWithParameters("九洲巡河一段", "9f471686-a73a-4e90-8f37-92eed8ed5929", times, lists1, listOfLists);
    }
    @Scheduled(cron = "0 0 0 * * ?")
    @Scheduled(cron = "0 40 2 * * ?")
    public void mytask7() throws IOException {
        Long time = getCurrentTimestampPlus8Hours(9);
        time = addOneHourToTimestamp(time, 2, 50);
        List<List<Long>> listOfLists = new ArrayList<>();
        List<Long> sublist = new ArrayList<>();
        sublist.add(time); // 添加整数值
@@ -198,6 +194,30 @@
        sendPostWithParameters("九洲巡河二段", "58cd4261-02d7-4c4e-b876-25a4a2630c18", times, lists1, listOfLists);
    }
    @Scheduled(cron = "0 30 2 * * ?")
    public void mytask8() throws IOException {
        Long time = getCurrentTimestampPlus8Hours(12);
        List<List<Long>> listOfLists = new ArrayList<>();
        List<Long> sublist = new ArrayList<>();
        sublist.add(time); // 添加整数值
        listOfLists.add(sublist);
        List<Long> lists1 = new ArrayList<>();
        lists1.add(time);
        String times = convertTimestampToFormattedString(time);
        sendPostWithParameters("定时任务2:30", "c3a7b125-bc0b-49d4-96ed-80743200ab80", times, lists1, listOfLists);
    }
    @Scheduled(cron = "0 30 2 * * ?")
    public void mytask9() throws IOException {
        Long time = getCurrentTimestampPlus8Hours(14);
        List<List<Long>> listOfLists = new ArrayList<>();
        List<Long> sublist = new ArrayList<>();
        sublist.add(time); // 添加整数值
        listOfLists.add(sublist);
        List<Long> lists1 = new ArrayList<>();
        lists1.add(time);
        String times = convertTimestampToFormattedString(time);
        sendPostWithParameters("定时任务4:30", "c3a7b125-bc0b-49d4-96ed-80743200ab80", times, lists1, listOfLists);
    }
    /**
     * 完成对未推送的图斑数据进行整合发送
     *
@@ -241,8 +261,9 @@
     * @return
     * @throws IOException
     */
    public MultipartFile getFile(String waylineName, List<LotInfo> list) throws IOException {
        List<PointPO> coordinates = GeoToolsUtil.getRoutePointOrder(list, 28.62452712442823, 115.85666327144976);
    public MultipartFile getFile(String waylineName, List<LotInfo> list,double lat, double lon) throws IOException {
        //南昌28.62452712442823, 115.85666327144976  瑞金 25.8917266,116.020940643
        List<PointPO> coordinates = GeoToolsUtil.getRoutePointOrder(list, lat, lon);
        XMLTemplateModel xmlModel = XMLTemplateModel.init(coordinates, list);
        CreateWaylineFileUtils.createWaylineFile(xmlModel, patchesConfigPojo.getTemplate(), patchesConfigPojo.getTargetTemplate(), patchesConfigPojo.getWaylines(), patchesConfigPojo.getTargetWaylines());
        // 压缩文件夹中的内容
@@ -497,7 +518,7 @@
                + "\"dock_sn\":\"4TADKCM0010016\","
                + "\"task_type\":1,"
                + "\"select_execute_time\":\"%s\","
                + "\"rth_altitude\":80,"
                + "\"rth_altitude\":100,"
                + "\"out_of_control_action\":0,"
                + "\"executeTimeContinuousArr\":[{\"index\":1,\"value\":[]}],"
                + "\"executeTimeRepeatArr\":[{\"index\":1,\"value\":\"\"}],"
@@ -505,6 +526,7 @@
                + "\"rep_fre_type\":3,"
                + "\"rep_rule_type\":1,"
                + "\"time_range\":[],"
                + "\"rth_mode\":1,"
                + "\"1conValue\":[],"
                + "\"1repValue\":\"\","
                + "\"task_days\":%s,"