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-16 17:24:36 +08:00
parent 5a605e432e
commit 6a9c3c1e16
2 changed files with 776 additions and 749 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -206,6 +206,29 @@ public class DateUtils extends PropertyEditorSupport {
return sformat.format(nowDate); 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);
}
/** /**
* 日期转换为字符串 * 日期转换为字符串
* *

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

@ -135,7 +135,6 @@ public class SpectrumAnalysisServiceImpl extends AbstractLogOrReport implements
private IGardsROIResultsSpectrumService gardsROIResultsSpectrumService; private IGardsROIResultsSpectrumService gardsROIResultsSpectrumService;
@Override @Override
public void initValue(String dbName, Integer sampleId, String analyst, String sampleFileName, String gasFileName, String detFileName, String qcFileName, HttpServletRequest request) { public void initValue(String dbName, Integer sampleId, String analyst, String sampleFileName, String gasFileName, String detFileName, String qcFileName, HttpServletRequest request) {
if (StringUtils.isNotBlank(dbName) && Objects.nonNull(sampleId)) { if (StringUtils.isNotBlank(dbName) && Objects.nonNull(sampleId)) {
@ -291,7 +290,9 @@ public class SpectrumAnalysisServiceImpl extends AbstractLogOrReport implements
//声明分页page //声明分页page
Page<GardsSampleDataSpectrum> page = new Page<>(queryRequest.getPageNo(), queryRequest.getPageSize()); Page<GardsSampleDataSpectrum> page = new Page<>(queryRequest.getPageNo(), queryRequest.getPageSize());
Page<GardsSampleDataSpectrum> sampleDataPage = spectrumAnalysisMapper.getDBSpectrumListByLeftJoin(page, gardsSampleData, dbName, stationTypes, CollectStopB, AcqStartB, startTime, endTime, userStations, AllUsers, queryRequest.getField(), queryRequest.getOrder()); Page<GardsSampleDataSpectrum> sampleDataPage = spectrumAnalysisMapper.getDBSpectrumListByLeftJoin(page, gardsSampleData, dbName, stationTypes, CollectStopB, AcqStartB, startTime, endTime, userStations, AllUsers, queryRequest.getField(), queryRequest.getOrder());
sampleDataPage.getRecords().stream().forEach(item->{item.setDbName(tempDBName);}); sampleDataPage.getRecords().stream().forEach(item -> {
item.setDbName(tempDBName);
});
result.setSuccess(true); result.setSuccess(true);
result.setResult(sampleDataPage); result.setResult(sampleDataPage);
return result; return result;
@ -2187,6 +2188,9 @@ public class SpectrumAnalysisServiceImpl extends AbstractLogOrReport implements
long gChannels = struct.g_channels; long gChannels = struct.g_channels;
List<Long> hCounts = struct.h_counts; List<Long> hCounts = struct.h_counts;
int bRecordCount = struct.b_record_count; 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部分相关数据 //散点图坐标点关联beta部分相关数据
List<List<Double>> betaEnergyList = new LinkedList<>(); List<List<Double>> betaEnergyList = new LinkedList<>();
List<Double> betaParam = EnergySpectrumHandler.GetFileFittingPara(bChannel, bElectronEnergy); List<Double> betaParam = EnergySpectrumHandler.GetFileFittingPara(bChannel, bElectronEnergy);