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

gamma功能增加数据库来源判断区分，修改加载基本数据报错问题

Browse Source
This commit is contained in:
qiaoqinzheng 2023-11-03 09:46:40 +08:00
parent 14543eb4a5
commit 61f7c20cba
2 changed files with 23 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
jeecg-module-beta-gamma-analyser/src/main/java/org/jeecg/common/util/GammaFileUtil.java
View File

@ -238,7 +238,7 @@ public class GammaFileUtil extends AbstractLogOrReport {
return true; return true;
} }
public void SetBaseInfo(PHDFile phd) { public void SetBaseInfo(PHDFile phd, String prefixName) {
String pathName = phd.getFilepath(); String pathName = phd.getFilepath();
String fileName = phd.getFilename(); String fileName = phd.getFilename();
//文件名称需要加上自动处理的前缀以及修改不同的文件后缀名 //文件名称需要加上自动处理的前缀以及修改不同的文件后缀名
@ -248,7 +248,7 @@ public class GammaFileUtil extends AbstractLogOrReport {
File scacFile = null; File scacFile = null;
InputStream inputStreamBase = null; InputStream inputStreamBase = null;
try { try {
String lcFileName = "RNAUTO_"+subFileName + ".lc"; String lcFileName = prefixName+"_"+subFileName + ".lc";
String fromPathLc = pathName + StringPool.SLASH + lcFileName; String fromPathLc = pathName + StringPool.SLASH + lcFileName;
lcFile = ftpUtil.downloadFile(fromPathLc, "betaGamma"); lcFile = ftpUtil.downloadFile(fromPathLc, "betaGamma");
@ -258,7 +258,7 @@ public class GammaFileUtil extends AbstractLogOrReport {
//将数据结果赋值给 phdFile的vLc //将数据结果赋值给 phdFile的vLc
phd.setVLc(vDataLc); phd.setVLc(vDataLc);
String scacFileName = "RNAUTO_"+subFileName + ".scac"; String scacFileName = prefixName+"_"+subFileName + ".scac";
String fromPathScac = pathName + StringPool.SLASH + scacFileName; String fromPathScac = pathName + StringPool.SLASH + scacFileName;
scacFile = ftpUtil.downloadFile(fromPathScac, "betaGamma"); scacFile = ftpUtil.downloadFile(fromPathScac, "betaGamma");
@ -268,7 +268,7 @@ public class GammaFileUtil extends AbstractLogOrReport {
//将数据结果赋值给 phdFile的vLc //将数据结果赋值给 phdFile的vLc
phd.setVScac(vDataScac); phd.setVScac(vDataScac);
String baselineFileName = "RNAUTO_"+subFileName + ".baseline"; String baselineFileName = prefixName+"_"+subFileName + ".baseline";
String fromPathBase = pathName + StringPool.SLASH + baselineFileName; String fromPathBase = pathName + StringPool.SLASH + baselineFileName;
inputStreamBase = ftpUtil.downloadFileStream(fromPathBase); inputStreamBase = ftpUtil.downloadFileStream(fromPathBase);
// 调用处理BaseCtrl的方法 // 调用处理BaseCtrl的方法

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

@ -162,7 +162,11 @@ public class GammaServiceImpl extends AbstractLogOrReport implements IGammaServi
return result; 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); boolean bRet = getResultFromDB(dbName, userName, sampleId, phd, result);
if (!redisUtil.hasKey(fileName+"-"+userName)) { if (!redisUtil.hasKey(fileName+"-"+userName)) {
@ -461,7 +465,11 @@ public class GammaServiceImpl extends AbstractLogOrReport implements IGammaServi
return result; return result;
} }
// 加载phd数据所需的lc，scac，baseline数据 // 加载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其他相关信息 // 从数据库中读取phd其他相关信息
boolean bRet = getResultFromDB(dbName, userName, sampleId, phd, result); boolean bRet = getResultFromDB(dbName, userName, sampleId, phd, result);
if (!redisUtil.hasKey(fileName+"-"+userName)) { 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) { 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")) { if (dbName.equals("auto")) {
T_analy = "RNAUTO.GARDS_ANALYSES"; T_analy = "RNAUTO.GARDS_ANALYSES";
T_calib = "RNAUTO.GARDS_CALIBRATION_PAIRS"; 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_nuc_act = "RNAUTO.GARDS_NUCL_IDED";
T_qc = "RNAUTO.GARDS_QC_CHECK"; T_qc = "RNAUTO.GARDS_QC_CHECK";
userName = "RNAUTO"; userName = "RNAUTO";
} else { } else if (dbName.equals("man")) {
T_analy = "RNMAN.GARDS_ANALYSES"; T_analy = "RNMAN.GARDS_ANALYSES";
T_calib = "RNMAN.GARDS_CALIBRATION_PAIRS"; T_calib = "RNMAN.GARDS_CALIBRATION_PAIRS";
T_peaks = "RNMAN.GARDS_PEAKS"; T_peaks = "RNMAN.GARDS_PEAKS";