Merge remote-tracking branch 'origin/master' into feature_20260213_supeng_history_return_top_video_desconstruction

supply-demand-engine-core/src/main/java/com/tzld/piaoquan/sde/integration/ContentDeconstructionClusterClient.java

@@ -80,7 +80,7 @@ public class ContentDeconstructionClusterClient {
             throw new IllegalArgumentException("sdExecutionTask is null");
         }
 
-        TaskStageEnum taskStage = TaskStageEnum.getByValue(sdExecutionTask.getContentType());
+        TaskStageEnum taskStage = TaskStageEnum.getByValue(sdExecutionTask.getTaskStage());
         // 历史数据没有taskStage字段，默认都为选题
         if (Objects.isNull(taskStage)){
             taskStage = TaskStageEnum.SELECT_TOPIC;
@@ -225,7 +225,7 @@ public class ContentDeconstructionClusterClient {
             throw new BizException(ExceptionEnum.DATA_ERROR, "sdExecutionTask properties is null");
         }
 
-        TaskStageEnum taskStage = TaskStageEnum.getByValue(sdExecutionTask.getContentType());
+        TaskStageEnum taskStage = TaskStageEnum.getByValue(sdExecutionTask.getTaskStage());
         // 历史数据没有taskStage字段，默认都为选题
         if (Objects.isNull(taskStage)){
             taskStage = TaskStageEnum.SELECT_TOPIC;

supply-demand-engine-core/src/main/java/com/tzld/piaoquan/sde/service/impl/ExecutionTaskServiceImpl.java

@@ -598,7 +598,7 @@ public class ExecutionTaskServiceImpl implements ExecutionTaskService {
 
         // 获取解构成功，vov top10的视频
         Set<String> deconstructionSuccessContentIds = contentProfiles.stream()
-                .filter(i -> ExecutionTaskStatusEnum.SUBMITTED.getValue().equals(i.getStatus()))
+                .filter(i -> ExecutionTaskStatusEnum.SUCCESS.getValue().equals(i.getStatus()))
                 .map(ContentProfile::getContentId)
                 .collect(Collectors.toSet());