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

Histogram取值修改

Browse Source
This commit is contained in:
qiaoqinzheng 2023-07-26 11:38:42 +08:00
parent 7ad22f79a1
commit 09e1d791d4
1 changed files with 19 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
jeecg-module-spectrum-analysis/src/main/java/org/jeecg/common/util/PHDFileUtil.java
View File

@ -28,7 +28,7 @@ public class PHDFileUtil {
@Autowired
private FTPUtil ftpUtil;
public Map<String, Object> getSourceData(String filePath, String fileName, List<GardsXeResults> xeDataList){
public Map<String, Object> getSourceData(String filePath, String fileName, List<GardsXeResults> xeDataList, Integer sampleId, String status){
//加载dll工具库
System.loadLibrary("ReadPHDFile");
EnergySpectrumStruct struct = EnergySpectrumHandler.getSourceData(filePath);
@ -78,6 +78,8 @@ public class PHDFileUtil {
String detectorBkMeasurementId = struct.detector_bk_measurement_id;
//measurementId
String measurementId = struct.measurement_id;
spectrumData.setSampleId(sampleId);
spectrumData.setStatus(status);
spectrumData.setStationCode(stationCode);
spectrumData.setDetectorCode(detectorCode);
spectrumData.setDataType(dataType);
@ -104,30 +106,22 @@ public class PHDFileUtil {
List<HistogramData> histogramDataList = new LinkedList<>();
List<HistogramData> histogramDataDList = new LinkedList<>();
for (int i=0; i<bChannels; i++){
//按照大小切割数组
List<Long> list = null;
if (i != bChannels-1){
list = hCounts.subList((int) (i * bChannels), (int) ((i + 1) * bChannels));
}else {
list = hCounts.subList((int) (i * bChannels), hCounts.size());
}
if (CollectionUtils.isNotEmpty(list)){
for (int j=0; j< list.size(); j++){
Long count = list.get(j);
if (count > 0){
HistogramData his = new HistogramData();
his.setB(i);
his.setG(j);
his.setC(count);
histogramDataList.add(his);
histogramDataDList.add(his);
}else {
HistogramData his = new HistogramData();
his.setB(i);
his.setG(j);
his.setC(count);
histogramDataDList.add(his);
}
for (int j=0; j< gChannels; j++){
Long index = i * bChannels + j;
Long count = hCounts.get(index.intValue());
if (count > 0){
HistogramData his = new HistogramData();
his.setG(i);
his.setB(j);
his.setC(count);
histogramDataList.add(his);
histogramDataDList.add(his);
}else {
HistogramData his = new HistogramData();
his.setG(i);
his.setB(j);
his.setC(count);
histogramDataDList.add(his);
}
}
}