feat: 优化分库分表迁移过程中，task_instance_id 动态查询条件构造逻辑 #3324

TencentBlueKing · Dec 12, 2024 · 83828eb · 83828eb
1 parent 851ea32
commit 83828eb
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 3 deletions.
diff --git a/...main/java/com/tencent/bk/job/analysis/service/ai/context/impl/TaskContextServiceImpl.java b/...main/java/com/tencent/bk/job/analysis/service/ai/context/impl/TaskContextServiceImpl.java
@@ -62,6 +62,7 @@ public TaskContext getTaskContext(String username, TaskContextQuery contextQuery
         InternalResponse<ServiceStepInstanceDTO> resp = serviceStepInstanceResource.getStepInstance(
             username,
             contextQuery.getAppId(),
+            contextQuery.getTaskInstanceId(),
             contextQuery.getStepInstanceId()
         );
         if (resp.isSuccess()) {

diff --git a/...ecute/src/main/java/com/tencent/bk/job/execute/api/inner/ServiceStepInstanceResource.java b/...ecute/src/main/java/com/tencent/bk/job/execute/api/inner/ServiceStepInstanceResource.java
@@ -41,13 +41,16 @@
 @SmartFeignClient(value = "job-execute", contextId = "stepInstanceResource")
 @InternalAPI
 public interface ServiceStepInstanceResource {
-    @GetMapping("/service/stepInstance/app/{appId}/stepInstanceId/{stepInstanceId}")
+    @GetMapping("/service/app/{appId}/taskInstance/{taskInstanceId}/stepInstance/{stepInstanceId}")
     InternalResponse<ServiceStepInstanceDTO> getStepInstance(
         @RequestHeader("username")
         String username,
         @ApiParam(value = "作业平台业务ID", required = true)
         @PathVariable(value = "appId")
         Long appId,
+        @ApiParam(value = "作业实例ID", name = "taskInstanceId", required = true)
+        @PathVariable("taskInstanceId")
+        Long taskInstanceId,
         @ApiParam(value = "步骤实例ID", name = "stepInstanceId", required = true)
         @PathVariable("stepInstanceId")
         Long stepInstanceId);

diff --git a/...e/src/main/java/com/tencent/bk/job/execute/api/inner/ServiceStepInstanceResourceImpl.java b/...e/src/main/java/com/tencent/bk/job/execute/api/inner/ServiceStepInstanceResourceImpl.java
@@ -52,9 +52,13 @@ public ServiceStepInstanceResourceImpl(TaskInstanceAccessProcessor taskInstanceA
     }
 
     @Override
-    public InternalResponse<ServiceStepInstanceDTO> getStepInstance(String username, Long appId, Long stepInstanceId) {
+    public InternalResponse<ServiceStepInstanceDTO> getStepInstance(String username,
+                                                                    Long appId,
+                                                                    Long taskInstanceId,
+                                                                    Long stepInstanceId) {
         try {
-            StepInstanceDTO stepInstance = stepInstanceService.getStepInstanceDetail(appId, stepInstanceId);
+            StepInstanceDTO stepInstance = stepInstanceService.getStepInstanceDetail(appId,
+                taskInstanceId, stepInstanceId);
             taskInstanceAccessProcessor.processBeforeAccess(username, appId, stepInstance.getTaskInstanceId());
             return InternalResponse.buildSuccessResp(stepInstance.toServiceStepInstanceDTO());
         } catch (NotFoundException e) {