Merge branch 'master' of http://1.14.125.6:3000/mianbin/ops-pro
This commit is contained in:
commit
88219bff9a
@ -56,7 +56,7 @@ public class AflCrashesInfoServiceImpl extends ServiceImpl<AflCrashesInfoDao, Af
|
|||||||
if (StringUtils.isEmpty(req.getPipelineId()) || StringUtils.isEmpty(req.getTaskId())){
|
if (StringUtils.isEmpty(req.getPipelineId()) || StringUtils.isEmpty(req.getTaskId())){
|
||||||
throw new ServiceException(GlobalErrorCodeConstants.INTERNAL_SERVER_ERROR.getCode(),"pipelineId或者taskId不能为空");
|
throw new ServiceException(GlobalErrorCodeConstants.INTERNAL_SERVER_ERROR.getCode(),"pipelineId或者taskId不能为空");
|
||||||
}
|
}
|
||||||
String uuid = UUID.randomUUID().toString();
|
String uuid = req.getGroupIdentifier();
|
||||||
|
|
||||||
BaseRunContext runContext = runContextManager.getContext(req.getPipelineId());
|
BaseRunContext runContext = runContextManager.getContext(req.getPipelineId());
|
||||||
if (ObjectUtils.isEmpty(runContext)){
|
if (ObjectUtils.isEmpty(runContext)){
|
||||||
|
@ -90,7 +90,7 @@ public class AflInfoServiceImpl extends ServiceImpl<AflInfoDao, AflInfo> impleme
|
|||||||
if (!StringUtils.isEmpty(req.getPipelineHistoryId())){
|
if (!StringUtils.isEmpty(req.getPipelineHistoryId())){
|
||||||
aflInfo.setPipelineHistoryId(req.getPipelineHistoryId());
|
aflInfo.setPipelineHistoryId(req.getPipelineHistoryId());
|
||||||
}
|
}
|
||||||
aflInfo.setGroupIdentifier(UUID.randomUUID().toString());
|
aflInfo.setGroupIdentifier(req.getGroupIdentifier());
|
||||||
baseMapper.insert(aflInfo);
|
baseMapper.insert(aflInfo);
|
||||||
|
|
||||||
return aflInfo.getGroupIdentifier();
|
return aflInfo.getGroupIdentifier();
|
||||||
|
@ -87,7 +87,7 @@ public class AflPlotInfoServiceImpl extends ServiceImpl<AflPlotInfoDao, AflPlotI
|
|||||||
if (!StringUtils.isEmpty(req.getPipelineHistoryId())){
|
if (!StringUtils.isEmpty(req.getPipelineHistoryId())){
|
||||||
aflPlotInfo.setPipelineHistoryId(req.getPipelineHistoryId());
|
aflPlotInfo.setPipelineHistoryId(req.getPipelineHistoryId());
|
||||||
}
|
}
|
||||||
aflPlotInfo.setGroupIdentifier(UUID.randomUUID().toString());
|
aflPlotInfo.setGroupIdentifier(req.getGroupIdentifier());
|
||||||
baseMapper.insert(aflPlotInfo);
|
baseMapper.insert(aflPlotInfo);
|
||||||
|
|
||||||
return aflPlotInfo.getGroupIdentifier();
|
return aflPlotInfo.getGroupIdentifier();
|
||||||
|
@ -180,7 +180,7 @@ public class AflSeedInfoServiceImpl extends ServiceImpl<AflSeedInfoDao, AflSeedI
|
|||||||
if (StringUtils.isEmpty(req.getPipelineId()) || StringUtils.isEmpty(req.getTaskId())){
|
if (StringUtils.isEmpty(req.getPipelineId()) || StringUtils.isEmpty(req.getTaskId())){
|
||||||
throw new ServiceException(GlobalErrorCodeConstants.INTERNAL_SERVER_ERROR.getCode(),"pipelineId或者taskId不能为空");
|
throw new ServiceException(GlobalErrorCodeConstants.INTERNAL_SERVER_ERROR.getCode(),"pipelineId或者taskId不能为空");
|
||||||
}
|
}
|
||||||
String uuid = UUID.randomUUID().toString();
|
String uuid = req.getGroupIdentifier();
|
||||||
|
|
||||||
BaseRunContext runContext = runContextManager.getContext(req.getPipelineId());
|
BaseRunContext runContext = runContextManager.getContext(req.getPipelineId());
|
||||||
if (ObjectUtils.isEmpty(runContext)){
|
if (ObjectUtils.isEmpty(runContext)){
|
||||||
|
@ -1375,7 +1375,7 @@ public class SftpUploadUtil {
|
|||||||
}
|
}
|
||||||
|
|
||||||
if (lastLine.isEmpty()) {
|
if (lastLine.isEmpty()) {
|
||||||
throw new SftpUploadException("文件内容为空或没有有效数据行");
|
return new AflPlotInfo();
|
||||||
}
|
}
|
||||||
|
|
||||||
// 按逗号分割字段
|
// 按逗号分割字段
|
||||||
|
Loading…
x
Reference in New Issue
Block a user