From c9c1ab26bf07580f4fd408831ad9da8d26f277a6 Mon Sep 17 00:00:00 2001 From: qiaoqinzheng Date: Tue, 7 Nov 2023 15:29:53 +0800 Subject: [PATCH] =?UTF-8?q?beta=E9=87=8D=E6=96=B0=E5=8A=A0=E8=BD=BD?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=E4=B8=A2=E5=A4=B1=E6=95=A3=E7=82=B9=E4=BF=A1?= =?UTF-8?q?=E6=81=AF=20gamma=E7=BC=93=E5=AD=98=E7=94=A8=E6=88=B7=E5=AF=B9?= =?UTF-8?q?=E5=BA=94=E7=9A=84=E6=A0=B8=E7=B4=A0=E4=BF=A1=E6=81=AF=E4=B8=8D?= =?UTF-8?q?=E8=BF=9B=E8=A1=8C=E5=88=A0=E9=99=A4=E6=93=8D=E4=BD=9C=EF=BC=8C?= =?UTF-8?q?key=E6=94=B9=E4=B8=BA=E7=94=A8=E6=88=B7=E5=90=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modules/service/impl/GammaServiceImpl.java | 13 ++++++------- .../service/impl/SpectrumAnalysisServiceImpl.java | 12 ++++++++++++ 2 files changed, 18 insertions(+), 7 deletions(-) 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 66d85061..8d153171 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 @@ -188,7 +188,7 @@ public class GammaServiceImpl extends AbstractLogOrReport implements IGammaServi String pathName = ftpUtil.getFtpRootPath() + spectrumPathProperties.getUploadPath() + StringPool.SLASH + userName; String fileName = samfileName; boolean flag = gammaFileUtil.loadFile(pathName, fileName, phd, result); - if (!redisUtil.hasKey(fileName+"-"+userName)) { + if (!redisUtil.hasKey(userName)) { // 查询当前用户关联的核素信息 List userLib = new LinkedList<>(); // 从postgreSql中获取当前用户关注的核素信息 如果当前用户没有 则返回管理员的 @@ -197,7 +197,7 @@ public class GammaServiceImpl extends AbstractLogOrReport implements IGammaServi userLib = defaultNuclideSpectrumService.findNuclidesByUserName("admin", phd.getHeader().getSystem_type().toUpperCase()); } Map nuclideMap = GetNuclideLines(userLib); - redisUtil.set(fileName+"-"+userName, nuclideMap); + redisUtil.set(userName, nuclideMap); } if (!flag) { return result; @@ -472,7 +472,7 @@ public class GammaServiceImpl extends AbstractLogOrReport implements IGammaServi } // 从数据库中读取phd其他相关信息 boolean bRet = getResultFromDB(dbName, userName, sampleId, phd, result); - if (!redisUtil.hasKey(fileName+"-"+userName)) { + if (!redisUtil.hasKey(userName)) { // 查询当前用户关联的核素信息 List userLib = new LinkedList<>(); // 从postgreSql中获取当前用户关注的核素信息 如果当前用户没有 则返回管理员的 @@ -481,7 +481,7 @@ public class GammaServiceImpl extends AbstractLogOrReport implements IGammaServi userLib = defaultNuclideSpectrumService.findNuclidesByUserName("admin", phd.getHeader().getSystem_type().toUpperCase()); } Map nuclideMap = GetNuclideLines(userLib); - redisUtil.set(fileName+"-"+userName, nuclideMap); + redisUtil.set(userName, nuclideMap); } // 判断数据库信息是否读取正常 if (!bRet) { @@ -837,7 +837,7 @@ public class GammaServiceImpl extends AbstractLogOrReport implements IGammaServi if (!bRet) { return result; } - if (!redisUtil.hasKey(fileName+"-"+userName)) { + if (!redisUtil.hasKey(userName)) { // 查询当前用户关联的核素信息 List userLib = new LinkedList<>(); // 从postgreSql中获取当前用户关注的核素信息 如果当前用户没有 则返回管理员的 @@ -846,7 +846,7 @@ public class GammaServiceImpl extends AbstractLogOrReport implements IGammaServi userLib = defaultNuclideSpectrumService.findNuclidesByUserName("admin", phd.getHeader().getSystem_type().toUpperCase()); } Map nuclideMap = GetNuclideLines(userLib); - redisUtil.set(fileName+"-"+userName, nuclideMap); + redisUtil.set(userName, nuclideMap); } } // 更新 ‘QC Flags’ 状态 @@ -882,7 +882,6 @@ public class GammaServiceImpl extends AbstractLogOrReport implements IGammaServi String key = fileName + StrUtil.DASHED + username; // 删除指定key的Cache localCache.deletePHDCache(key); - redisUtil.del(key); } @Override diff --git a/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/service/impl/SpectrumAnalysisServiceImpl.java b/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/service/impl/SpectrumAnalysisServiceImpl.java index abdfea6d..033ddfbc 100644 --- a/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/service/impl/SpectrumAnalysisServiceImpl.java +++ b/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/service/impl/SpectrumAnalysisServiceImpl.java @@ -643,21 +643,33 @@ public class SpectrumAnalysisServiceImpl extends AbstractLogOrReport implements Map map = new HashMap<>(); SpectrumData spectrumData = new SpectrumData(); List boundaryList = new LinkedList<>(); + List histogramDataList = new LinkedList<>(); + List histogramDataDList = new LinkedList<>(); if (type.equalsIgnoreCase("sample")) { spectrumData = betaDataFile.getSampleSpectrumData(); boundaryList = betaDataFile.getSampleBoundary(); + histogramDataList = betaDataFile.getSampleHistogramDataList(); + histogramDataDList = betaDataFile.getSampleHistogramDataDList(); } else if (type.equalsIgnoreCase("gas")) { spectrumData = betaDataFile.getGasSpectrumData(); boundaryList = betaDataFile.getGasBoundary(); + histogramDataList = betaDataFile.getGasHistogramDataList(); + histogramDataDList = betaDataFile.getGasHistogramDataDList(); } else if (type.equalsIgnoreCase("det")) { spectrumData = betaDataFile.getDetSpectrumData(); boundaryList = betaDataFile.getDetBoundary(); + histogramDataList = betaDataFile.getDetHistogramDataList(); + histogramDataDList = betaDataFile.getDetHistogramDataDList(); } else if (type.equalsIgnoreCase("qc")) { spectrumData = betaDataFile.getQcSpectrumData(); boundaryList = betaDataFile.getQcBoundary(); + histogramDataList = betaDataFile.getQcHistogramDataList(); + histogramDataDList = betaDataFile.getQcHistogramDataDList(); } map.put("spectrumData", spectrumData); map.put("Boundary", boundaryList); + map.put("histogramDataList", histogramDataList); + map.put("histogramDataDList", histogramDataDList); return map; }