Commit 98e2eec8 by 陈健智

非人工项目数据源切换调整

parent 495ec7e1
...@@ -723,13 +723,13 @@ public class ProjectServiceImpl implements ProjectService { ...@@ -723,13 +723,13 @@ public class ProjectServiceImpl implements ProjectService {
return ResponseResult.failure("项目不存在"); return ResponseResult.failure("项目不存在");
} }
List<NonManualProjectPlan> planList = nonManualProjectPlanDao.findList(new Query(Criteria.where("projectId").is(project.getId()))); List<NonManualProjectPlan> planList = nonManualProjectPlanDao.findList(new Query(Criteria.where("projectId").is(project.getId())));
// 若商业数据切换为内部数据,此时同时删除数据订阅任务 // 若商业数据切换为内部数据,此时同时暂停数据订阅任务
if (project.getExternalDataSource()){ if (project.getExternalDataSource()){
for (NonManualProjectPlan plan : planList) { for (NonManualProjectPlan plan : planList) {
markDataService.deleteIStarShineSubjectTask(plan.getId()); updateStarShineSubjectTaskStatus(plan.getIStarShineSubjectTaskId());
} }
} }
// 若内部数据切换为商业数据,此时进行数据预估同时创建商业数据订阅任务 // 若内部数据切换为商业数据,此时开启数据订阅任务or进行数据预估同时创建商业数据订阅任务
if (!project.getExternalDataSource()){ if (!project.getExternalDataSource()){
// 数据预估 // 数据预估
for (NonManualProjectPlan plan : planList) { for (NonManualProjectPlan plan : planList) {
...@@ -739,8 +739,10 @@ public class ProjectServiceImpl implements ProjectService { ...@@ -739,8 +739,10 @@ public class ProjectServiceImpl implements ProjectService {
} }
} }
List<NonManualProjectPlan> successList = new ArrayList<>(planList.size()); List<NonManualProjectPlan> successList = new ArrayList<>(planList.size());
// 添加商业数据订阅任务 // 不存在订阅任务id 新建任务
for (NonManualProjectPlan plan : planList) { List<NonManualProjectPlan> createTaskPlans = planList.stream().filter(plan -> Objects.isNull(plan.getIStarShineSubjectTaskId())).collect(Collectors.toList());
List<NonManualProjectPlan> updateTaskPlans = planList.stream().filter(plan -> Objects.nonNull(plan.getIStarShineSubjectTaskId())).collect(Collectors.toList());
for (NonManualProjectPlan plan : createTaskPlans) {
if (CollectionUtils.isEmpty(plan.getType())){ if (CollectionUtils.isEmpty(plan.getType())){
plan.setType(new ArrayList<>(Arrays.asList("原创", "转发", "OCR"))); plan.setType(new ArrayList<>(Arrays.asList("原创", "转发", "OCR")));
} }
...@@ -759,6 +761,8 @@ public class ProjectServiceImpl implements ProjectService { ...@@ -759,6 +761,8 @@ public class ProjectServiceImpl implements ProjectService {
nonManualProjectPlanDao.updateOne(plan); nonManualProjectPlanDao.updateOne(plan);
successList.add(plan); successList.add(plan);
} }
// 若存在订阅任务id 开启任务
updateTaskPlans.forEach(plan -> updateStarShineSubjectTaskStatus(plan.getIStarShineSubjectTaskId()));
} }
Update update = new Update(); Update update = new Update();
update.set("uTime", System.currentTimeMillis()); update.set("uTime", System.currentTimeMillis());
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment