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

文件转换读取SPC内容时，calibra_time不存在时读取失败问题代码优化

Browse Source
This commit is contained in:
qiaoqinzheng 2023-12-12 19:01:02 +08:00
parent 3e6585537e
commit e9133cf37e
1 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -17,6 +17,7 @@ import org.springframework.stereotype.Component;
import java.io.*; import java.io.*;
import java.math.BigInteger; import java.math.BigInteger;
import java.time.DateTimeException;
import java.time.LocalDate; import java.time.LocalDate;
import java.time.LocalDateTime; import java.time.LocalDateTime;
import java.time.LocalTime; import java.time.LocalTime;
@ -964,10 +965,16 @@ public class FileFtransitUtil {
int cal_s = (int) CalS; int cal_s = (int) CalS;
int cal_ms = (int) ((CalS - cal_s) * 10); int cal_ms = (int) ((CalS - cal_s) * 10);
String calibra_time = ""; String calibra_time = "";
if (CalY > 0 && CalM > 0 && CalD >= 0 && CalH >= 0 && CalMin >= 0 && cal_s >= 0 && cal_ms >= 0) { try {
calibra_time = LocalDateTime.of(CalY, CalM, CalD, CalH, CalMin, cal_s, cal_ms) LocalDateTime dateTime = LocalDateTime.of(CalY, CalM, CalD, CalH, CalMin, cal_s, cal_ms);
.format(DateTimeFormatter.ofPattern(DateConstant.DATE_BIAS_TIME_MS)); calibra_time = dateTime.format(DateTimeFormatter.ofPattern(DateConstant.DATE_BIAS_TIME_MS));
} catch (DateTimeException e) {
calibra_time = "";
} }
// if (CalY > 0 && CalM > 0 && CalD >= 0 && CalH >= 0 && CalMin >= 0 && cal_s >= 0 && cal_ms >= 0) {
// calibra_time = LocalDateTime.of(CalY, CalM, CalD, CalH, CalMin, cal_s, cal_ms)
// .format(DateTimeFormatter.ofPattern(DateConstant.DATE_BIAS_TIME_MS));
// }
datas.setCalibra_time(calibra_time); datas.setCalibra_time(calibra_time);
// g_Energy g_Resolution // g_Energy g_Resolution