From 50c70d70265c802d8fc5c2d17ccafb7edfc4ce4e Mon Sep 17 00:00:00 2001 From: xiaoguangbin Date: Thu, 25 Jul 2024 14:34:44 +0800 Subject: [PATCH] =?UTF-8?q?feat=EF=BC=9AselfStationController=20=E5=A2=9E?= =?UTF-8?q?=E5=8A=A0=20resetButton=20=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/SelfStationController.java | 6 ++++ .../modules/service/ISelfStationService.java | 2 ++ .../service/impl/SelfStationServiceImpl.java | 30 +++++++++++++++++++ 3 files changed, 38 insertions(+) diff --git a/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/controller/SelfStationController.java b/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/controller/SelfStationController.java index 08d144b6..77192fc2 100644 --- a/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/controller/SelfStationController.java +++ b/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/controller/SelfStationController.java @@ -298,6 +298,12 @@ public class SelfStationController { return selfStationService.getGammaGated(chartHeight, channelWidth, gammaChannel, sampleId, qcFileName, sampleFileName, request); } + @PostMapping("resetButton") + @ApiOperation(value = "重置计算数据", notes = "重置计算数据") + public void resetButton(String sampleFileName, String tabName, HttpServletRequest request) { + selfStationService.resetButton(sampleFileName, tabName, request); + } + @GetMapping("NuclideLibrary") @ApiOperation(value = "查看Nuclide Library页面数据", notes = "查看Nuclide Library页面数据") public Result NuclideLibrary(Integer sampleId, String fileName, String editEnergy, double err, String libraryName, String nuclideName, HttpServletRequest request) { diff --git a/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/service/ISelfStationService.java b/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/service/ISelfStationService.java index 39b0d5d9..d8f7d0f5 100644 --- a/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/service/ISelfStationService.java +++ b/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/service/ISelfStationService.java @@ -97,6 +97,8 @@ public interface ISelfStationService { Result getGammaGated(Integer chartHeight, Integer channelWidth, Integer gammaChannel, Integer sampleId, String qcFileName, String sampleFileName, HttpServletRequest request); + void resetButton(String sampleFileName, String tabName, HttpServletRequest request); + Result NuclideLibrary(Integer sampleId, String fileName, String editEnergy, double err, String libraryName, String nuclideName, HttpServletRequest request); Result configUserLibrary(Integer sampleId, String fileName, HttpServletRequest request); diff --git a/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/service/impl/SelfStationServiceImpl.java b/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/service/impl/SelfStationServiceImpl.java index f8d110b5..fe473acf 100644 --- a/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/service/impl/SelfStationServiceImpl.java +++ b/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/service/impl/SelfStationServiceImpl.java @@ -3029,6 +3029,36 @@ public class SelfStationServiceImpl implements ISelfStationService { return result; } + @Override + public void resetButton(String sampleFileName, String tabName, HttpServletRequest request) { + //获取用户名 + String userName = JwtUtil.getUserNameByToken(request); + //获取自建台站缓存信息 + Cache selfCache = selfStationCache.getSelfCache(); + SelfStationData betaDataFile = selfCache.getIfPresent(sampleFileName + StringPool.DASH + userName); + //获取缓存信息 +// Cache cache = betaCache.getBetaCache(); +// BetaDataFile betaDataFile = cache.getIfPresent(sampleFileName + "-" + userName); + if (Objects.nonNull(betaDataFile)) { + //判断需要重置的tab页 + if (tabName.equalsIgnoreCase("gamma")) { + betaDataFile.setGammaListNow(Collections.EMPTY_LIST); + betaDataFile.setGammaFittingParaNow(Collections.EMPTY_LIST); + betaDataFile.setGammaFittingParaToUiNow(Collections.EMPTY_LIST); + betaDataFile.setGammaNewEnergyListNow(Collections.EMPTY_LIST); + betaDataFile.setBetaListNow(Collections.EMPTY_LIST); + betaDataFile.setBetaFittingParaNow(Collections.EMPTY_LIST); + betaDataFile.setBetaFittingParaToUiNow(Collections.EMPTY_LIST); + betaDataFile.setBetaNewEnergyListNow(Collections.EMPTY_LIST); + } else if (tabName.equalsIgnoreCase("beta")) { + betaDataFile.setBetaListNow(Collections.EMPTY_LIST); + betaDataFile.setBetaFittingParaNow(Collections.EMPTY_LIST); + betaDataFile.setBetaFittingParaToUiNow(Collections.EMPTY_LIST); + betaDataFile.setBetaNewEnergyListNow(Collections.EMPTY_LIST); + } + } + } + private List getGateGamma(int channelWidth, int chartHeight, int gammaChannel, SelfStationData betaDataFile){ List serise_data = new LinkedList<>(); //选择矩形框高度