|
@@ -16,12 +16,14 @@ import com.tzld.piaoquan.sde.model.dto.ContentInputParamsDTO;
|
|
|
import com.tzld.piaoquan.sde.model.dto.SdExecutionTaskPropertiesDTO;
|
|
import com.tzld.piaoquan.sde.model.dto.SdExecutionTaskPropertiesDTO;
|
|
|
import com.tzld.piaoquan.sde.model.dto.cluster.ManualClusterExecutionConfigDTO;
|
|
import com.tzld.piaoquan.sde.model.dto.cluster.ManualClusterExecutionConfigDTO;
|
|
|
import com.tzld.piaoquan.sde.model.dto.deconstruction.QueryResponseDataDTO;
|
|
import com.tzld.piaoquan.sde.model.dto.deconstruction.QueryResponseDataDTO;
|
|
|
|
|
+import com.tzld.piaoquan.sde.model.entity.ContentProfile;
|
|
|
import com.tzld.piaoquan.sde.model.entity.SdExecutionTask;
|
|
import com.tzld.piaoquan.sde.model.entity.SdExecutionTask;
|
|
|
import com.tzld.piaoquan.sde.model.entity.SdExecutionTaskContent;
|
|
import com.tzld.piaoquan.sde.model.entity.SdExecutionTaskContent;
|
|
|
import com.tzld.piaoquan.sde.model.entity.SdExecutionTaskRawResult;
|
|
import com.tzld.piaoquan.sde.model.entity.SdExecutionTaskRawResult;
|
|
|
import com.tzld.piaoquan.sde.model.request.ExecutionTaskGetParam;
|
|
import com.tzld.piaoquan.sde.model.request.ExecutionTaskGetParam;
|
|
|
import com.tzld.piaoquan.sde.model.request.ExecutionTaskListParam;
|
|
import com.tzld.piaoquan.sde.model.request.ExecutionTaskListParam;
|
|
|
import com.tzld.piaoquan.sde.model.vo.SdExecutionTaskVO;
|
|
import com.tzld.piaoquan.sde.model.vo.SdExecutionTaskVO;
|
|
|
|
|
+import com.tzld.piaoquan.sde.service.ContentProfileService;
|
|
|
import com.tzld.piaoquan.sde.service.ExecutionTaskCreateService;
|
|
import com.tzld.piaoquan.sde.service.ExecutionTaskCreateService;
|
|
|
import com.tzld.piaoquan.sde.service.ExecutionTaskService;
|
|
import com.tzld.piaoquan.sde.service.ExecutionTaskService;
|
|
|
import com.tzld.piaoquan.sde.util.DateUtil;
|
|
import com.tzld.piaoquan.sde.util.DateUtil;
|
|
@@ -59,6 +61,8 @@ public class ExecutionTaskServiceImpl implements ExecutionTaskService {
|
|
|
private SdWorkflowTaskMapper sdWorkflowTaskMapper;
|
|
private SdWorkflowTaskMapper sdWorkflowTaskMapper;
|
|
|
@Autowired
|
|
@Autowired
|
|
|
private SdExecutionTaskContentMapper sdExecutionTaskContentMapper;
|
|
private SdExecutionTaskContentMapper sdExecutionTaskContentMapper;
|
|
|
|
|
+ @Autowired
|
|
|
|
|
+ private ContentProfileService contentProfileService;
|
|
|
|
|
|
|
|
private static final String YESTERDAY_RETURN_TOP10_VIDEO_SCOPE = "yesterday_return_top10_video_scope";
|
|
private static final String YESTERDAY_RETURN_TOP10_VIDEO_SCOPE = "yesterday_return_top10_video_scope";
|
|
|
private static final String MANUAL_SELECT_VIDEO_SCOPE = "manual_select_video_scope";
|
|
private static final String MANUAL_SELECT_VIDEO_SCOPE = "manual_select_video_scope";
|
|
@@ -275,6 +279,8 @@ public class ExecutionTaskServiceImpl implements ExecutionTaskService {
|
|
|
sdExecutionTaskRawResult.setUrlInfo(urlInfo);
|
|
sdExecutionTaskRawResult.setUrlInfo(urlInfo);
|
|
|
int insertRows = sdExecutionTaskRawResultMapper.insert(sdExecutionTaskRawResult);
|
|
int insertRows = sdExecutionTaskRawResultMapper.insert(sdExecutionTaskRawResult);
|
|
|
log.info("executionTask result insertRows success, id:{} rows = {}", sdExecutionTask.getId(), insertRows);
|
|
log.info("executionTask result insertRows success, id:{} rows = {}", sdExecutionTask.getId(), insertRows);
|
|
|
|
|
+
|
|
|
|
|
+ contentProfileService.deconstructSelectTopicResultSync(sdExecutionTask, queryResponseDataDTO);
|
|
|
}
|
|
}
|
|
|
} catch (Exception e) {
|
|
} catch (Exception e) {
|
|
|
log.error("executionTask sync error {}", sdExecutionTask, e);
|
|
log.error("executionTask sync error {}", sdExecutionTask, e);
|
|
@@ -399,10 +405,16 @@ public class ExecutionTaskServiceImpl implements ExecutionTaskService {
|
|
|
continue;
|
|
continue;
|
|
|
}
|
|
}
|
|
|
String videoId = record.getString("videoid");
|
|
String videoId = record.getString("videoid");
|
|
|
- int count = sdExecutionTaskContentMapper.countByContentId(ContentTypeEnum.VIDEO.getValue(), videoId);
|
|
|
|
|
- if (count > 0) {
|
|
|
|
|
|
|
+ // int count = sdExecutionTaskContentMapper.countByContentId(ContentTypeEnum.VIDEO.getValue(), videoId);
|
|
|
|
|
+ // if (count > 0) {
|
|
|
|
|
+ // continue;
|
|
|
|
|
+ // }
|
|
|
|
|
+
|
|
|
|
|
+ ContentProfile contentProfile = contentProfileService.findContentProfileByIdAndStage(videoId, ContentProfileStageEnum.DECONSTRUCTION_SELECT_TOPIC);
|
|
|
|
|
+ if (Objects.nonNull(contentProfile)) {
|
|
|
continue;
|
|
continue;
|
|
|
}
|
|
}
|
|
|
|
|
+
|
|
|
findRecords.add(record);
|
|
findRecords.add(record);
|
|
|
}
|
|
}
|
|
|
if (findRecords.isEmpty()) {
|
|
if (findRecords.isEmpty()) {
|