diff --git a/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/controller/GammaController.java b/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/controller/GammaController.java index 392e97b0..0d1a9103 100644 --- a/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/controller/GammaController.java +++ b/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/controller/GammaController.java @@ -478,7 +478,7 @@ public class GammaController { @GetMapping("saveTxt") public Result saveTxt(String fileName, HttpServletRequest request) { - return null; + return gammaService.saveTxt(fileName, 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 c71350bd..b66d49e2 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 @@ -882,6 +882,7 @@ public class GammaServiceImpl implements IGammaService { @Override public Result configureSave(ConfigureData configureData, HttpServletRequest request) { Result result = new Result(); + Map map = new HashMap<>(); String userName = JwtUtil.getUserNameByToken(request); String fileName = configureData.getFileName(); Cache phdCache = localCache.getPHDCache(); @@ -904,7 +905,9 @@ public class GammaServiceImpl implements IGammaService { phdSetting.setKeepCalPeakSearchPeaks(configureData.isKeepCalPeakSearchPeaks()); phdSetting.setRefTime_act(configureData.getRefTime_act()); phdSetting.setRefTime_conc(configureData.getRefTime_conc()); + map.put("checkBox_updateCal", phd.getSetting().isBUpdateCal()); result.success("保存成功"); + result.setResult(map); return result; } @@ -1554,6 +1557,7 @@ public class GammaServiceImpl implements IGammaService { result.setResult(map); return result; } + public List InitList(double energy, double tolerance, List nuclides) { if(nuclides.size() < 1){ return new LinkedList<>(); @@ -1776,13 +1780,8 @@ public class GammaServiceImpl implements IGammaService { } @Override - public void exportZeroTimeAnalyse(String nuclide1, String nuclide2, - Double product1, Double product2, - String target, String energyTFH, - String date, String time, - HttpServletResponse response) { - Result> result = ZeroTimeAnalyse(nuclide1, nuclide2, - product1, product2, target, energyTFH, date, time); + public void exportZeroTimeAnalyse(String nuclide1, String nuclide2, Double product1, Double product2, String target, String energyTFH, String date, String time, HttpServletResponse response) { + Result> result = ZeroTimeAnalyse(nuclide1, nuclide2, product1, product2, target, energyTFH, date, time); Map annlyse = result.getResult(); annlyse.put("nuclide1", nuclide1); annlyse.put("nuclide2", nuclide2);