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

Beta Detector Calibration界面 返回结果添加acqStartTime数据

Browse Source
This commit is contained in:
duwenyuan 2025-04-17 17:31:15 +08:00
parent 1419eaf562
commit 846880b256
3 changed files with 25 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
jeecg-boot-base-core/src/main/java/org/jeecg/common/util/DateUtils.java
View File

@ -205,6 +205,26 @@ public class DateUtils extends PropertyEditorSupport {
}
return sformat.format(nowDate);
}
/**
* 时间字符串格式转换
* @param date 时间字符串
* @param sourceFormat 字符串原有格式
* @param targetFormat 需要转换成的格式
* @return 字符串
*/
public static String dateformat(String date,String sourceFormat,String targetFormat)
{
SimpleDateFormat sformat = new SimpleDateFormat(sourceFormat);
Date nowDate = null;
try {
nowDate = sformat.parse(date);
sformat=new SimpleDateFormat(targetFormat);
} catch (ParseException e) {
// TODO Auto-generated catch block
e.printStackTrace();
}
return sformat.format(nowDate);
}
/**
* 日期转换为字符串

4
jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/mapper/xml/SpectrumAnalysisMapper.xml
View File

@ -99,10 +99,10 @@
</if>
</where>
<if test=" orderField != 'createTime' and orderField != '' and orderField != null and orderType != '' and orderType != null ">
ORDER BY ${orderField} ${orderType}
ORDER BY ${orderField} ${orderType},acquisitionRealSec DESC
</if>
<if test=" orderField == 'createTime' or orderField == '' or orderField == null or orderType == '' or orderType == null ">
ORDER BY collectStop DESC
ORDER BY collectStop DESC,acquisitionRealSec DESC
</if>
</select>

3
jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/service/impl/SelfStationServiceImpl.java
View File

@ -2333,6 +2333,9 @@ public class SelfStationServiceImpl extends AbstractLogOrReport implements ISelf
long gChannels = struct.g_channels;
long[][] hCounts = struct.h_count_arr;
int bRecordCount = struct.b_record_count;
String acqStartTime = String.format("%s %s", struct.acquisition_start_date, struct.acquisition_start_time);
String acqStartTimeFormat = DateUtils.dateformat(acqStartTime, "yyyy/MM/dd HH:mm:ss.S", "yyyy-MM-dd HH:mm:ss");
map.put("acqStartTime", acqStartTimeFormat);
//散点图坐标点关联beta部分相关数据
List<List<Double>> betaEnergyList = new LinkedList<>();
List<Double> betaParam = EnergySpectrumHandler.GetFileFittingPara(bChannel, bElectronEnergy);