diff --git a/jeecg-module-beta-gamma-analyser/src/main/java/org/jeecg/common/util/FileFtransitUtil.java b/jeecg-module-beta-gamma-analyser/src/main/java/org/jeecg/common/util/FileFtransitUtil.java index fe08c91f..674ba45c 100644 --- a/jeecg-module-beta-gamma-analyser/src/main/java/org/jeecg/common/util/FileFtransitUtil.java +++ b/jeecg-module-beta-gamma-analyser/src/main/java/org/jeecg/common/util/FileFtransitUtil.java @@ -17,6 +17,7 @@ import org.springframework.stereotype.Component; import java.io.*; import java.math.BigInteger; +import java.time.DateTimeException; import java.time.LocalDate; import java.time.LocalDateTime; import java.time.LocalTime; @@ -964,10 +965,16 @@ public class FileFtransitUtil { int cal_s = (int) CalS; int cal_ms = (int) ((CalS - cal_s) * 10); String 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)); + try { + LocalDateTime dateTime = LocalDateTime.of(CalY, CalM, CalD, CalH, CalMin, cal_s, cal_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); // g_Energy g_Resolution