Merge remote-tracking branch 'origin/master'

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<String> ids, HttpServletRequest req, HttpServletResponse rsp) {
-        LoginUser loginUser = LoginHelper.getLoginUser();
         boolean isMark = waylineFileService.markFavorite(workspaceId, ids, true);
 
         return isMark ? HttpResultResponse.success() : HttpResultResponse.error();

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")
+    @PostMapping("/{workspace_id}/flight-tasks")
-    public HttpResultResponse createJob(HttpServletRequest request, @Valid @RequestBody CreateJobParam param) throws SQLException {
+    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<PaginationData<WaylineJobDTO>> getJobs(@RequestParam(defaultValue = "1") Long page,
-                                                                     @RequestParam(name = "page_size", defaultValue = "10") Long pageSize) {
+                                                                     @RequestParam(name = "page_size", defaultValue = "10") Long pageSize,
-        LoginUser loginUser = LoginHelper.getLoginUser();
+                                                                     @PathVariable(name = "workspace_id") String workspaceId) {
-        PaginationData<WaylineJobDTO> data = waylineJobService.getJobsByWorkspaceId(loginUser.getTenantId(), page, pageSize);
+        PaginationData<WaylineJobDTO> data = waylineJobService.getJobsByWorkspaceId(workspaceId, page, pageSize);
         return HttpResultResponse.success(data);
     }
 
@@ -67,10 +68,9 @@ public class WaylineJobController {
      * @return
      * @throws SQLException
      */
-    @DeleteMapping("/jobs")
+    @DeleteMapping("/{workspace_id}/jobs")
-    public HttpResultResponse publishCancelJob(@RequestParam(name = "job_id") Set<String> jobIds) throws SQLException {
+    public HttpResultResponse publishCancelJob(@RequestParam(name = "job_id") Set<String> jobIds,@PathVariable(name = "workspace_id") String workspaceId) throws SQLException {
-        LoginUser loginUser = LoginHelper.getLoginUser();
+        flighttaskService.cancelFlightTask(workspaceId, jobIds);
-        flighttaskService.cancelFlightTask(loginUser.getTenantId(), jobIds);
         return HttpResultResponse.success();
     }
 
@@ -79,18 +79,18 @@ public class WaylineJobController {
      * @param jobId
      * @return
      */
-    @PostMapping("/jobs/{job_id}/media-highest")
+    @PostMapping("/{workspace_id}/jobs/{job_id}/media-highest")
-    public HttpResultResponse uploadMediaHighestPriority(@PathVariable(name = "job_id") String jobId) {
+    public HttpResultResponse uploadMediaHighestPriority(@PathVariable(name = "workspace_id") String workspaceId,
-        LoginUser loginUser = LoginHelper.getLoginUser();
+                                                         @PathVariable(name = "job_id") String jobId) {
-        flighttaskService.uploadMediaHighestPriority(loginUser.getTenantId(), jobId);
+        flighttaskService.uploadMediaHighestPriority(workspaceId, jobId);
         return HttpResultResponse.success();
     }
 
-    @PutMapping("/jobs/{job_id}")
+    @PutMapping("/{workspace_id}/jobs/{job_id}")
-    public HttpResultResponse updateJobStatus(@PathVariable(name = "job_id") String jobId,
+    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(workspaceId, jobId, param);
-        flighttaskService.updateJobStatus(loginUser.getTenantId(), jobId, param);
         return HttpResultResponse.success();
     }
 }

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.

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()) {