From f559cbee7e04d6c111c75b150bbb616d0126610c Mon Sep 17 00:00:00 2001 From: wuyuan <15505152113@163.com> Date: Mon, 10 Mar 2025 12:28:10 +0800 Subject: [PATCH] 1 --- .../controller/WaylineFileController.java | 1 - .../controller/WaylineJobController.java | 36 +++++++++---------- .../wayline/service/IFlightTaskService.java | 2 +- .../service/impl/FlightTaskServiceImpl.java | 2 +- 4 files changed, 20 insertions(+), 21 deletions(-) diff --git a/dk-modules/sample/src/main/java/org/dromara/sample/wayline/controller/WaylineFileController.java b/dk-modules/sample/src/main/java/org/dromara/sample/wayline/controller/WaylineFileController.java index db4995d..ebbc4e1 100644 --- a/dk-modules/sample/src/main/java/org/dromara/sample/wayline/controller/WaylineFileController.java +++ b/dk-modules/sample/src/main/java/org/dromara/sample/wayline/controller/WaylineFileController.java @@ -156,7 +156,6 @@ public class WaylineFileController implements IHttpWaylineService { */ @Override public HttpResultResponse batchFavoritesWayline(String workspaceId, @NotNull @Size(min = 1) List ids, HttpServletRequest req, HttpServletResponse rsp) { - LoginUser loginUser = LoginHelper.getLoginUser(); boolean isMark = waylineFileService.markFavorite(workspaceId, ids, true); return isMark ? HttpResultResponse.success() : HttpResultResponse.error(); diff --git a/dk-modules/sample/src/main/java/org/dromara/sample/wayline/controller/WaylineJobController.java b/dk-modules/sample/src/main/java/org/dromara/sample/wayline/controller/WaylineJobController.java index 912c3f1..ccd69ea 100644 --- a/dk-modules/sample/src/main/java/org/dromara/sample/wayline/controller/WaylineJobController.java +++ b/dk-modules/sample/src/main/java/org/dromara/sample/wayline/controller/WaylineJobController.java @@ -41,10 +41,11 @@ public class WaylineJobController { * @return * @throws SQLException */ - @PostMapping("/flight-tasks") - public HttpResultResponse createJob(HttpServletRequest request, @Valid @RequestBody CreateJobParam param) throws SQLException { + @PostMapping("/{workspace_id}/flight-tasks") + public HttpResultResponse createJob(HttpServletRequest request, @Valid @RequestBody CreateJobParam param + ,@PathVariable(name = "workspace_id") String workspaceId) throws SQLException { - return flighttaskService.publishFlightTask(param); + return flighttaskService.publishFlightTask(workspaceId,param); } /** @@ -55,9 +56,9 @@ public class WaylineJobController { */ @GetMapping("/jobs") public HttpResultResponse> getJobs(@RequestParam(defaultValue = "1") Long page, - @RequestParam(name = "page_size", defaultValue = "10") Long pageSize) { - LoginUser loginUser = LoginHelper.getLoginUser(); - PaginationData data = waylineJobService.getJobsByWorkspaceId(loginUser.getTenantId(), page, pageSize); + @RequestParam(name = "page_size", defaultValue = "10") Long pageSize, + @PathVariable(name = "workspace_id") String workspaceId) { + PaginationData data = waylineJobService.getJobsByWorkspaceId(workspaceId, page, pageSize); return HttpResultResponse.success(data); } @@ -67,10 +68,9 @@ public class WaylineJobController { * @return * @throws SQLException */ - @DeleteMapping("/jobs") - public HttpResultResponse publishCancelJob(@RequestParam(name = "job_id") Set jobIds) throws SQLException { - LoginUser loginUser = LoginHelper.getLoginUser(); - flighttaskService.cancelFlightTask(loginUser.getTenantId(), jobIds); + @DeleteMapping("/{workspace_id}/jobs") + public HttpResultResponse publishCancelJob(@RequestParam(name = "job_id") Set jobIds,@PathVariable(name = "workspace_id") String workspaceId) throws SQLException { + flighttaskService.cancelFlightTask(workspaceId, jobIds); return HttpResultResponse.success(); } @@ -79,18 +79,18 @@ public class WaylineJobController { * @param jobId * @return */ - @PostMapping("/jobs/{job_id}/media-highest") - public HttpResultResponse uploadMediaHighestPriority(@PathVariable(name = "job_id") String jobId) { - LoginUser loginUser = LoginHelper.getLoginUser(); - flighttaskService.uploadMediaHighestPriority(loginUser.getTenantId(), jobId); + @PostMapping("/{workspace_id}/jobs/{job_id}/media-highest") + public HttpResultResponse uploadMediaHighestPriority(@PathVariable(name = "workspace_id") String workspaceId, + @PathVariable(name = "job_id") String jobId) { + flighttaskService.uploadMediaHighestPriority(workspaceId, jobId); return HttpResultResponse.success(); } - @PutMapping("/jobs/{job_id}") - public HttpResultResponse updateJobStatus(@PathVariable(name = "job_id") String jobId, + @PutMapping("/{workspace_id}/jobs/{job_id}") + public HttpResultResponse updateJobStatus(@PathVariable(name = "workspace_id") String workspaceId, + @PathVariable(name = "job_id") String jobId, @Valid @RequestBody UpdateJobParam param) { - LoginUser loginUser = LoginHelper.getLoginUser(); - flighttaskService.updateJobStatus(loginUser.getTenantId(), jobId, param); + flighttaskService.updateJobStatus(workspaceId, jobId, param); return HttpResultResponse.success(); } } diff --git a/dk-modules/sample/src/main/java/org/dromara/sample/wayline/service/IFlightTaskService.java b/dk-modules/sample/src/main/java/org/dromara/sample/wayline/service/IFlightTaskService.java index 9556906..61bc330 100644 --- a/dk-modules/sample/src/main/java/org/dromara/sample/wayline/service/IFlightTaskService.java +++ b/dk-modules/sample/src/main/java/org/dromara/sample/wayline/service/IFlightTaskService.java @@ -23,7 +23,7 @@ public interface IFlightTaskService { * @param param * @return */ - HttpResultResponse publishFlightTask(CreateJobParam param) throws SQLException; + HttpResultResponse publishFlightTask(String workspaceId,CreateJobParam param) throws SQLException; /** * Issue wayline mission to the dock. diff --git a/dk-modules/sample/src/main/java/org/dromara/sample/wayline/service/impl/FlightTaskServiceImpl.java b/dk-modules/sample/src/main/java/org/dromara/sample/wayline/service/impl/FlightTaskServiceImpl.java index fc0d7a2..ac72189 100644 --- a/dk-modules/sample/src/main/java/org/dromara/sample/wayline/service/impl/FlightTaskServiceImpl.java +++ b/dk-modules/sample/src/main/java/org/dromara/sample/wayline/service/impl/FlightTaskServiceImpl.java @@ -222,7 +222,7 @@ public class FlightTaskServiceImpl extends AbstractWaylineService implements IFl } @Override - public HttpResultResponse publishFlightTask(CreateJobParam param) throws SQLException { + public HttpResultResponse publishFlightTask(String workspaceId,CreateJobParam param) throws SQLException { LoginUser loginUser = LoginHelper.getLoginUser(); fillImmediateTime(param); for (Long taskDay : param.getTaskDays()) {