diff --git a/jeecg-module-beta-gamma-analyser/src/main/java/org/jeecg/common/util/GammaFileUtil.java b/jeecg-module-beta-gamma-analyser/src/main/java/org/jeecg/common/util/GammaFileUtil.java index 07801a8e..d6507cfd 100644 --- a/jeecg-module-beta-gamma-analyser/src/main/java/org/jeecg/common/util/GammaFileUtil.java +++ b/jeecg-module-beta-gamma-analyser/src/main/java/org/jeecg/common/util/GammaFileUtil.java @@ -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 vPeakIdx, Integer energyTolerance) { + public void CalcNuclideMDA(PHDFile phd, NuclideLines lines, String nucName, List vPeakIdx, Double energyTolerance) { if(lines.halflife <= 0) { return; } diff --git a/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/entity/vo/NuclideInfo.java b/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/entity/vo/NuclideInfo.java index e7afda22..5c04d2ab 100644 --- a/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/entity/vo/NuclideInfo.java +++ b/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/entity/vo/NuclideInfo.java @@ -16,6 +16,6 @@ public class NuclideInfo implements Serializable { private List list_identify; - private Integer energyTolerance; + private Double energyTolerance; } diff --git a/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/service/IGammaService.java b/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/service/IGammaService.java index d8120810..d94ecc8b 100644 --- a/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/service/IGammaService.java +++ b/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/service/IGammaService.java @@ -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 list_identify, Integer energyTolerance, + Result addNuclide(Integer curRow, String nuclideName, String fileName, List list_identify, Double energyTolerance, HttpServletRequest request); Result deleteNuclide(Integer curRow, String nuclideName, String fileName, List list_identify, HttpServletRequest request); diff --git a/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/service/impl/GammaServiceImpl.java b/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/service/impl/GammaServiceImpl.java index 55d8f081..3cc25ab6 100644 --- a/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/service/impl/GammaServiceImpl.java +++ b/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/service/impl/GammaServiceImpl.java @@ -1664,7 +1664,7 @@ public class GammaServiceImpl extends AbstractLogOrReport implements IGammaServi @Override public Result addNuclide(Integer curRow, String nuclideName, String fileName, List list_identify, - Integer energyTolerance, HttpServletRequest request) { + Double energyTolerance, HttpServletRequest request) { Result result = new Result(); Map map = new HashMap<>(); String userName = JwtUtil.getUserNameByToken(request);