xiaoguangbin/AnalysisSystemForRadionuclide
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'xiaoguangbin/station' into station

Browse Source
This commit is contained in:
orgin 2023-10-23 10:51:14 +08:00
commit 9733c0425a
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
jeecg-module-beta-gamma-analyser/src/main/java/org/jeecg/common/util/GammaFileUtil.java
View File

@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
import com.baomidou.mybatisplus.core.toolkit.StringPool; import com.baomidou.mybatisplus.core.toolkit.StringPool;
import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.core.JsonProcessingException;
import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.databind.ObjectMapper;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.io.FileUtils; import org.apache.commons.io.FileUtils;
import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.StringUtils;
import org.apache.commons.net.ftp.FTP; import org.apache.commons.net.ftp.FTP;
@ -46,6 +47,7 @@ import java.text.ParseException;
import java.util.*; import java.util.*;
@Component @Component
@Slf4j
public class GammaFileUtil extends AbstractLogOrReport { public class GammaFileUtil extends AbstractLogOrReport {
@Autowired @Autowired
@ -1549,8 +1551,12 @@ public class GammaFileUtil extends AbstractLogOrReport {
peak.recoilDeltaChan = "1"; peak.recoilDeltaChan = "1";
} }
} }
} catch (JsonProcessingException e) { } catch (JsonProcessingException e){
throw new RuntimeException(e); e.printStackTrace();
log.error("AnalyseSpectrum(): {}", e.getMessage());
} catch (RuntimeException e) {
e.printStackTrace();
log.error("AnalyseSpectrum(): {}", e.getMessage());
} finally { } finally {
if (Objects.nonNull(tmpFile)) { if (Objects.nonNull(tmpFile)) {
tmpFile.delete(); tmpFile.delete();