From 1edb06857d085618d64bad35856bd04eb03588fe Mon Sep 17 00:00:00 2001 From: qiaoqinzheng Date: Wed, 15 Nov 2023 19:04:47 +0800 Subject: [PATCH] =?UTF-8?q?gamma=E9=87=8D=E6=96=B0=E5=88=86=E6=9E=90?= =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=8F=82=E6=95=B0processKey=E7=94=A8?= =?UTF-8?q?=E4=BA=8E=E5=8C=BA=E5=88=86=E5=88=A4=E6=96=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/org/jeecg/modules/controller/GammaController.java | 4 ++-- .../main/java/org/jeecg/modules/service/IGammaService.java | 2 +- .../org/jeecg/modules/service/impl/GammaServiceImpl.java | 6 ++---- 3 files changed, 5 insertions(+), 7 deletions(-) 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 8acabdbc..b3623fde 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 @@ -77,8 +77,8 @@ public class GammaController { @PostMapping("Reprocessing") @ApiOperation(value = "analyze菜单下Reprocessing页面数据", notes = "analyze菜单下Reprocessing页面数据") - public Result Reprocessing(String fileName, HttpServletRequest request) { - return gammaService.Reprocessing(fileName, request); + public Result Reprocessing(String fileName, String processKey, HttpServletRequest request) { + return gammaService.Reprocessing(fileName, processKey, request); } @GetMapping("InteractiveTool") 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 bf837927..c1906313 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 @@ -30,7 +30,7 @@ public interface IGammaService{ 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); 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 0493d4fa..ece76ca4 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 @@ -1024,7 +1024,7 @@ public class GammaServiceImpl extends AbstractLogOrReport implements IGammaServi } @Override - public Result Reprocessing(String fileName, HttpServletRequest request) { + public Result Reprocessing(String fileName, String processKey, HttpServletRequest request) { Result result = new Result(); String userName = JwtUtil.getUserNameByToken(request); Cache phdCache = localCache.getPHDCache(); @@ -1033,9 +1033,7 @@ public class GammaServiceImpl extends AbstractLogOrReport implements IGammaServi result.error500("Please select the parse file first！"); return result; } - // 获取当前用户信息 - LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal(); - phd.setUserId(sysUser.getId()); + phd.setUserId(processKey); // 赋值xml文件存放路径 phd.setXmlFilePath(parameterProperties.getFilePath()); // 获取当前角色的颜色配置