人工交互分析模块Beta保存代码输出语句移除
This commit is contained in:
parent
2eb2e52e51
commit
2effe67e54
|
@ -4077,7 +4077,6 @@ public class SpectrumAnalysisServiceImpl extends AbstractLogOrReport implements
|
||||||
@Override
|
@Override
|
||||||
@Transactional(rollbackFor = Exception.class)
|
@Transactional(rollbackFor = Exception.class)
|
||||||
public Result saveToDB(BgDataAnlyseResultIn anlyseResultIn, HttpServletRequest request) {
|
public Result saveToDB(BgDataAnlyseResultIn anlyseResultIn, HttpServletRequest request) {
|
||||||
long startTime = System.currentTimeMillis();
|
|
||||||
Result result = new Result();
|
Result result = new Result();
|
||||||
Map<String, Object> map = new HashMap<>();
|
Map<String, Object> map = new HashMap<>();
|
||||||
//根据请求体获取用户名
|
//根据请求体获取用户名
|
||||||
|
@ -4173,7 +4172,6 @@ public class SpectrumAnalysisServiceImpl extends AbstractLogOrReport implements
|
||||||
getChannelAndEnergy(anlyseResultIn, betaList, gammaList, betaDataFile);
|
getChannelAndEnergy(anlyseResultIn, betaList, gammaList, betaDataFile);
|
||||||
//分析文件内容
|
//分析文件内容
|
||||||
analyzePHDFile(anlyseResultIn, betaDataFile);
|
analyzePHDFile(anlyseResultIn, betaDataFile);
|
||||||
long saveStartTime = System.currentTimeMillis();
|
|
||||||
//判断文件是否存储过 如果没有则解析文件并进行存储
|
//判断文件是否存储过 如果没有则解析文件并进行存储
|
||||||
if ( !OriginalDataStore(betaDataFile, "gas", gasFilePathName) ){
|
if ( !OriginalDataStore(betaDataFile, "gas", gasFilePathName) ){
|
||||||
result.error500("gasFile save failed");
|
result.error500("gasFile save failed");
|
||||||
|
@ -4293,9 +4291,7 @@ public class SpectrumAnalysisServiceImpl extends AbstractLogOrReport implements
|
||||||
//新增gards_roi_results数据表数据
|
//新增gards_roi_results数据表数据
|
||||||
gardsROIResultsSpectrumService.saveGardsROIResults(anlyseResultIn, sampleId, idAnalysis);
|
gardsROIResultsSpectrumService.saveGardsROIResults(anlyseResultIn, sampleId, idAnalysis);
|
||||||
}
|
}
|
||||||
System.out.println("数据库存储总时长:"+ (System.currentTimeMillis() - saveStartTime));
|
|
||||||
//上传本次文件到ftp人工交互存储路径下
|
//上传本次文件到ftp人工交互存储路径下
|
||||||
long uploadStartTime = System.currentTimeMillis();
|
|
||||||
try {
|
try {
|
||||||
if (StringUtils.isNotBlank(betaDataFile.getSampleTmpPath())) {
|
if (StringUtils.isNotBlank(betaDataFile.getSampleTmpPath())) {
|
||||||
File sampleTmp = new File(betaDataFile.getSampleTmpPath());
|
File sampleTmp = new File(betaDataFile.getSampleTmpPath());
|
||||||
|
@ -4355,7 +4351,6 @@ public class SpectrumAnalysisServiceImpl extends AbstractLogOrReport implements
|
||||||
} catch (FileNotFoundException e) {
|
} catch (FileNotFoundException e) {
|
||||||
throw new RuntimeException(e);
|
throw new RuntimeException(e);
|
||||||
}
|
}
|
||||||
System.out.println("ftp上传总时长:"+ (System.currentTimeMillis() - uploadStartTime));
|
|
||||||
if (Objects.nonNull(sampleId)) {
|
if (Objects.nonNull(sampleId)) {
|
||||||
SpectrumData sampleData = getSpectrumData(sampleId, betaDataFile, "sample");
|
SpectrumData sampleData = getSpectrumData(sampleId, betaDataFile, "sample");
|
||||||
betaDataFile.setSampleSpectrumData(sampleData);
|
betaDataFile.setSampleSpectrumData(sampleData);
|
||||||
|
@ -4380,7 +4375,6 @@ public class SpectrumAnalysisServiceImpl extends AbstractLogOrReport implements
|
||||||
pushToRedis(betaDataFile, userName);
|
pushToRedis(betaDataFile, userName);
|
||||||
result.setSuccess(true);
|
result.setSuccess(true);
|
||||||
result.setResult(map);
|
result.setResult(map);
|
||||||
System.out.println("总时长:"+ (System.currentTimeMillis() - startTime));
|
|
||||||
return result;
|
return result;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue
Block a user