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 c74540c9..fe08c91f 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 @@ -963,8 +963,11 @@ public class FileFtransitUtil { int cal_s = (int) CalS; int cal_ms = (int) ((CalS - cal_s) * 10); - String calibra_time = LocalDateTime.of(CalY, CalM, CalD, CalH, CalMin, cal_s, cal_ms) - .format(DateTimeFormatter.ofPattern(DateConstant.DATE_BIAS_TIME_MS)); + 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)); + } datas.setCalibra_time(calibra_time); // g_Energy g_Resolution @@ -1631,7 +1634,7 @@ public class FileFtransitUtil { default: temp+="Jan"; break; } temp+=String.format("-%s", str.substring(2, 4)); // DD-MMM-YY - if(str.substring(0, 2) == "20") { // DD-MMM-YY* + if(str.substring(0, 2).equalsIgnoreCase("20")) { // DD-MMM-YY* temp+="1"; } else { temp+="0"; @@ -1639,6 +1642,7 @@ public class FileFtransitUtil { } else { temp = StringPool.DASH; temp+="Jan"; + temp+= StringPool.DASH; temp+="0"; } return temp;