Merge remote-tracking branch 'origin/station' into station
This commit is contained in:
commit
2ce51ac78d
|
@ -3345,14 +3345,8 @@ public class GammaServiceImpl extends AbstractLogOrReport implements IGammaServi
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void exportARR(Integer sampleId, HttpServletResponse response) {
|
public void exportARR(Integer sampleId, HttpServletResponse response) {
|
||||||
if(Objects.isNull(sampleId)) {
|
|
||||||
String waring = "The file isn't existed.";
|
|
||||||
}
|
|
||||||
//获取自动处理生成的报告地址
|
//获取自动处理生成的报告地址
|
||||||
String reportPath = spectrumAnalysisMapper.viewARR(sampleId);
|
String reportPath = spectrumAnalysisMapper.viewARR(sampleId);
|
||||||
if(StringUtils.isBlank(reportPath.trim())) {
|
|
||||||
String waring = "The file isn't existed.";
|
|
||||||
}
|
|
||||||
String pathName = StringPool.SLASH + spectrumPathProperties.getSaveFilePath() + StringPool.SLASH + reportPath.substring(0, reportPath.lastIndexOf(StringPool.SLASH));
|
String pathName = StringPool.SLASH + spectrumPathProperties.getSaveFilePath() + StringPool.SLASH + reportPath.substring(0, reportPath.lastIndexOf(StringPool.SLASH));
|
||||||
String fileName = reportPath.substring(reportPath.lastIndexOf(StringPool.SLASH)+1)+".txt";
|
String fileName = reportPath.substring(reportPath.lastIndexOf(StringPool.SLASH)+1)+".txt";
|
||||||
//连接ftp
|
//连接ftp
|
||||||
|
|
Loading…
Reference in New Issue
Block a user