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 18:39:10 +08:00
parent 5290d50b65
commit 3e6585537e
1 changed files with 7 additions and 3 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/FileFtransitUtil.java
View File

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