Merge branch 'master' of http://1.14.125.6:3000/mianbin/ops-pro
This commit is contained in:
commit
ca5f45d1a0
@ -7,6 +7,7 @@ import cd.casic.ci.process.process.service.aflManager.AflCrashesInfoService;
|
||||
import cd.casic.ci.process.util.SftpUploadUtil;
|
||||
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
|
||||
import lombok.extern.slf4j.Slf4j;
|
||||
import org.apache.commons.lang3.StringUtils;
|
||||
import org.springframework.stereotype.Service;
|
||||
import org.springframework.util.CollectionUtils;
|
||||
|
||||
@ -48,8 +49,12 @@ public class AflCrashesInfoServiceImpl extends ServiceImpl<AflCrashesInfoDao, Af
|
||||
AflCrashesInfo aflCrashesInfo = new AflCrashesInfo();
|
||||
aflCrashesInfo.setFilePath(o);
|
||||
aflCrashesInfo.setPipelineId(req.getPipelineId());
|
||||
aflCrashesInfo.setTaskId(req.getTaskId());
|
||||
aflCrashesInfo.setPipelineHistoryId(req.getPipelineHistoryId());
|
||||
if (!StringUtils.isEmpty(req.getTaskId())){
|
||||
aflCrashesInfo.setTaskId(req.getTaskId());
|
||||
}
|
||||
if (!StringUtils.isEmpty(req.getPipelineHistoryId())){
|
||||
aflCrashesInfo.setPipelineHistoryId(req.getPipelineHistoryId());
|
||||
}
|
||||
aflCrashesInfos.add(aflCrashesInfo);
|
||||
});
|
||||
baseMapper.insertBatch(aflCrashesInfos);
|
||||
|
@ -48,8 +48,12 @@ public class AflInfoServiceImpl extends ServiceImpl<AflInfoDao, AflInfo> impleme
|
||||
|
||||
aflInfo.setFilePath(strings.get(0));
|
||||
aflInfo.setPipelineId(req.getPipelineId());
|
||||
aflInfo.setTaskId(req.getTaskId());
|
||||
aflInfo.setPipelineHistoryId(req.getPipelineHistoryId());
|
||||
if (!StringUtils.isEmpty(req.getTaskId())){
|
||||
aflInfo.setTaskId(req.getTaskId());
|
||||
}
|
||||
if (!StringUtils.isEmpty(req.getPipelineHistoryId())){
|
||||
aflInfo.setPipelineHistoryId(req.getPipelineHistoryId());
|
||||
}
|
||||
baseMapper.insert(aflInfo);
|
||||
|
||||
return aflInfo.getId();
|
||||
|
@ -172,9 +172,13 @@ public class AflSeedInfoServiceImpl extends ServiceImpl<AflSeedInfoDao, AflSeedI
|
||||
}
|
||||
|
||||
aflSeedInfo.setFilePath(o);
|
||||
aflSeedInfo.setTaskId(req.getTaskId());
|
||||
if (!StringUtils.isEmpty(req.getTaskId())){
|
||||
aflSeedInfo.setTaskId(req.getTaskId());
|
||||
}
|
||||
if (!StringUtils.isEmpty(req.getPipelineHistoryId())){
|
||||
aflSeedInfo.setPipelineHistoryId(req.getPipelineHistoryId());
|
||||
}
|
||||
aflSeedInfo.setPipelineId(req.getPipelineId());
|
||||
aflSeedInfo.setPipelineHistoryId(req.getPipelineHistoryId());
|
||||
|
||||
aflSeedInfos.add(aflSeedInfo);
|
||||
});
|
||||
|
Loading…
x
Reference in New Issue
Block a user