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

gamma保存configure配置后刷新页面bUpdateCal数据

Browse Source
This commit is contained in:
qiaoqinzheng 2023-10-11 11:04:29 +08:00
parent 170081ea08
commit e3b251ee2d
2 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/controller/GammaController.java
View File

@ -478,7 +478,7 @@ public class GammaController {
@GetMapping("saveTxt") @GetMapping("saveTxt")
public Result saveTxt(String fileName, HttpServletRequest request) { public Result saveTxt(String fileName, HttpServletRequest request) {
return null; return gammaService.saveTxt(fileName, request);
} }
} }

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

@ -882,6 +882,7 @@ public class GammaServiceImpl implements IGammaService {
@Override @Override
public Result configureSave(ConfigureData configureData, HttpServletRequest request) { public Result configureSave(ConfigureData configureData, HttpServletRequest request) {
Result result = new Result(); Result result = new Result();
Map<String, Object> map = new HashMap<>();
String userName = JwtUtil.getUserNameByToken(request); String userName = JwtUtil.getUserNameByToken(request);
String fileName = configureData.getFileName(); String fileName = configureData.getFileName();
Cache<String, PHDFile> phdCache = localCache.getPHDCache(); Cache<String, PHDFile> phdCache = localCache.getPHDCache();
@ -904,7 +905,9 @@ public class GammaServiceImpl implements IGammaService {
phdSetting.setKeepCalPeakSearchPeaks(configureData.isKeepCalPeakSearchPeaks()); phdSetting.setKeepCalPeakSearchPeaks(configureData.isKeepCalPeakSearchPeaks());
phdSetting.setRefTime_act(configureData.getRefTime_act()); phdSetting.setRefTime_act(configureData.getRefTime_act());
phdSetting.setRefTime_conc(configureData.getRefTime_conc()); phdSetting.setRefTime_conc(configureData.getRefTime_conc());
map.put("checkBox_updateCal", phd.getSetting().isBUpdateCal());
result.success("保存成功"); result.success("保存成功");
result.setResult(map);
return result; return result;
} }
@ -1554,6 +1557,7 @@ public class GammaServiceImpl implements IGammaService {
result.setResult(map); result.setResult(map);
return result; return result;
} }
public List<String> InitList(double energy, double tolerance, List<String> nuclides) { public List<String> InitList(double energy, double tolerance, List<String> nuclides) {
if(nuclides.size() < 1){ if(nuclides.size() < 1){
return new LinkedList<>(); return new LinkedList<>();
@ -1776,13 +1780,8 @@ public class GammaServiceImpl implements IGammaService {
} }
@Override @Override
public void exportZeroTimeAnalyse(String nuclide1, String nuclide2, public void exportZeroTimeAnalyse(String nuclide1, String nuclide2, Double product1, Double product2, String target, String energyTFH, String date, String time, HttpServletResponse response) {
Double product1, Double product2, Result<Map<String, Object>> result = ZeroTimeAnalyse(nuclide1, nuclide2, product1, product2, target, energyTFH, date, time);
String target, String energyTFH,
String date, String time,
HttpServletResponse response) {
Result<Map<String, Object>> result = ZeroTimeAnalyse(nuclide1, nuclide2,
product1, product2, target, energyTFH, date, time);
Map<String, Object> annlyse = result.getResult(); Map<String, Object> annlyse = result.getResult();
annlyse.put("nuclide1", nuclide1); annlyse.put("nuclide1", nuclide1);
annlyse.put("nuclide2", nuclide2); annlyse.put("nuclide2", nuclide2);