Merge remote-tracking branch 'origin/SelfStation' into SelfStation
This commit is contained in:
nieziyan
commit
56e7c6adc5
|
|
@ -0,0 +1,8 @@
|
|||
package org.jeecg.common.constant;
|
||||
|
||||
public class SelfStationConstant {
|
||||
public static final String ROI1 = "ROI1";
|
||||
public static final String ROI2 = "ROI2";
|
||||
public static final String ROI3 = "ROI3";
|
||||
public static final String ROI4 = "ROI4";
|
||||
}
|
||||
|
|
@ -54,8 +54,9 @@ public class SelfStationUtil extends AbstractLogOrReport {
|
|||
} else {
|
||||
return;
|
||||
}
|
||||
//存储页面操作数据
|
||||
SelfStationVueData selfStationVueData = new SelfStationVueData();
|
||||
SelfStationVueData sampleVueData = selfStationData.getSampleVueData();
|
||||
SelfStationVueData detVueData = selfStationData.getDetVueData();
|
||||
|
||||
//封装散点图下的基础数据信息
|
||||
SpectrumData spectrumData = new SpectrumData();
|
||||
//Station Code
|
||||
|
|
@ -119,7 +120,6 @@ public class SelfStationUtil extends AbstractLogOrReport {
|
|||
spectrumData.setMeasurementId(measurementId);
|
||||
map.put("spectrumData", spectrumData);
|
||||
|
||||
//计算边界值
|
||||
//gamma能量部分的计算参数 道值对应能量
|
||||
List<Double> gEnergy = struct.g_energy;
|
||||
//gamma能量部分的计算参数 道值
|
||||
|
|
@ -144,92 +144,9 @@ public class SelfStationUtil extends AbstractLogOrReport {
|
|||
List<Integer> roiBBoundaryStart = bgBoundary.ROI_B_Boundary_start;
|
||||
List<Integer> roiBBoundaryStop = bgBoundary.ROI_B_Boundary_stop;
|
||||
|
||||
SelfStationVueData sampleVueData = selfStationData.getSampleVueData();
|
||||
SelfStationVueData detVueData = selfStationData.getDetVueData();
|
||||
|
||||
//根据范围1划分 范围1对应的折线图
|
||||
Map<String, Object> oneMap = statisticsROIList(roiBBoundaryStart.get(0), roiBBoundaryStop.get(0), struct.b_channels, struct.g_channels, struct.h_counts);
|
||||
if (CollectionUtils.isNotEmpty(oneMap) ) {
|
||||
Integer startChannel = (Integer) oneMap.get("startChannel");
|
||||
Integer endChannel = (Integer) oneMap.get("endChannel");
|
||||
List<SeriseData> seriseDataList = (List<SeriseData>) oneMap.get("dataList");
|
||||
if (systemType.equals("sample")) {
|
||||
sampleVueData.setROIOneBetaStart(startChannel);
|
||||
sampleVueData.setROIOneBetaStop(endChannel);
|
||||
sampleVueData.setROIOneList(seriseDataList);
|
||||
sampleVueData.setROIOneCounts((List<Long>)oneMap.get("counts"));
|
||||
} else if (systemType.equals("det")) {
|
||||
detVueData.setROIOneBetaStart(startChannel);
|
||||
detVueData.setROIOneBetaStop(endChannel);
|
||||
detVueData.setROIOneList(seriseDataList);
|
||||
}
|
||||
map.put("ROIOneStart", roiBBoundaryStart.get(0));
|
||||
map.put("ROIOneStop", roiBBoundaryStop.get(0));
|
||||
map.put("ROIOneList", seriseDataList);
|
||||
}
|
||||
//根据范围2划分 范围2对应的折线图
|
||||
Map<String, Object> twoMap = statisticsROIList(roiBBoundaryStart.get(1), roiBBoundaryStop.get(1),
|
||||
struct.b_channels, struct.g_channels, struct.h_counts);
|
||||
if ( CollectionUtils.isNotEmpty(twoMap) ) {
|
||||
Integer startChannel = (Integer) twoMap.get("startChannel");
|
||||
Integer endChannel = (Integer) twoMap.get("endChannel");
|
||||
List<SeriseData> seriseDataList = (List<SeriseData>) twoMap.get("dataList");
|
||||
if (systemType.equals("sample")) {
|
||||
sampleVueData.setROITwoBetaStart(startChannel);
|
||||
sampleVueData.setROITwoBetaStop(endChannel);
|
||||
sampleVueData.setROITwoList(seriseDataList);
|
||||
sampleVueData.setROITwoCounts((List<Long>)twoMap.get("counts"));
|
||||
} else if (systemType.equals("det")) {
|
||||
detVueData.setROITwoBetaStart(startChannel);
|
||||
detVueData.setROITwoBetaStop(endChannel);
|
||||
detVueData.setROITwoList(seriseDataList);
|
||||
}
|
||||
map.put("ROITwoStart", roiBBoundaryStart.get(1));
|
||||
map.put("ROITwoStop", roiBBoundaryStop.get(1));
|
||||
map.put("ROITwoList", seriseDataList);
|
||||
}
|
||||
//根据范围3划分 范围3对应的折线图
|
||||
Map<String, Object> threeMap = statisticsROIList(roiBBoundaryStart.get(2), roiBBoundaryStop.get(2),
|
||||
struct.b_channels, struct.g_channels, struct.h_counts);
|
||||
if ( CollectionUtils.isNotEmpty(threeMap) ) {
|
||||
Integer startChannel = (Integer) threeMap.get("startChannel");
|
||||
Integer endChannel = (Integer) threeMap.get("endChannel");
|
||||
List<SeriseData> seriseDataList = (List<SeriseData>) threeMap.get("dataList");
|
||||
if (systemType.equals("sample")) {
|
||||
sampleVueData.setROIThreeBetaStart(startChannel);
|
||||
sampleVueData.setROIThreeBetaStop(endChannel);
|
||||
sampleVueData.setROIThreeList(seriseDataList);
|
||||
sampleVueData.setROIThreeCounts((List<Long>)threeMap.get("counts"));
|
||||
} else if (systemType.equals("det")) {
|
||||
detVueData.setROIThreeBetaStart(startChannel);
|
||||
detVueData.setROIThreeBetaStop(endChannel);
|
||||
detVueData.setROIThreeList(seriseDataList);
|
||||
}
|
||||
map.put("ROIThreeStart", roiBBoundaryStart.get(2));
|
||||
map.put("ROIThreeStop", roiBBoundaryStop.get(2));
|
||||
map.put("ROIThreeList", seriseDataList);
|
||||
}
|
||||
//根据范围4划分 范围4对应的折线图
|
||||
Map<String, Object> fourMap = statisticsROIList(roiBBoundaryStart.get(3), roiBBoundaryStop.get(3), struct.b_channels, struct.g_channels, struct.h_counts);
|
||||
if ( CollectionUtils.isNotEmpty(fourMap) ) {
|
||||
Integer startChannel = (Integer) fourMap.get("startChannel");
|
||||
Integer endChannel = (Integer) fourMap.get("endChannel");
|
||||
List<SeriseData> seriseDataList = (List<SeriseData>) fourMap.get("dataList");
|
||||
if (systemType.equals("sample")) {
|
||||
sampleVueData.setROIFourBetaStart(startChannel);
|
||||
sampleVueData.setROIFourBetaStop(endChannel);
|
||||
sampleVueData.setROIFourList(seriseDataList);
|
||||
sampleVueData.setROIFourCounts((List<Long>)fourMap.get("counts"));
|
||||
} else if (systemType.equals("det")) {
|
||||
detVueData.setROIFourBetaStart(startChannel);
|
||||
detVueData.setROIFourBetaStop(endChannel);
|
||||
detVueData.setROIFourList(seriseDataList);
|
||||
}
|
||||
map.put("ROIFourStart", roiBBoundaryStart.get(3));
|
||||
map.put("ROIFourStop", roiBBoundaryStop.get(3));
|
||||
map.put("ROIFourList", seriseDataList);
|
||||
}
|
||||
//散点图
|
||||
Map<String, Object> gammaByROI = this.getGammaByROI(systemType, roiBBoundaryStart, roiBBoundaryStop, selfStationData);
|
||||
map.putAll(gammaByROI);
|
||||
//统计散点图
|
||||
//横坐标 beta-gamma
|
||||
long bChannels = struct.b_channels;
|
||||
|
|
@ -262,7 +179,7 @@ public class SelfStationUtil extends AbstractLogOrReport {
|
|||
map.put("histogramDataList", histogramDataList);
|
||||
// map.put("histogramDataDList", histogramDataDList);
|
||||
//调用算法 传入道值和道值对应的能量 得到计算gamma能量公式的参数
|
||||
List<Double> gammaParam = EnergySpectrumHandler.GetFileFittingPara(gCentroidChannel, gEnergy);
|
||||
List<Double> gammaParam = EnergySpectrumHandler.GetFileFittingPara(struct.g_centroid_channel, struct.g_energy);
|
||||
//存储需要计算gamma能量的道值
|
||||
List<Double> gchannels = new ArrayList<>();
|
||||
for (int i=0; i<gChannels; i++){
|
||||
|
|
@ -273,7 +190,7 @@ public class SelfStationUtil extends AbstractLogOrReport {
|
|||
//将gamma能量折线图进行赋值返回
|
||||
map.put("gammaEnergyData", gammaEnergyList);
|
||||
//调用算法 传入道值和道值对应的能量 得到计算beta能量公式的参数
|
||||
List<Double> betaParam = EnergySpectrumHandler.GetFileFittingPara(bChannel, bElectronEnergy);
|
||||
List<Double> betaParam = EnergySpectrumHandler.GetFileFittingPara(struct.b_channel, struct.b_electron_energy);
|
||||
List<Double> bchannels = new ArrayList<>();
|
||||
for (int i=0; i<bChannels; i++){
|
||||
bchannels.add(Double.valueOf(i));
|
||||
|
|
@ -354,6 +271,8 @@ public class SelfStationUtil extends AbstractLogOrReport {
|
|||
selfStationData.setSampleTmpPath(file.getAbsolutePath());
|
||||
} else if (type.equalsIgnoreCase("det")) {
|
||||
selfStationData.setDetTmpPath(file.getAbsolutePath());
|
||||
} else if (type.equalsIgnoreCase("qc")) {
|
||||
selfStationData.setQcTmpPath(file.getAbsolutePath());
|
||||
}
|
||||
//解析文件内容
|
||||
struct = EnergySpectrumHandler.getSourceData(file.getAbsolutePath());
|
||||
|
|
@ -408,6 +327,122 @@ public class SelfStationUtil extends AbstractLogOrReport {
|
|||
return map;
|
||||
}
|
||||
|
||||
public Map<String, Object> getGammaByROI(String systemType, List<Integer> roiBBoundaryStart, List<Integer> roiBBoundaryStop,
|
||||
SelfStationData selfStationData) {
|
||||
Map<String, Object> map = new HashMap<>();
|
||||
|
||||
|
||||
|
||||
EnergySpectrumStruct struct = selfStationData.getSampleStruct();
|
||||
long betaChannels = struct.b_channels, gammaChannels = struct.g_channels;
|
||||
List<Long> h_counts = struct.h_counts;
|
||||
|
||||
SelfStationVueData sampleVueData = selfStationData.getSampleVueData();
|
||||
SelfStationVueData detVueData = selfStationData.getDetVueData();
|
||||
|
||||
for (int r = 0; r < roiBBoundaryStart.size(); r++) {
|
||||
List<SeriseData> seriseDataList = new LinkedList<>();
|
||||
// g_counts
|
||||
List<Long> counts = new LinkedList<>();
|
||||
//存储同一列不同行加和后的数量
|
||||
List<Integer> sumList = new LinkedList<>();
|
||||
String roiStart = "", roiStop= "", roiList = "";
|
||||
|
||||
//根据范围划分 范围对应的折线图
|
||||
int startChannel = roiBBoundaryStart.get(r);
|
||||
int endChannel = roiBBoundaryStop.get(r);
|
||||
//遍历所有列
|
||||
for (int i=0; i<gammaChannels; i++) {
|
||||
SeriseData seriseData = new SeriseData();
|
||||
seriseData.setX(i);
|
||||
int sum = 0;
|
||||
//根据起始道值和结束道值 获取这一列的所有对应道值的数据
|
||||
for (int j=startChannel; j <= endChannel; j++) {
|
||||
//列数 * 总行数 + 当前行下标 获取对应的数据数组下标
|
||||
int index = (int) (i * betaChannels + j);
|
||||
long count = 0;
|
||||
//判断下标是否在h_counts范围内
|
||||
if (index > 0 && index < h_counts.size()) {
|
||||
count = h_counts.get(index);
|
||||
}
|
||||
sum+=count;
|
||||
}
|
||||
seriseData.setY(sum);
|
||||
sumList.add(sum);
|
||||
counts.add((long) sum);
|
||||
seriseDataList.add(seriseData);
|
||||
}
|
||||
switch (r){
|
||||
case 0:
|
||||
roiStart = "ROIOneStart";
|
||||
roiStop = "ROIOneStop";
|
||||
roiList = "ROIOneList";
|
||||
if (systemType.equals("sample")) {
|
||||
sampleVueData.setROIOneBetaStart(startChannel);
|
||||
sampleVueData.setROIOneBetaStop(endChannel);
|
||||
sampleVueData.setROIOneList(seriseDataList);
|
||||
sampleVueData.setROIOneCounts(counts);
|
||||
} else if (systemType.equals("det")) {
|
||||
detVueData.setROIOneBetaStart(startChannel);
|
||||
detVueData.setROIOneBetaStop(endChannel);
|
||||
detVueData.setROIOneList(seriseDataList);
|
||||
}
|
||||
break;
|
||||
case 1:
|
||||
roiStart = "ROITwoStart";
|
||||
roiStop = "ROITwoStop";
|
||||
roiList = "ROITwoList";
|
||||
if (systemType.equals("sample")) {
|
||||
sampleVueData.setROITwoBetaStart(startChannel);
|
||||
sampleVueData.setROITwoBetaStop(endChannel);
|
||||
sampleVueData.setROITwoList(seriseDataList);
|
||||
sampleVueData.setROITwoCounts(counts);
|
||||
} else if (systemType.equals("det")) {
|
||||
detVueData.setROITwoBetaStart(startChannel);
|
||||
detVueData.setROITwoBetaStop(endChannel);
|
||||
detVueData.setROITwoList(seriseDataList);
|
||||
}
|
||||
break;
|
||||
case 2:
|
||||
roiStart = "ROIThreeStart";
|
||||
roiStop = "ROIThreeStop";
|
||||
roiList = "ROIThreeList";
|
||||
if (systemType.equals("sample")) {
|
||||
sampleVueData.setROIThreeBetaStart(startChannel);
|
||||
sampleVueData.setROIThreeBetaStop(endChannel);
|
||||
sampleVueData.setROIThreeList(seriseDataList);
|
||||
sampleVueData.setROIThreeCounts(counts);
|
||||
} else if (systemType.equals("det")) {
|
||||
detVueData.setROIThreeBetaStart(startChannel);
|
||||
detVueData.setROIThreeBetaStop(endChannel);
|
||||
detVueData.setROIThreeList(seriseDataList);
|
||||
}
|
||||
break;
|
||||
case 3:
|
||||
roiStart = "ROIFourStart";
|
||||
roiStop = "ROIFourStop";
|
||||
roiList = "ROIFourList";
|
||||
if (systemType.equals("sample")) {
|
||||
sampleVueData.setROIFourBetaStart(startChannel);
|
||||
sampleVueData.setROIFourBetaStop(endChannel);
|
||||
sampleVueData.setROIFourList(seriseDataList);
|
||||
sampleVueData.setROIFourCounts(counts);
|
||||
} else if (systemType.equals("det")) {
|
||||
detVueData.setROIFourBetaStart(startChannel);
|
||||
detVueData.setROIFourBetaStop(endChannel);
|
||||
detVueData.setROIFourList(seriseDataList);
|
||||
}
|
||||
break;
|
||||
}
|
||||
|
||||
map.put(roiStart, startChannel);
|
||||
map.put(roiStop, endChannel);
|
||||
map.put(roiList, seriseDataList);
|
||||
}
|
||||
|
||||
return map;
|
||||
}
|
||||
|
||||
public List<Long> roiList(Integer startChannel, Integer endChannel, long betaChannels, long gammaChannels, List<Long> h_counts) {
|
||||
// g_counts
|
||||
List<Long> counts = new LinkedList<>();
|
||||
|
|
@ -1542,4 +1577,66 @@ public class SelfStationUtil extends AbstractLogOrReport {
|
|||
}
|
||||
return result;
|
||||
}
|
||||
|
||||
/**
|
||||
* 检查ROI是否更新
|
||||
* @param sampleVueData
|
||||
* @param ROINum
|
||||
* @return true = 内容发生变化
|
||||
*/
|
||||
public boolean checkROIRenew(SelfStationVueData sampleVueData, String ROINum) {
|
||||
boolean flag = false;
|
||||
if (StrUtil.isNotBlank(ROINum)) {
|
||||
switch (ROINum) {
|
||||
case "ROI1":
|
||||
if (!sampleVueData.getUsedROIOneBetaStart().equals(sampleVueData.getROIOneBetaStart())) {
|
||||
return true;
|
||||
} else if (!sampleVueData.getUsedROIOneBetaStop().equals(sampleVueData.getROIOneBetaStop())) {
|
||||
return true;
|
||||
}
|
||||
break;
|
||||
case "ROI2":
|
||||
if (!sampleVueData.getUsedROITwoBetaStart().equals(sampleVueData.getROITwoBetaStart())) {
|
||||
return true;
|
||||
} else if (!sampleVueData.getUsedROITwoBetaStop().equals(sampleVueData.getROITwoBetaStop())) {
|
||||
return true;
|
||||
}
|
||||
break;
|
||||
case "ROI3":
|
||||
if (!sampleVueData.getUsedROIThreeBetaStart().equals(sampleVueData.getROIThreeBetaStart())) {
|
||||
return true;
|
||||
} else if (!sampleVueData.getUsedROIThreeBetaStop().equals(sampleVueData.getROIThreeBetaStop())) {
|
||||
return true;
|
||||
}
|
||||
break;
|
||||
case "ROI4":
|
||||
if (!sampleVueData.getUsedROIFourBetaStart().equals(sampleVueData.getROIFourBetaStart())) {
|
||||
return true;
|
||||
} else if (!sampleVueData.getUsedROIFourBetaStop().equals(sampleVueData.getROIFourBetaStop())) {
|
||||
return true;
|
||||
}
|
||||
break;
|
||||
}
|
||||
} else {
|
||||
if (!sampleVueData.getUsedROIOneBetaStart().equals(sampleVueData.getROIOneBetaStart())) {
|
||||
return true;
|
||||
} else if (!sampleVueData.getUsedROIOneBetaStop().equals(sampleVueData.getROIOneBetaStop())) {
|
||||
return true;
|
||||
} else if (!sampleVueData.getUsedROITwoBetaStart().equals(sampleVueData.getROITwoBetaStart())) {
|
||||
return true;
|
||||
} else if (!sampleVueData.getUsedROITwoBetaStop().equals(sampleVueData.getROITwoBetaStop())) {
|
||||
return true;
|
||||
} else if (!sampleVueData.getUsedROIThreeBetaStart().equals(sampleVueData.getROIThreeBetaStart())) {
|
||||
return true;
|
||||
} else if (!sampleVueData.getUsedROIThreeBetaStop().equals(sampleVueData.getROIThreeBetaStop())) {
|
||||
return true;
|
||||
} else if (!sampleVueData.getUsedROIFourBetaStart().equals(sampleVueData.getROIFourBetaStart())) {
|
||||
return true;
|
||||
} else if (!sampleVueData.getUsedROIFourBetaStop().equals(sampleVueData.getROIFourBetaStop())) {
|
||||
return true;
|
||||
}
|
||||
}
|
||||
|
||||
return flag;
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -189,8 +189,9 @@ public class SelfStationController {
|
|||
|
||||
@PostMapping("Reprocessing")
|
||||
@ApiOperation(value = "analyze菜单下Reprocessing页面数据", notes = "analyze菜单下Reprocessing页面数据")
|
||||
public Result Reprocessing(String fileName, String processKey, HttpServletRequest request) {
|
||||
return selfStationService.Reprocessing(fileName, processKey, request);
|
||||
public Result Reprocessing(@RequestParam String fileName, @RequestParam String processKey,
|
||||
@RequestParam(required = false) String roiParams, HttpServletRequest request) {
|
||||
return selfStationService.Reprocessing(fileName, processKey, roiParams, request);
|
||||
}
|
||||
|
||||
@GetMapping("InteractiveTool")
|
||||
|
|
|
|||
|
|
@ -30,6 +30,14 @@ public class SelfStationVueData implements Serializable {
|
|||
* ROI-1范围矩形框终止道值
|
||||
*/
|
||||
private Integer ROIOneBetaStop;
|
||||
/**
|
||||
* ROI-1范围矩形框起始道值(分析后
|
||||
*/
|
||||
private Integer usedROIOneBetaStart;
|
||||
/**
|
||||
* ROI-1范围矩形框终止道值(分析后
|
||||
*/
|
||||
private Integer usedROIOneBetaStop;
|
||||
/**
|
||||
* ROI-1 GammaPHD数据
|
||||
*/
|
||||
|
|
@ -55,6 +63,14 @@ public class SelfStationVueData implements Serializable {
|
|||
* ROI-2范围矩形框终止道值
|
||||
*/
|
||||
private Integer ROITwoBetaStop;
|
||||
/**
|
||||
* ROI-2范围矩形框起始道值(分析后
|
||||
*/
|
||||
private Integer usedROITwoBetaStart;
|
||||
/**
|
||||
* ROI-2范围矩形框终止道值(分析后
|
||||
*/
|
||||
private Integer usedROITwoBetaStop;
|
||||
/**
|
||||
* ROI-2 GammaPHD数据
|
||||
*/
|
||||
|
|
@ -74,6 +90,10 @@ public class SelfStationVueData implements Serializable {
|
|||
private Integer ROIThreeBetaStart;
|
||||
//ROI-3范围矩形框终止道值
|
||||
private Integer ROIThreeBetaStop;
|
||||
//ROI-3范围矩形框起始道值(分析后
|
||||
private Integer usedROIThreeBetaStart;
|
||||
//ROI-3范围矩形框终止道值(分析后
|
||||
private Integer usedROIThreeBetaStop;
|
||||
/**
|
||||
* ROI-3 GammaPHD数据
|
||||
*/
|
||||
|
|
@ -93,6 +113,10 @@ public class SelfStationVueData implements Serializable {
|
|||
private Integer ROIFourBetaStart;
|
||||
//ROI-4范围矩形框终止道值
|
||||
private Integer ROIFourBetaStop;
|
||||
//ROI-4范围矩形框起始道值(分析后
|
||||
private Integer usedROIFourBetaStart;
|
||||
//ROI-4范围矩形框终止道值(分析后
|
||||
private Integer usedROIFourBetaStop;
|
||||
/**
|
||||
* ROI-4 GammaPHD数据
|
||||
*/
|
||||
|
|
@ -163,6 +187,15 @@ public class SelfStationVueData implements Serializable {
|
|||
ROITwoPHDFile = new PHDFile();
|
||||
ROIThreePHDFile = new PHDFile();
|
||||
ROIFourPHDFile = new PHDFile();
|
||||
|
||||
usedROIOneBetaStart = 0;
|
||||
usedROIOneBetaStop = 0;
|
||||
usedROITwoBetaStart = 0;
|
||||
usedROITwoBetaStop = 0;
|
||||
usedROIThreeBetaStart = 0;
|
||||
usedROIThreeBetaStop = 0;
|
||||
usedROIFourBetaStart = 0;
|
||||
usedROIFourBetaStop = 0;
|
||||
}
|
||||
|
||||
}
|
||||
|
|
|
|||
|
|
@ -90,9 +90,9 @@ public interface SpectrumAnalysisMapper {
|
|||
|
||||
List<String> UserNuclide(@Param(value = "systemType") String systemType, @Param(value = "userName") String userName);
|
||||
|
||||
Integer getAnalysisID(@Param(value = "dbName") String dbName, @Param(value = "sampleId") Integer sampleId, @Param(value = "userName") String userName);
|
||||
List<RoiDto> roiPaths(@Param("dbName") String dbName, @Param("idAnalysis") Integer idAnalysis);
|
||||
|
||||
List<RoiDto> roiPaths(@Param("dbName") String dbName, @Param("analysisId") Integer analysisId);
|
||||
Integer getAnalysisID(@Param(value = "dbName") String dbName, @Param(value = "sampleId") Integer sampleId, @Param(value = "userName") String userName);
|
||||
|
||||
List<GardsCalibrationPairsSpectrum> ReadGammaFitChannelEnergy(@Param(value = "idAnalysis") Integer idAnalysis);
|
||||
|
||||
|
|
|
|||
|
|
@ -1113,7 +1113,7 @@
|
|||
select NAME from CONFIGURATION.GARDS_NUCL_LIB
|
||||
</select>
|
||||
<select id="roiPaths" resultType="org.jeecg.modules.base.dto.RoiDto">
|
||||
SELECT ROI_NUM, PHD_PATH FROM ${dbName}.GARDS_ANALYSIS_ROI WHERE IDANALYSIS = #{analysisId} ORDER BY ROI_NUM ASC
|
||||
SELECT ROI_NUM, PHD_PATH FROM ${dbName}.GARDS_ANALYSIS_ROI WHERE IDANALYSIS = #{idAnalysis} ORDER BY ROI_NUM ASC
|
||||
</select>
|
||||
|
||||
</mapper>
|
||||
|
|
@ -19,8 +19,6 @@ public interface ISelfStationService {
|
|||
|
||||
void deleteSelfStationCache(String sampleFileName, HttpServletRequest request);
|
||||
|
||||
Result updateROI(Integer startChannel, Integer endChannel, Integer ROINum, String sampleFileName, HttpServletRequest request);
|
||||
|
||||
Result updateROI(List<ROIParam> roiParams, String sampleFileName, String dataType, HttpServletRequest request);
|
||||
|
||||
Result energyCalibration(String fileName, String currentText, Double width, HttpServletRequest request);
|
||||
|
|
@ -63,7 +61,7 @@ public interface ISelfStationService {
|
|||
|
||||
Result viewBetaDetectorCalibration(Integer sampleId, String sampleFileName, String qcFileName, boolean fittingBtn, HttpServletRequest request);
|
||||
|
||||
Result Reprocessing(String fileName, String processKey, HttpServletRequest request);
|
||||
Result Reprocessing(String fileName, String processKey, String roiParams, HttpServletRequest request);
|
||||
|
||||
Result InteractiveTool(Integer sampleId, String fileName, int gammaROINum, HttpServletRequest request);
|
||||
|
||||
|
|
|
|||
|
|
@ -5,6 +5,7 @@ import cn.hutool.core.io.FileUtil;
|
|||
import cn.hutool.core.util.ObjectUtil;
|
||||
import cn.hutool.core.util.StrUtil;
|
||||
import com.alibaba.fastjson.JSON;
|
||||
import com.alibaba.fastjson.JSONArray;
|
||||
import com.baomidou.dynamic.datasource.annotation.DS;
|
||||
import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
|
||||
import com.baomidou.mybatisplus.core.toolkit.StringPool;
|
||||
|
|
@ -12,12 +13,14 @@ import com.baomidou.mybatisplus.core.toolkit.StringUtils;
|
|||
import com.fasterxml.jackson.core.JsonProcessingException;
|
||||
import com.fasterxml.jackson.databind.ObjectMapper;
|
||||
import com.google.common.cache.Cache;
|
||||
import com.google.common.collect.Lists;
|
||||
import com.google.common.collect.Maps;
|
||||
import me.zhyd.oauth.log.Log;
|
||||
import org.apache.commons.io.FileUtils;
|
||||
import org.apache.commons.math3.fitting.WeightedObservedPoints;
|
||||
import org.jeecg.common.api.vo.Result;
|
||||
import org.jeecg.common.cache.SelfCache;
|
||||
import org.jeecg.common.constant.Prompt;
|
||||
import org.jeecg.common.constant.SelfStationConstant;
|
||||
import org.jeecg.common.constant.StringConstant;
|
||||
import org.jeecg.common.constant.enums.FileTypeEnum;
|
||||
import org.jeecg.common.properties.ParameterProperties;
|
||||
|
|
@ -29,7 +32,7 @@ import org.jeecg.modules.base.entity.configuration.GardsNuclLib;
|
|||
import org.jeecg.modules.base.entity.configuration.GardsNuclLinesLib;
|
||||
import org.jeecg.modules.base.entity.original.GardsSampleData;
|
||||
import org.jeecg.modules.base.entity.rnauto.GardsAnalyses;
|
||||
import org.jeecg.modules.base.entity.rnauto.GardsAnalysisRoi;
|
||||
import org.jeecg.modules.base.entity.rnman.GardsAnalysisRoi;
|
||||
import org.jeecg.modules.base.entity.rnman.GardsAnalySetting;
|
||||
import org.jeecg.modules.base.enums.SampleFileHeader;
|
||||
import org.jeecg.modules.entity.*;
|
||||
|
|
@ -57,9 +60,9 @@ import java.text.ParseException;
|
|||
import java.util.*;
|
||||
import java.util.stream.Collectors;
|
||||
|
||||
import static org.aspectj.weaver.tools.cache.SimpleCacheFactory.path;
|
||||
|
||||
@Service
|
||||
@DS("ora")
|
||||
public class SelfStationServiceImpl implements ISelfStationService {
|
||||
|
||||
@Autowired
|
||||
|
|
@ -133,10 +136,18 @@ public class SelfStationServiceImpl implements ISelfStationService {
|
|||
}
|
||||
|
||||
@Override
|
||||
@DS("ora")
|
||||
public Result loadFromDB(String dbName, Integer sampleId, String analyst, HttpServletRequest request) {
|
||||
Result result = new Result();
|
||||
Map<String, Map<String, Object>> resultMap = new HashMap<>();
|
||||
//页面展示结果数组
|
||||
List<GardsXeResultsSpectrum> xeResultsSpectrumList = new LinkedList<>();
|
||||
List<GardsCalibrationSpectrum> gammaCalibrationSpectrumList= new LinkedList<>();
|
||||
List<GardsCalibrationSpectrum> betaCalibrationSpectrumList = new LinkedList<>();
|
||||
List<GardsROIChannelsSpectrum> roiChannelsSpectrumList = new LinkedList<>();
|
||||
List<GardsROIResultsSpectrum> roiResultsSpectrumList = new LinkedList<>();
|
||||
List<GardsCalibrationPairsSpectrum> gammaCalibrationPairsList = new LinkedList<>();
|
||||
List<GardsCalibrationPairsSpectrum> betaCalibrationPairsList = new LinkedList<>();
|
||||
|
||||
//获取用户名
|
||||
String userName = JwtUtil.getUserNameByToken(request);
|
||||
//获取自建台站缓存信息
|
||||
|
|
@ -152,14 +163,16 @@ public class SelfStationServiceImpl implements ISelfStationService {
|
|||
List<RoiDto> roiPaths = new ArrayList<>();
|
||||
if (dbName.equalsIgnoreCase("auto")){
|
||||
dbName = "RNAUTO";
|
||||
analysisID = spectrumAnalysisMapper.getAnalysisID(dbName, sampleId, "RNAUTO");
|
||||
// 获取gamma谱
|
||||
roiPaths = spectrumAnalysisMapper.roiPaths(dbName, analysisID);
|
||||
analyst = "RNAUTO";
|
||||
} else if (dbName.equalsIgnoreCase("man")){
|
||||
dbName = "RNMAN";
|
||||
analysisID = spectrumAnalysisMapper.getAnalysisID(dbName, sampleId, analyst);
|
||||
roiPaths = spectrumAnalysisMapper.roiPaths(dbName, analysisID);
|
||||
}
|
||||
analysisID = spectrumAnalysisMapper.getAnalysisID(dbName, sampleId, analyst);
|
||||
if (analysisID == null) {
|
||||
result.error500("The queried Sample data does not exist");
|
||||
return result;
|
||||
}
|
||||
roiPaths = spectrumAnalysisMapper.roiPaths(dbName, analysisID);
|
||||
try {
|
||||
if (Objects.nonNull(analysisID)) {
|
||||
//查询数据库文件信息
|
||||
|
|
@ -180,11 +193,39 @@ public class SelfStationServiceImpl implements ISelfStationService {
|
|||
detBg = spectrumAnalysisMapper.findSampleByFilePath(dbSpectrumFilePath.getDetBgFilePath());
|
||||
detFileName = dbSpectrumFilePath.getDetBgFilePath().substring(dbSpectrumFilePath.getDetBgFilePath().lastIndexOf(StringPool.SLASH)+1);
|
||||
}
|
||||
//获取qc相关信息
|
||||
String dbQcFilePath = "";
|
||||
GardsSampleData qc = null;
|
||||
String qcFileName = "";
|
||||
if (Objects.nonNull(dbSpectrumFilePath.getCollectStart()) && StringUtils.isNotBlank(dbSpectrumFilePath.getSiteDetCode())) {
|
||||
String collectStartStr = DateUtils.formatDate(dbSpectrumFilePath.getCollectStart(), "yyyy/MM/dd HH:mm:ss");
|
||||
dbQcFilePath = spectrumAnalysisMapper.getQCFilePath(dbSpectrumFilePath.getSiteDetCode(), collectStartStr);
|
||||
if (StringUtils.isNotBlank(dbQcFilePath)) {
|
||||
qc = spectrumAnalysisMapper.findSampleByFilePath(dbQcFilePath);
|
||||
qcFileName = dbQcFilePath.substring(dbQcFilePath.lastIndexOf(StringPool.SLASH)+1);
|
||||
}
|
||||
}
|
||||
|
||||
//从缓存中获取公用变量的数据
|
||||
SelfStationData selfStationData = selfCache.getIfPresent(sampleFileName + StringPool.DASH + userName);
|
||||
if (Objects.isNull(selfStationData)) {
|
||||
//初始化自建台站数据对象
|
||||
selfStationData = new SelfStationData();
|
||||
if (dbName.equalsIgnoreCase("RNAUTO")) {
|
||||
xeResultsSpectrumList = spectrumAnalysisMapper.ReadXeResults(dbName, analysisID, sampleId);
|
||||
gammaCalibrationSpectrumList = spectrumAnalysisMapper.ReadGammaCalibrationParam("RNAUTO", analysisID);
|
||||
betaCalibrationSpectrumList = spectrumAnalysisMapper.ReadBetaCalibrationParam("RNAUTO", analysisID);
|
||||
roiChannelsSpectrumList = spectrumAnalysisMapper.ReadROIChannels("RNAUTO", analysisID, sampleId);
|
||||
roiResultsSpectrumList = spectrumAnalysisMapper.ReadROIResults("RNAUTO", analysisID, sampleId);
|
||||
} else {
|
||||
gammaCalibrationPairsList = spectrumAnalysisMapper.ReadGammaFitChannelEnergy(analysisID);
|
||||
betaCalibrationPairsList = spectrumAnalysisMapper.ReadBetaFitChannelEnergy(analysisID);
|
||||
xeResultsSpectrumList = spectrumAnalysisMapper.ReadXeResults(dbName, analysisID, sampleId);
|
||||
gammaCalibrationSpectrumList = spectrumAnalysisMapper.ReadGammaCalibrationParam("RNMAN", analysisID);
|
||||
betaCalibrationSpectrumList = spectrumAnalysisMapper.ReadBetaCalibrationParam("RNMAN", analysisID);
|
||||
roiChannelsSpectrumList = spectrumAnalysisMapper.ReadROIChannels("RNMAN", analysisID, sampleId);
|
||||
roiResultsSpectrumList = spectrumAnalysisMapper.ReadROIResults("RNMAN", analysisID, sampleId);
|
||||
}
|
||||
//判断sample文件名是否为空
|
||||
if (Objects.nonNull(sample)) {
|
||||
//拼接sample文件路径
|
||||
|
|
@ -197,6 +238,18 @@ public class SelfStationServiceImpl implements ISelfStationService {
|
|||
selfStationData.setSampleStruct(struct);
|
||||
selfStationData.setSampleTmpPath(sampleFilePath);
|
||||
selfStationUtil.loadFile(selfStationData, sample.getSampleId(), sample.getStatus(), "sample", map);
|
||||
// 交互库需要获取最新的ROI数据
|
||||
if (dbName.equalsIgnoreCase("man")) {
|
||||
List<GardsAnalysisRoi> roiList = analysisRoiManService.analysisRoi(analysisID);
|
||||
LinkedList<Integer> start = Lists.newLinkedList();
|
||||
LinkedList<Integer> stop = Lists.newLinkedList();
|
||||
for (GardsAnalysisRoi f : roiList) {
|
||||
start.add(f.getRoiNum() -1, f.getMinX().intValue());
|
||||
stop.add(f.getRoiNum() -1, f.getMinY().intValue());
|
||||
}
|
||||
Map<String, Object> gammaByROI = selfStationUtil.getGammaByROI("", start, stop, selfStationData);
|
||||
map.putAll(gammaByROI);
|
||||
}
|
||||
resultMap.put("sample", map);
|
||||
|
||||
// 返回Beta和Gamma的数据
|
||||
|
|
@ -218,6 +271,21 @@ public class SelfStationServiceImpl implements ISelfStationService {
|
|||
resultMap.put("det", map);
|
||||
}
|
||||
}
|
||||
//判断qc文件名是否为空
|
||||
if (Objects.nonNull(qc)) {
|
||||
//拼接det文件路径
|
||||
String qcFilePath = prefix + dbSpectrumFilePath.getQcFilePath();
|
||||
//返回结果map
|
||||
Map<String, Object> map = new HashMap<>();
|
||||
//获取sample分析后的对象
|
||||
EnergySpectrumStruct struct = selfStationUtil.getSourceData(qcFilePath, "qc", selfStationData);
|
||||
if (Objects.nonNull(struct)) {
|
||||
selfStationData.setQcStruct(struct);
|
||||
selfStationData.setQcTmpPath(qcFilePath);
|
||||
selfStationUtil.loadFile(selfStationData, qc.getSampleId(), qc.getStatus(), "qc", map);
|
||||
resultMap.put("qc", map);
|
||||
}
|
||||
}
|
||||
// 初始化自建台站Configure信息
|
||||
if (!StrUtil.equals(dbName, "RNAUTO")) initConfigure(analysisID, selfStationData);
|
||||
// 初始化自建台站用户核素库信息
|
||||
|
|
@ -280,6 +348,18 @@ public class SelfStationServiceImpl implements ISelfStationService {
|
|||
//返回结果map
|
||||
Map<String, Object> map = new HashMap<>();
|
||||
selfStationUtil.loadFile(selfStationData, sample.getSampleId(), sample.getStatus(), "sample", map);
|
||||
// 交互库需要获取最新的ROI数据
|
||||
if (dbName.equalsIgnoreCase("man")) {
|
||||
List<GardsAnalysisRoi> roiList = analysisRoiManService.analysisRoi(analysisID);
|
||||
LinkedList<Integer> start = Lists.newLinkedList();
|
||||
LinkedList<Integer> stop = Lists.newLinkedList();
|
||||
for (GardsAnalysisRoi f : roiList) {
|
||||
start.add(f.getRoiNum() -1, f.getMinX().intValue());
|
||||
stop.add(f.getRoiNum() -1, f.getMinY().intValue());
|
||||
}
|
||||
Map<String, Object> gammaByROI = selfStationUtil.getGammaByROI("", start, stop, selfStationData);
|
||||
map.putAll(gammaByROI);
|
||||
}
|
||||
resultMap.put("sample", map);
|
||||
// 返回Beta和Gamma的数据
|
||||
bGSpectrum(selfStationData.getSampleStruct(), map);
|
||||
|
|
@ -589,47 +669,15 @@ public class SelfStationServiceImpl implements ISelfStationService {
|
|||
selfStationCache.deleteSelfCache(key);
|
||||
}
|
||||
|
||||
@Override
|
||||
public Result updateROI(Integer startChannel, Integer endChannel, Integer ROINum, String sampleFileName, HttpServletRequest request) {
|
||||
Result result = new Result();
|
||||
Map<String, Object> map = new HashMap<>();
|
||||
//获取用户名
|
||||
String userName = JwtUtil.getUserNameByToken(request);
|
||||
//读取自建台站缓存
|
||||
Cache<String, SelfStationData> selfCache = selfStationCache.getSelfCache();
|
||||
//获取缓存的当前谱对应的数据
|
||||
SelfStationData selfStationData = selfCache.getIfPresent(sampleFileName + StringPool.DASH + userName);
|
||||
if (Objects.isNull(selfStationData)) {
|
||||
result.error500("Load basic file information first!");
|
||||
return result;
|
||||
}
|
||||
public void updateROI(List<ROIParam> roiParams, SelfStationData selfStationData) {
|
||||
EnergySpectrumStruct struct = selfStationData.getSampleStruct();
|
||||
Map<String, Object> resultMap = selfStationUtil.statisticsROIList(startChannel, endChannel, struct.b_channels, struct.g_channels, struct.h_counts);
|
||||
if ( CollectionUtils.isNotEmpty(resultMap) ) {
|
||||
Integer startChannelValue = (Integer) resultMap.get("startChannel");
|
||||
Integer endChannelValue = (Integer) resultMap.get("endChannel");
|
||||
List<SeriseData> seriseDataList = (List<SeriseData>) resultMap.get("dataList");
|
||||
if (1 == ROINum) {
|
||||
map.put("ROIOneList", seriseDataList);
|
||||
map.put("ROIOneStart", startChannelValue);
|
||||
map.put("ROIOneStop", endChannelValue);
|
||||
} else if (2 == ROINum) {
|
||||
map.put("ROITwoList", seriseDataList);
|
||||
map.put("ROITwoStart", startChannelValue);
|
||||
map.put("ROITwoStop", endChannelValue);
|
||||
} else if (3 == ROINum) {
|
||||
map.put("ROIThreeList", seriseDataList);
|
||||
map.put("ROIThreeStart", startChannelValue);
|
||||
map.put("ROIThreeStop", endChannelValue);
|
||||
} else if (4 == ROINum) {
|
||||
map.put("ROIFourList", seriseDataList);
|
||||
map.put("ROIFourStart", startChannelValue);
|
||||
map.put("ROIFourStop", endChannelValue);
|
||||
}
|
||||
LinkedList<Integer> roiBBoundaryStart = Lists.newLinkedList();
|
||||
LinkedList<Integer> roiBBoundaryStop = Lists.newLinkedList();
|
||||
for (ROIParam roiParam : roiParams) {
|
||||
roiBBoundaryStart.add(roiParam.getRoiNum() - 1, roiParam.getStartChannel());
|
||||
roiBBoundaryStop.add(roiParam.getRoiNum() - 1, roiParam.getEndChannel());
|
||||
}
|
||||
result.setSuccess(true);
|
||||
result.setResult(map);
|
||||
return result;
|
||||
selfStationUtil.getGammaByROI("sample", roiBBoundaryStart, roiBBoundaryStop, selfStationData);
|
||||
}
|
||||
|
||||
@Override
|
||||
|
|
@ -664,35 +712,39 @@ public class SelfStationServiceImpl implements ISelfStationService {
|
|||
default:
|
||||
break;
|
||||
}
|
||||
LinkedList<Integer> roiBBoundaryStart = Lists.newLinkedList();
|
||||
LinkedList<Integer> roiBBoundaryStop = Lists.newLinkedList();
|
||||
for (ROIParam roiParam : roiParams) {
|
||||
Integer ROINum = roiParam.getRoiNum();
|
||||
Map<String, Object> resultMap = selfStationUtil.statisticsROIList(roiParam.getStartChannel(), roiParam.getEndChannel(),
|
||||
struct.b_channels, struct.g_channels, struct.h_counts);
|
||||
if ( CollectionUtils.isNotEmpty(resultMap) ) {
|
||||
Integer startChannelValue = (Integer) resultMap.get("startChannel");
|
||||
Integer endChannelValue = (Integer) resultMap.get("endChannel");
|
||||
List<SeriseData> seriseDataList = (List<SeriseData>) resultMap.get("dataList");
|
||||
if (1 == ROINum) {
|
||||
map.put("ROIOneList", seriseDataList);
|
||||
map.put("ROIOneStart", startChannelValue);
|
||||
map.put("ROIOneStop", endChannelValue);
|
||||
} else if (2 == ROINum) {
|
||||
map.put("ROITwoList", seriseDataList);
|
||||
map.put("ROITwoStart", startChannelValue);
|
||||
map.put("ROITwoStop", endChannelValue);
|
||||
} else if (3 == ROINum) {
|
||||
map.put("ROIThreeList", seriseDataList);
|
||||
map.put("ROIThreeStart", startChannelValue);
|
||||
map.put("ROIThreeStop", endChannelValue);
|
||||
} else if (4 == ROINum) {
|
||||
map.put("ROIFourList", seriseDataList);
|
||||
map.put("ROIFourStart", startChannelValue);
|
||||
map.put("ROIFourStop", endChannelValue);
|
||||
}
|
||||
}
|
||||
roiBBoundaryStart.add(roiParam.getRoiNum()-1, roiParam.getStartChannel());
|
||||
roiBBoundaryStop.add(roiParam.getRoiNum()-1, roiParam.getEndChannel());
|
||||
|
||||
// Map<String, Object> resultMap = selfStationUtil.statisticsROIList(roiParam.getStartChannel(), roiParam.getEndChannel(),
|
||||
// struct.b_channels, struct.g_channels, struct.h_counts);
|
||||
// if ( CollectionUtils.isNotEmpty(resultMap) ) {
|
||||
// Integer startChannelValue = (Integer) resultMap.get("startChannel");
|
||||
// Integer endChannelValue = (Integer) resultMap.get("endChannel");
|
||||
// List<SeriseData> seriseDataList = (List<SeriseData>) resultMap.get("dataList");
|
||||
// if (1 == ROINum) {
|
||||
// map.put("ROIOneList", seriseDataList);
|
||||
// map.put("ROIOneStart", startChannelValue);
|
||||
// map.put("ROIOneStop", endChannelValue);
|
||||
// } else if (2 == ROINum) {
|
||||
// map.put("ROITwoList", seriseDataList);
|
||||
// map.put("ROITwoStart", startChannelValue);
|
||||
// map.put("ROITwoStop", endChannelValue);
|
||||
// } else if (3 == ROINum) {
|
||||
// map.put("ROIThreeList", seriseDataList);
|
||||
// map.put("ROIThreeStart", startChannelValue);
|
||||
// map.put("ROIThreeStop", endChannelValue);
|
||||
// } else if (4 == ROINum) {
|
||||
// map.put("ROIFourList", seriseDataList);
|
||||
// map.put("ROIFourStart", startChannelValue);
|
||||
// map.put("ROIFourStop", endChannelValue);
|
||||
// }
|
||||
// }
|
||||
}
|
||||
result.setSuccess(true);
|
||||
result.setResult(map);
|
||||
result.setResult(selfStationUtil.getGammaByROI(struct.system_type, roiBBoundaryStart, roiBBoundaryStop, selfStationData));
|
||||
return result;
|
||||
}
|
||||
|
||||
|
|
@ -2054,7 +2106,7 @@ public class SelfStationServiceImpl implements ISelfStationService {
|
|||
}
|
||||
|
||||
@Override
|
||||
public Result Reprocessing(String fileName, String processKey, HttpServletRequest request) {
|
||||
public Result Reprocessing(String fileName, String processKey, String roiParams, HttpServletRequest request) {
|
||||
Result result = new Result();
|
||||
String userName = JwtUtil.getUserNameByToken(request);
|
||||
|
||||
|
|
@ -2068,6 +2120,11 @@ public class SelfStationServiceImpl implements ISelfStationService {
|
|||
result.error500("Please select the parse file first！");
|
||||
return result;
|
||||
}
|
||||
List<ROIParam> roiParamList = null;
|
||||
if (StrUtil.isNotBlank(roiParams)) {
|
||||
roiParamList = JSONArray.parseArray(roiParams, ROIParam.class);
|
||||
this.updateROI(roiParamList, selfStationData);
|
||||
}
|
||||
|
||||
// Gamma文件内容转换为PHD实体
|
||||
SelfStationVueData sampleVueData = selfStationData.getSampleVueData();
|
||||
|
|
@ -2079,10 +2136,44 @@ public class SelfStationServiceImpl implements ISelfStationService {
|
|||
|
||||
Map<String, Object> roiMap = new HashMap<>();
|
||||
try {
|
||||
roiMap.put("ROI1", this.gammaAnalyse(processKey, phdOne, nuclideLinesMap, colorMap));
|
||||
roiMap.put("ROI2", this.gammaAnalyse(processKey, phdTwo, nuclideLinesMap, colorMap));
|
||||
roiMap.put("ROI3", this.gammaAnalyse(processKey, phdThree, nuclideLinesMap, colorMap));
|
||||
roiMap.put("ROI4", this.gammaAnalyse(processKey, phdFour, nuclideLinesMap, colorMap));
|
||||
boolean bROI1 = selfStationUtil.checkROIRenew(sampleVueData, SelfStationConstant.ROI1);
|
||||
boolean bROI2 = selfStationUtil.checkROIRenew(sampleVueData, SelfStationConstant.ROI2);
|
||||
boolean bROI3 = selfStationUtil.checkROIRenew(sampleVueData, SelfStationConstant.ROI3);
|
||||
boolean bROI4 = selfStationUtil.checkROIRenew(sampleVueData, SelfStationConstant.ROI4);
|
||||
int flag = gammaFileUtil.AnalyseData(phdOne);
|
||||
// 如果参数没有修改且没有修改任何ROI则不允许分析
|
||||
if (flag == 0 && !bROI1 && !bROI2 && !bROI3 && !bROI4) {
|
||||
String warning = "The spectrum needn't Analyed. Maybe:\n" +
|
||||
"1. It has already Analyed.\n" +
|
||||
"2. You didn't change any setting or calibration.";
|
||||
result.error500(StrUtil.replace(warning, "%s", "ROI"));
|
||||
return result;
|
||||
}
|
||||
// 如果参数修改 或者 修改某个ROI 只重新分析某个gamma
|
||||
if (flag != 0 || bROI1) {
|
||||
roiMap.put(SelfStationConstant.ROI1, this.gammaAnalyse(processKey, phdOne, nuclideLinesMap, colorMap, flag));
|
||||
}
|
||||
if (flag != 0 || bROI2) {
|
||||
roiMap.put(SelfStationConstant.ROI2, this.gammaAnalyse(processKey, phdTwo, nuclideLinesMap, colorMap, flag));
|
||||
}
|
||||
if (flag != 0 || bROI3) {
|
||||
roiMap.put(SelfStationConstant.ROI3, this.gammaAnalyse(processKey, phdThree, nuclideLinesMap, colorMap, flag));
|
||||
}
|
||||
if (flag != 0 || bROI4) {
|
||||
roiMap.put(SelfStationConstant.ROI4, this.gammaAnalyse(processKey, phdFour, nuclideLinesMap, colorMap, flag));
|
||||
}
|
||||
// roiMap.put(SelfStationConstant.ROI2, this.gammaAnalyse(processKey, phdTwo, nuclideLinesMap, colorMap, bROI2));
|
||||
// roiMap.put(SelfStationConstant.ROI3, this.gammaAnalyse(processKey, phdThree, nuclideLinesMap, colorMap, bROI3));
|
||||
// roiMap.put(SelfStationConstant.ROI4, this.gammaAnalyse(processKey, phdFour, nuclideLinesMap, colorMap, bROI4));
|
||||
// 用于下次分析判断是否更新
|
||||
sampleVueData.setUsedROIOneBetaStart(sampleVueData.getROIOneBetaStart());
|
||||
sampleVueData.setUsedROIOneBetaStop(sampleVueData.getROIOneBetaStop());
|
||||
sampleVueData.setUsedROITwoBetaStart(sampleVueData.getROITwoBetaStart());
|
||||
sampleVueData.setUsedROITwoBetaStop(sampleVueData.getROITwoBetaStop());
|
||||
sampleVueData.setUsedROIThreeBetaStart(sampleVueData.getROIThreeBetaStart());
|
||||
sampleVueData.setUsedROIThreeBetaStop(sampleVueData.getROIThreeBetaStop());
|
||||
sampleVueData.setUsedROIFourBetaStart(sampleVueData.getROIFourBetaStart());
|
||||
sampleVueData.setUsedROIFourBetaStop(sampleVueData.getROIFourBetaStop());
|
||||
|
||||
sampleVueData.setUsedEner(phdOne.getUsedEner());
|
||||
sampleVueData.setUsedEnerKD(phdOne.getUsedEnerKD());
|
||||
|
|
@ -2101,6 +2192,7 @@ public class SelfStationServiceImpl implements ISelfStationService {
|
|||
result.setResult(roiMap);
|
||||
selfStationData.setBAnalyed(true);
|
||||
} catch (RuntimeException e) {
|
||||
Log.error("analyse error：", e);
|
||||
result.error500(StrUtil.replace(e.getMessage(), "%s", "ROI"));
|
||||
}
|
||||
return result;
|
||||
|
|
@ -5219,8 +5311,8 @@ public class SelfStationServiceImpl implements ISelfStationService {
|
|||
if (!FileUtil.exist(reportPath))
|
||||
return Result.error("The automatic handler generated report does not exist！");
|
||||
result.put("Beta", FileUtil.readUtf8String(reportPath));
|
||||
List<GardsAnalysisRoi> analysisRois = analysisRoiAutoService.analysisRoi(idAnalysis);
|
||||
for (GardsAnalysisRoi analysisRoi : analysisRois) {
|
||||
List<org.jeecg.modules.base.entity.rnauto.GardsAnalysisRoi> analysisRois = analysisRoiAutoService.analysisRoi(idAnalysis);
|
||||
for (org.jeecg.modules.base.entity.rnauto.GardsAnalysisRoi analysisRoi : analysisRois) {
|
||||
Integer roiNum = analysisRoi.getRoiNum();
|
||||
String roiReportPath = analysisRoi.getReportPath();
|
||||
roiReportPath = rootPath + saveFilePath + StrUtil.SLASH + roiReportPath + FileTypeEnum.arr.getType();
|
||||
|
|
@ -5277,8 +5369,8 @@ public class SelfStationServiceImpl implements ISelfStationService {
|
|||
if (!FileUtil.exist(logPath))
|
||||
return Result.error("The log generated by the automatic processor does not exist！");
|
||||
result.put("Beta", FileUtil.readUtf8String(logPath));
|
||||
List<GardsAnalysisRoi> analysisRois = analysisRoiAutoService.analysisRoi(idAnalysis);
|
||||
for (GardsAnalysisRoi analysisRoi : analysisRois) {
|
||||
List<org.jeecg.modules.base.entity.rnauto.GardsAnalysisRoi> analysisRois = analysisRoiAutoService.analysisRoi(idAnalysis);
|
||||
for (org.jeecg.modules.base.entity.rnauto.GardsAnalysisRoi analysisRoi : analysisRois) {
|
||||
Integer roiNum = analysisRoi.getRoiNum();
|
||||
String roiLogPath = analysisRoi.getLogPath();
|
||||
roiLogPath = rootPath + logPathPrefix + StrUtil.SLASH + roiLogPath;
|
||||
|
|
@ -5413,63 +5505,55 @@ public class SelfStationServiceImpl implements ISelfStationService {
|
|||
* @throws RuntimeException
|
||||
*/
|
||||
private Map<String, Object> gammaAnalyse(String processKey, PHDFile phd, Map<String, NuclideLines> nuclideLinesMap,
|
||||
Map<String, String> colorMap) throws RuntimeException{
|
||||
Map<String, String> colorMap, int flag) throws RuntimeException{
|
||||
|
||||
phd.setUserId(processKey);
|
||||
// 赋值xml文件存放路径
|
||||
phd.setXmlFilePath(parameterProperties.getFilePath());
|
||||
int flag = gammaFileUtil.AnalyseData(phd);
|
||||
if (flag == 0) {
|
||||
String warning = "The spectrum needn't Analyed. Maybe:\n" +
|
||||
"1. It has already Analyed.\n" +
|
||||
"2. You didn't change any setting or calibration.";
|
||||
if (flag == -1) {
|
||||
//分析时将phd的核素map重置
|
||||
phd.setPhdNuclideMap(nuclideLinesMap);
|
||||
//重新计算核素的活度浓度
|
||||
gammaFileUtil.NuclidesIdent(phd, nuclideLinesMap);
|
||||
phd.setEfficiencyParam(phd.getUsedEffiPara().getP());
|
||||
phd.setEfficiencyEnergy(phd.getUsedEffiKD().getG_energy());
|
||||
phd.setEfficiencyCurRow(0);
|
||||
// 重新计算峰值
|
||||
Map<String, NuclideLines> nuclideLinesMDCMap = (Map<String, NuclideLines>) redisUtil.get("AllNuclideMap");
|
||||
gammaFileUtil.getNuclideMDCValue(phd, phd.getMdcInfoMap(), nuclideLinesMDCMap);
|
||||
String warning = "Finish three tasks:\n" +
|
||||
"\t1.Update efficiencies of all peaks;\n" +
|
||||
"\t2.Identify nuclides again;\n" +
|
||||
"\t3.Test QC again.";
|
||||
throw new RuntimeException(warning);
|
||||
} else {
|
||||
if (flag == -1) {
|
||||
//分析时将phd的核素map重置
|
||||
phd.setPhdNuclideMap(nuclideLinesMap);
|
||||
//重新计算核素的活度浓度
|
||||
gammaFileUtil.NuclidesIdent(phd, nuclideLinesMap);
|
||||
Map<String, Object> map = new HashMap<>();
|
||||
//分析时将phd的核素map重置
|
||||
phd.setPhdNuclideMap(nuclideLinesMap);
|
||||
//读取redis缓存的计算mdc信息
|
||||
Map<String, CalMDCInfo> mdcInfoMap = (Map<String, CalMDCInfo>) redisUtil.get("mdcInfoMap-"+phd.getHeader().getSystem_type());
|
||||
if (CollectionUtils.isNotEmpty(mdcInfoMap)) {
|
||||
phd.setMdcInfoMap(mdcInfoMap);
|
||||
}
|
||||
//调用分析算法
|
||||
boolean analyseSpectrum = gammaFileUtil.AnalyseSpectrum(phd, nuclideLinesMap);
|
||||
if (analyseSpectrum) {
|
||||
phd.setEfficiencyParam(phd.getUsedEffiPara().getP());
|
||||
phd.setEfficiencyEnergy(phd.getUsedEffiKD().getG_energy());
|
||||
phd.setEfficiencyCurRow(0);
|
||||
// 重新计算峰值
|
||||
Map<String, NuclideLines> nuclideLinesMDCMap = (Map<String, NuclideLines>) redisUtil.get("AllNuclideMap");
|
||||
gammaFileUtil.getNuclideMDCValue(phd, phd.getMdcInfoMap(), nuclideLinesMDCMap);
|
||||
String warning = "Finish three tasks:\n" +
|
||||
"\t1.Update efficiencies of all peaks;\n" +
|
||||
"\t2.Identify nuclides again;\n" +
|
||||
"\t3.Test QC again.";
|
||||
throw new RuntimeException(warning);
|
||||
gammaFileUtil.UpdateChart(phd, map, colorMap);
|
||||
map.put("bAnalyed", phd.isBAnalyed());
|
||||
map.put("peak", phd.getVPeak());
|
||||
map.put("BaseCtrls", phd.getBaseCtrls());
|
||||
// Bar Chart 柱状图
|
||||
List<SeriseData> differance = gammaFileUtil.Differance(phd, phd.getVPeak());
|
||||
map.put("barChart", differance);
|
||||
return map;
|
||||
} else {
|
||||
Map<String, Object> map = new HashMap<>();
|
||||
//分析时将phd的核素map重置
|
||||
phd.setPhdNuclideMap(nuclideLinesMap);
|
||||
//读取redis缓存的计算mdc信息
|
||||
Map<String, CalMDCInfo> mdcInfoMap = (Map<String, CalMDCInfo>) redisUtil.get("mdcInfoMap-"+phd.getHeader().getSystem_type());
|
||||
if (CollectionUtils.isNotEmpty(mdcInfoMap)) {
|
||||
phd.setMdcInfoMap(mdcInfoMap);
|
||||
}
|
||||
//调用分析算法
|
||||
boolean analyseSpectrum = gammaFileUtil.AnalyseSpectrum(phd, nuclideLinesMap);
|
||||
if (analyseSpectrum) {
|
||||
phd.setEfficiencyParam(phd.getUsedEffiPara().getP());
|
||||
phd.setEfficiencyEnergy(phd.getUsedEffiKD().getG_energy());
|
||||
phd.setEfficiencyCurRow(0);
|
||||
// 重新计算峰值
|
||||
Map<String, NuclideLines> nuclideLinesMDCMap = (Map<String, NuclideLines>) redisUtil.get("AllNuclideMap");
|
||||
gammaFileUtil.getNuclideMDCValue(phd, phd.getMdcInfoMap(), nuclideLinesMDCMap);
|
||||
gammaFileUtil.UpdateChart(phd, map, colorMap);
|
||||
map.put("bAnalyed", phd.isBAnalyed());
|
||||
map.put("peak", phd.getVPeak());
|
||||
map.put("BaseCtrls", phd.getBaseCtrls());
|
||||
// Bar Chart 柱状图
|
||||
List<SeriseData> differance = gammaFileUtil.Differance(phd, phd.getVPeak());
|
||||
map.put("barChart", differance);
|
||||
return map;
|
||||
} else {
|
||||
throw new RuntimeException("There is a problem with the current %s phd file, Analysis failure!");
|
||||
}
|
||||
throw new RuntimeException("There is a problem with the current %s phd file, Analysis failure!");
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in New Issue
Block a user