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

gamma重新分析增加参数processKey用于区分判断

Browse Source
This commit is contained in:
qiaoqinzheng 2023-11-15 19:04:47 +08:00
parent 27d22a8173
commit 1edb06857d
3 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -77,8 +77,8 @@ public class GammaController {
@PostMapping("Reprocessing") @PostMapping("Reprocessing")
@ApiOperation(value = "analyze菜单下Reprocessing页面数据", notes = "analyze菜单下Reprocessing页面数据") @ApiOperation(value = "analyze菜单下Reprocessing页面数据", notes = "analyze菜单下Reprocessing页面数据")
public Result Reprocessing(String fileName, HttpServletRequest request) { public Result Reprocessing(String fileName, String processKey, HttpServletRequest request) {
return gammaService.Reprocessing(fileName, request); return gammaService.Reprocessing(fileName, processKey, request);
} }
@GetMapping("InteractiveTool") @GetMapping("InteractiveTool")

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

@ -30,7 +30,7 @@ public interface IGammaService{
Result configureSave(ConfigureData configureData, HttpServletRequest request); Result configureSave(ConfigureData configureData, HttpServletRequest request);
Result Reprocessing(String fileName, HttpServletRequest request); Result Reprocessing(String fileName, String processKey, HttpServletRequest request);
Result InteractiveTool(Integer sampleId, String fileName, HttpServletRequest request); Result InteractiveTool(Integer sampleId, String fileName, HttpServletRequest request);

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

@ -1024,7 +1024,7 @@ public class GammaServiceImpl extends AbstractLogOrReport implements IGammaServi
} }
@Override @Override
public Result Reprocessing(String fileName, HttpServletRequest request) { public Result Reprocessing(String fileName, String processKey, HttpServletRequest request) {
Result result = new Result(); Result result = new Result();
String userName = JwtUtil.getUserNameByToken(request); String userName = JwtUtil.getUserNameByToken(request);
Cache<String, PHDFile> phdCache = localCache.getPHDCache(); Cache<String, PHDFile> phdCache = localCache.getPHDCache();
@ -1033,9 +1033,7 @@ public class GammaServiceImpl extends AbstractLogOrReport implements IGammaServi
result.error500("Please select the parse file first！"); result.error500("Please select the parse file first！");
return result; return result;
} }
// 获取当前用户信息 phd.setUserId(processKey);
LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
phd.setUserId(sysUser.getId());
// 赋值xml文件存放路径 // 赋值xml文件存放路径
phd.setXmlFilePath(parameterProperties.getFilePath()); phd.setXmlFilePath(parameterProperties.getFilePath());
// 获取当前角色的颜色配置 // 获取当前角色的颜色配置