Merge remote-tracking branch 'origin/ht-dev' into ht-dev

rain

2024-05-06 cbc15bffc95c486ec8fe67270d8d4e08de7b1407

 src/main/java/com/dji/sample/wayline/controller/WaylineJobController.java

@@ -77,6 +77,18 @@
    }

    /**
     * 断点任务
     * @return
     */
    @PostMapping("/{workspace_id}/breakpoint-tasks")
    @SysLogAnnotation(operModul = "计划库", operType = "断点续飞", operDesc = "创建航路任务(重复定时和连续执行)")
    public ResponseResult breakPointJob(HttpServletRequest request, @Valid @RequestBody BreakPointJobParam param,
                                        @PathVariable(name = "workspace_id") String workspaceId) throws SQLException {
        Optional<WaylineJobDTO> waylineJobDTO = waylineJobService.getJobByJobId(workspaceId, param.getJobId(),param.isBreakPoint());
        return waylineJobService.publishOneFlightTask(waylineJobDTO.get());
    }

    /**
     * 分页查询
     *
     * @param page
@@ -90,6 +102,17 @@
                                                                 @RequestParam(name = "page_size", defaultValue = "10") Long pageSize,
                                                                 @PathVariable(name = "workspace_id") String workspaceId, WaylineJobQueryParam waylineJobQueryParam) {
        PaginationData<WaylineJobDTO> data = waylineJobService.getJobsByWorkspaceId(workspaceId, page, pageSize, waylineJobQueryParam);
        return ResponseResult.success(data);
    }

    @GetMapping("/{workspace_id}/jobs-dp")
    @SysLogAnnotation(operModul = "计划库", operType = "查询", operDesc = "分页查询")
    public ResponseResult<PaginationData<WaylineJobDTO>> getJobsByState(@RequestParam(defaultValue = "1") Long page,
                                                                 @RequestParam(name = "page_size", defaultValue = "10") Long pageSize,
                                                                 @PathVariable(name = "workspace_id") String workspaceId,
                                                                 @RequestParam(name = "order", defaultValue = "") String order,
                                                                 WaylineJobQueryParam waylineJobQueryParam) {
        PaginationData<WaylineJobDTO> data = waylineJobService.getJobsByWorkspaceIdNew(workspaceId, page, pageSize, waylineJobQueryParam,order);
        return ResponseResult.success(data);
    }

@@ -165,9 +188,9 @@
     * 统计飞行次数
     */
    @PostMapping("/{workspace_id}/patrol_statistics")
    public ResponseResult<WaylineJobCountDTO> patrolStatistics(@PathVariable(name = "workspace_id") String workspaceId,String queryTime) {
    public ResponseResult<WaylineJobCountDTO> patrolStatistics(@PathVariable(name = "workspace_id") String workspaceId,String queryTime,String deviceSn) {

        WaylineJobCountDTO waylineJobCountDTO = waylineJobService.patrolStatistics(workspaceId,queryTime);
        WaylineJobCountDTO waylineJobCountDTO = waylineJobService.patrolStatistics(workspaceId,queryTime,deviceSn);

        return ResponseResult.success(waylineJobCountDTO);
    }
@@ -191,7 +214,7 @@
     */
    @PostMapping("/{sn}/jobs/{device_sn}/flyByArea")
    @SysLogAnnotation(operModul = "根据区域飞行", operType = "根据区域飞行", operDesc = "根据区域飞行")
    public ResponseResult flyByArea(@PathVariable(name = "sn") String sn, @RequestBody FlyAreaParam flyAreaParam,@PathVariable(name = "device_sn")String deviceSn) {
        return waylineJobService.flyByArea(sn, flyAreaParam,deviceSn);
    public ResponseResult flyByArea(@PathVariable(name = "sn") String sn, @RequestBody FlyAreaParam flyAreaParam,@PathVariable(name = "device_sn")String deviceSn)throws Exception {
            return waylineJobService.flyByArea(sn, flyAreaParam,deviceSn);
    }
}