From 61f7c20cba1cf589578720ea605ffeb07b3c68f8 Mon Sep 17 00:00:00 2001 From: qiaoqinzheng Date: Fri, 3 Nov 2023 09:46:40 +0800 Subject: [PATCH] =?UTF-8?q?gamma=E5=8A=9F=E8=83=BD=E5=A2=9E=E5=8A=A0?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=E5=BA=93=E6=9D=A5=E6=BA=90=E5=88=A4=E6=96=AD?= =?UTF-8?q?=E5=8C=BA=E5=88=86=EF=BC=8C=E4=BF=AE=E6=94=B9=E5=8A=A0=E8=BD=BD?= =?UTF-8?q?=E5=9F=BA=E6=9C=AC=E6=95=B0=E6=8D=AE=E6=8A=A5=E9=94=99=E9=97=AE?= =?UTF-8?q?=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../org/jeecg/common/util/GammaFileUtil.java | 8 +++---- .../service/impl/GammaServiceImpl.java | 23 +++++++++++++++---- 2 files changed, 23 insertions(+), 8 deletions(-) diff --git a/jeecg-module-beta-gamma-analyser/src/main/java/org/jeecg/common/util/GammaFileUtil.java b/jeecg-module-beta-gamma-analyser/src/main/java/org/jeecg/common/util/GammaFileUtil.java index f75bd8fa..cdb5cd8b 100644 --- a/jeecg-module-beta-gamma-analyser/src/main/java/org/jeecg/common/util/GammaFileUtil.java +++ b/jeecg-module-beta-gamma-analyser/src/main/java/org/jeecg/common/util/GammaFileUtil.java @@ -238,7 +238,7 @@ public class GammaFileUtil extends AbstractLogOrReport { return true; } - public void SetBaseInfo(PHDFile phd) { + public void SetBaseInfo(PHDFile phd, String prefixName) { String pathName = phd.getFilepath(); String fileName = phd.getFilename(); //文件名称需要加上自动处理的前缀以及修改不同的文件后缀名 @@ -248,7 +248,7 @@ public class GammaFileUtil extends AbstractLogOrReport { File scacFile = null; InputStream inputStreamBase = null; try { - String lcFileName = "RNAUTO_"+subFileName + ".lc"; + String lcFileName = prefixName+"_"+subFileName + ".lc"; String fromPathLc = pathName + StringPool.SLASH + lcFileName; lcFile = ftpUtil.downloadFile(fromPathLc, "betaGamma"); @@ -258,7 +258,7 @@ public class GammaFileUtil extends AbstractLogOrReport { //将数据结果赋值给 phdFile的vLc phd.setVLc(vDataLc); - String scacFileName = "RNAUTO_"+subFileName + ".scac"; + String scacFileName = prefixName+"_"+subFileName + ".scac"; String fromPathScac = pathName + StringPool.SLASH + scacFileName; scacFile = ftpUtil.downloadFile(fromPathScac, "betaGamma"); @@ -268,7 +268,7 @@ public class GammaFileUtil extends AbstractLogOrReport { //将数据结果赋值给 phdFile的vLc phd.setVScac(vDataScac); - String baselineFileName = "RNAUTO_"+subFileName + ".baseline"; + String baselineFileName = prefixName+"_"+subFileName + ".baseline"; String fromPathBase = pathName + StringPool.SLASH + baselineFileName; inputStreamBase = ftpUtil.downloadFileStream(fromPathBase); // 调用处理BaseCtrl的方法 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 33b172dc..762f7c5c 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 @@ -162,7 +162,11 @@ public class GammaServiceImpl extends AbstractLogOrReport implements IGammaServi return result; } // 声明基础数组信息 - gammaFileUtil.SetBaseInfo(phd); + if (dbName.equals("auto")) { + gammaFileUtil.SetBaseInfo(phd, "RNAUTO"); + } else if (dbName.equals("man")) { + gammaFileUtil.SetBaseInfo(phd, userName); + } // 从数据库中读取相关信息 boolean bRet = getResultFromDB(dbName, userName, sampleId, phd, result); if (!redisUtil.hasKey(fileName+"-"+userName)) { @@ -461,7 +465,11 @@ public class GammaServiceImpl extends AbstractLogOrReport implements IGammaServi return result; } // 加载phd数据所需的lc，scac，baseline数据 - gammaFileUtil.SetBaseInfo(phd); + if (dbName.equals("auto")) { + gammaFileUtil.SetBaseInfo(phd, "RNAUTO"); + } else if (dbName.equals("man")) { + gammaFileUtil.SetBaseInfo(phd, userName); + } // 从数据库中读取phd其他相关信息 boolean bRet = getResultFromDB(dbName, userName, sampleId, phd, result); if (!redisUtil.hasKey(fileName+"-"+userName)) { @@ -512,7 +520,14 @@ public class GammaServiceImpl extends AbstractLogOrReport implements IGammaServi public boolean getResultFromDB(String dbName, String userName, Integer sampleId, PHDFile phd, Result result) { // 判断连接的数据库 - String T_analy, T_calib, T_peaks, T_param, T_nuc_line, T_nuc_act, T_qc, T_setting; + String T_analy = ""; + String T_calib = ""; + String T_peaks = ""; + String T_param = ""; + String T_nuc_line = ""; + String T_nuc_act = ""; + String T_qc = ""; + String T_setting = ""; if (dbName.equals("auto")) { T_analy = "RNAUTO.GARDS_ANALYSES"; T_calib = "RNAUTO.GARDS_CALIBRATION_PAIRS"; @@ -522,7 +537,7 @@ public class GammaServiceImpl extends AbstractLogOrReport implements IGammaServi T_nuc_act = "RNAUTO.GARDS_NUCL_IDED"; T_qc = "RNAUTO.GARDS_QC_CHECK"; userName = "RNAUTO"; - } else { + } else if (dbName.equals("man")) { T_analy = "RNMAN.GARDS_ANALYSES"; T_calib = "RNMAN.GARDS_CALIBRATION_PAIRS"; T_peaks = "RNMAN.GARDS_PEAKS";