forked from uav/ard-uav-server
blame | history | patch | commit | commitdiff | ignore whitespace
zhaowenyu
2025-11-26 5b7a703cc14ecf2dfffc071b558371e3adf4278e 
 ard-sample/src/main/java/com/ard/sample/wayline/service/impl/WaylineJobServiceImpl.java


@@ -178,6 +178,7 @@


        if (WaylineTaskTypeEnum.IMMEDIATE.getVal() == param.getTaskType()) {


            param.setExecuteTime(System.currentTimeMillis());


        }


        param.setRth_mode(1);


        Optional<WaylineJobDTO> waylineJobOpt = this.createWaylineJob(param, loginUser.getUsername(),


                param.getExecuteTime(), param.getExecuteTime());


        // 循环任务


@@ -234,14 +235,16 @@


                .outOfControlAction(waylineJob.getOutOfControlAction())


                .rthMode(waylineJob.getRthMode())


                .file(WaylineTaskFileDTO.builder()


                        .url(url.toString())


//                        .url(url.toString().replace("https://192.168.10.103:9001", "http://192.168.10.103:9011"))


//                        .fingerprint(waylineFile.get().getSign())


                        .url(url.toString().replace("https://", "http://")


                                .replace("9001", "9011"))


                        .fingerprint(md5)


                        .build())


//                .simulateMission(WaylineSimulateMissionDTO.builder()


//                        .isEnable(1)


//                        .latitude(46.558831038)


//                        .longitude(125.148072319)


//                        .latitude(46.55819013988211)


//                        .longitude(125.14652370145113)


//                        .build())


                .build();




@@ -727,13 +730,14 @@


//            url = waylineFileService.getObjectUrl(waylineFile.get().getWaylineId());


//            url = new URL(ardRouteOpt.getUpPath());




            Map<String, Object> jsonResourceGet = new HashMap<>();


            jsonResourceGet.put("url", url.toString());


            jsonResourceGet.put("fingerprint", md5);


//            Map<String, Object> jsonResourceGet = new HashMap<>();


//            jsonResourceGet.put("url", url.toString().replace("https//192.168.10.103:9001", "http//192.168.10.103:9002"));


//            jsonResourceGet.put("fingerprint", md5);




            builder.data(RequestsReply.success(WaylineTaskCreateDTO.builder()


                    .file(WaylineTaskFileDTO.builder()


                    .url(url.toString())


                    .url(url.toString().replace("https://", "http://")


                            .replace("9001", "9011"))


                    .fingerprint(md5)


                    .build())


                    .build()));