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

fix：解决gamma交互工具添加核素之后mdc没有核素的问题

Browse Source
This commit is contained in:
xiaoguangbin 2024-11-18 14:03:59 +08:00
parent 4a0bb05232
commit e5bcf3bae0
4 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
jeecg-module-beta-gamma-analyser/src/main/java/org/jeecg/common/util/GammaFileUtil.java
View File

@ -1527,10 +1527,10 @@ public class GammaFileUtil extends AbstractLogOrReport {
}
} catch (JsonProcessingException e){
e.printStackTrace();
log.error("AnalyseSpectrum(): {}", e.getMessage());
log.error("AnalyseSpectrum(): {}", e);
} catch (RuntimeException e) {
e.printStackTrace();
log.error("AnalyseSpectrum(): {}", e.getMessage());
log.error("AnalyseSpectrum(): {}", e);
}
return true;
}
@ -4156,7 +4156,7 @@ public class GammaFileUtil extends AbstractLogOrReport {
return result;
}
public void CalcNuclideMDA(PHDFile phd, NuclideLines lines, String nucName, List<Integer> vPeakIdx, Integer energyTolerance) {
public void CalcNuclideMDA(PHDFile phd, NuclideLines lines, String nucName, List<Integer> vPeakIdx, Double energyTolerance) {
if(lines.halflife <= 0) {
return;
}

2
jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/entity/vo/NuclideInfo.java
View File

@ -16,6 +16,6 @@ public class NuclideInfo implements Serializable {
private List<String> list_identify;
private Integer energyTolerance;
private Double energyTolerance;
}

2
jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/service/IGammaService.java
View File

@ -53,7 +53,7 @@ public interface IGammaService{
Result getSelPosNuclide(Integer sampleId, String fileName, int channel, HttpServletRequest request);
Result addNuclide(Integer curRow, String nuclideName, String fileName, List<String> list_identify, Integer energyTolerance,
Result addNuclide(Integer curRow, String nuclideName, String fileName, List<String> list_identify, Double energyTolerance,
HttpServletRequest request);
Result deleteNuclide(Integer curRow, String nuclideName, String fileName, List<String> list_identify, HttpServletRequest request);

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

@ -1664,7 +1664,7 @@ public class GammaServiceImpl extends AbstractLogOrReport implements IGammaServi
@Override
public Result addNuclide(Integer curRow, String nuclideName, String fileName, List<String> list_identify,
Integer energyTolerance, HttpServletRequest request) {
Double energyTolerance, HttpServletRequest request) {
Result result = new Result();
Map<String, Object> map = new HashMap<>();
String userName = JwtUtil.getUserNameByToken(request);