From 21b40f9ba8352bfed6b28fc19fcfe08d8b7b44fc Mon Sep 17 00:00:00 2001 From: qiaoqinzheng Date: Wed, 15 Nov 2023 18:19:12 +0800 Subject: [PATCH 1/4] =?UTF-8?q?beta=E5=8A=9F=E8=83=BDloadByDB=E9=A1=B5?= =?UTF-8?q?=E9=9D=A2=E5=A2=9E=E5=8A=A0=E8=BF=94=E5=9B=9E=E5=AD=97=E6=AE=B5?= =?UTF-8?q?analysisId?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/org/jeecg/modules/entity/GardsSampleDataSpectrum.java | 3 +++ .../org/jeecg/modules/mapper/xml/SpectrumAnalysisMapper.xml | 1 + .../modules/service/impl/SpectrumAnalysisServiceImpl.java | 3 +++ 3 files changed, 7 insertions(+) diff --git a/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/entity/GardsSampleDataSpectrum.java b/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/entity/GardsSampleDataSpectrum.java index a5ce048a..367e36a6 100644 --- a/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/entity/GardsSampleDataSpectrum.java +++ b/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/entity/GardsSampleDataSpectrum.java @@ -34,6 +34,9 @@ public class GardsSampleDataSpectrum extends GardsSampleData { @TableField(exist = false) private String analyst; + @TableField(exist = false) + private Integer analysitId; + @TableField(exist = false) @Excel(name = "NO" ,orderNum = "1") private Integer no; diff --git a/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/mapper/xml/SpectrumAnalysisMapper.xml b/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/mapper/xml/SpectrumAnalysisMapper.xml index ee38731f..d2bd52d1 100644 --- a/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/mapper/xml/SpectrumAnalysisMapper.xml +++ b/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/mapper/xml/SpectrumAnalysisMapper.xml @@ -42,6 +42,7 @@ c.acquisition_start acquisitionStart, c.acquisition_real_sec acquisitionRealSec, c.acquisition_live_sec acquisitionLiveSec, + d.IDANALYSIS analysitId, d.analyst analyst, c.status status, c.input_file_name inputFileName 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 99df5c97..166bc21f 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 @@ -2984,6 +2984,9 @@ public class SpectrumAnalysisServiceImpl extends AbstractLogOrReport implements } //根据sample文件名称获取当前文件的缓存信息 BetaDataFile sampleBetaData = cache.getIfPresent(sampleFileName + "-" + userName); + if (Objects.isNull(sampleBetaData)) { + sampleBetaData = new BetaDataFile(); + } //将当前文件用到的计算数据同步到需要计算的文件缓存 sampleBetaData.setBetaList(betaList); sampleBetaData.setBetaFittingPara(betaFittingPara); From 6e7b3f8e013d178a8c46a375a0903bba83d279bb Mon Sep 17 00:00:00 2001 From: qiaoqinzheng Date: Wed, 15 Nov 2023 18:54:20 +0800 Subject: [PATCH 2/4] =?UTF-8?q?beta=E5=8A=9F=E8=83=BD=E5=A2=9E=E5=8A=A0ini?= =?UTF-8?q?tValue=E6=8E=A5=E5=8F=A3=E6=8F=90=E5=89=8D=E7=BC=93=E5=AD=98?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=E4=BF=A1=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modules/controller/GammaController.java | 6 --- .../SpectrumAnalysesController.java | 6 +++ .../service/ISpectrumAnalysisService.java | 2 + .../impl/SpectrumAnalysisServiceImpl.java | 41 +++++++++++-------- 4 files changed, 31 insertions(+), 24 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 7c448ca5..8acabdbc 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 @@ -24,12 +24,6 @@ public class GammaController { @Autowired private IGammaService gammaService; - @Autowired - private RedisTemplate redisTemplate; - - @Autowired - private SystemClient systemClient; - @GetMapping("initValue") @ApiOperation(value = "初始化gamma数据", notes = "初始化gamma数据") public Result initValue(Integer sampleId, String dbName, String analyst, String fileName, HttpServletRequest request) { diff --git a/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/controller/SpectrumAnalysesController.java b/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/controller/SpectrumAnalysesController.java index 289ad2d7..9c6e5263 100644 --- a/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/controller/SpectrumAnalysesController.java +++ b/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/controller/SpectrumAnalysesController.java @@ -24,6 +24,12 @@ public class SpectrumAnalysesController { @Autowired private ISpectrumAnalysisService spectrumAnalysisService; + @GetMapping("initValue") + @ApiOperation(value = "初始化数据", notes = "初始化数据") + public Result initValue(String dbName, Integer sampleId, String analyst, String sampleFileName, String gasFileName, String detFileName, String qcFileName, HttpServletRequest request) { + return spectrumAnalysisService.initValue(dbName, sampleId, analyst, sampleFileName, gasFileName, detFileName, qcFileName, request); + } + @GetMapping("getDBSearchList") @ApiOperation(value = "查询查询条件数据接口", notes = "查询查询条件数据接口") public Result getDBSearchList(HttpServletRequest request, boolean AllUsers) { diff --git a/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/service/ISpectrumAnalysisService.java b/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/service/ISpectrumAnalysisService.java index b82d326b..361b7234 100644 --- a/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/service/ISpectrumAnalysisService.java +++ b/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/service/ISpectrumAnalysisService.java @@ -14,6 +14,8 @@ import java.util.List; public interface ISpectrumAnalysisService { + Result initValue(String dbName, Integer sampleId, String analyst, String sampleFileName, String gasFileName, String detFileName, String qcFileName, HttpServletRequest request); + Result getDBSearchList(HttpServletRequest request, boolean AllUsers); Result getDBSpectrumList(QueryRequest queryRequest, GardsSampleDataSpectrum gardsSampleData, String dbName, String[] menuTypes, boolean AllUsers, boolean CollectStopB, boolean AcqStartB, Date startDate, Date endDate, HttpServletRequest request); 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 166bc21f..b90fb98b 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 @@ -110,6 +110,14 @@ public class SpectrumAnalysisServiceImpl extends AbstractLogOrReport implements private IGardsHistogramSpectrumService histogramService; + @Override + public Result initValue(String dbName, Integer sampleId, String analyst, String sampleFileName, String gasFileName, String detFileName, String qcFileName, HttpServletRequest request) { + if (StringUtils.isNotBlank(dbName) && Objects.nonNull(sampleId)) { + return getDBSpectrumChart(dbName, sampleId, analyst, request); + } else { + return getFileSpectrumChart(sampleFileName, gasFileName, detFileName, qcFileName, request); + } + } @Override public Result getDBSearchList(HttpServletRequest request, boolean AllUsers) { @@ -342,24 +350,9 @@ public class SpectrumAnalysisServiceImpl extends AbstractLogOrReport implements if (dbName.equalsIgnoreCase("auto")){ dbName = "RNAUTO"; analysisID = spectrumAnalysisMapper.getAnalysisID(dbName, sampleId, "RNAUTO"); - xeResultsSpectrumList = spectrumAnalysisMapper.ReadXeResults(dbName, analysisID, sampleId); - gammaCalibrationSpectrumList = spectrumAnalysisMapper.ReadGammaCalibrationParam("RNAUTO", analysisID); - betaCalibrationSpectrumList = spectrumAnalysisMapper.ReadBetaCalibrationParam("RNAUTO", analysisID); - roiChannelsSpectrumList = spectrumAnalysisMapper.ReadROIChannels("RNAUTO", analysisID, sampleId); - roiResultsSpectrumList = spectrumAnalysisMapper.ReadROIResults("RNAUTO", analysisID, sampleId); } else if (dbName.equalsIgnoreCase("man")){ dbName = "RNMAN"; analysisID = spectrumAnalysisMapper.getAnalysisID(dbName, sampleId, analyst); - gammaCalibrationPairsList = spectrumAnalysisMapper.ReadGammaFitChannelEnergy(analysisID, sampleId); - betaCalibrationPairsList = spectrumAnalysisMapper.ReadBetaFitChannelEnergy(analysisID, sampleId); - xeResultsSpectrumList = spectrumAnalysisMapper.ReadXeResults(dbName, analysisID, sampleId); - gammaCalibrationSpectrumList = spectrumAnalysisMapper.ReadGammaCalibrationParam("RNMAN", analysisID); - betaCalibrationSpectrumList = spectrumAnalysisMapper.ReadBetaCalibrationParam("RNMAN", analysisID); - roiChannelsSpectrumList = spectrumAnalysisMapper.ReadROIChannels("RNMAN", analysisID, sampleId); - roiResultsSpectrumList = spectrumAnalysisMapper.ReadROIResults("RNMAN", analysisID, sampleId); - }else { - result.error500("The database type does not exist"); - return result; } File sampleTmp = null; File gasTmp = null; @@ -411,6 +404,21 @@ public class SpectrumAnalysisServiceImpl extends AbstractLogOrReport implements //如果缓存中没有公用变量的数据 if (Objects.isNull(betaDataFile)) { betaDataFile = new BetaDataFile(); + if (dbName.equalsIgnoreCase("RNAUTO")) { + xeResultsSpectrumList = spectrumAnalysisMapper.ReadXeResults(dbName, analysisID, sampleId); + gammaCalibrationSpectrumList = spectrumAnalysisMapper.ReadGammaCalibrationParam("RNAUTO", analysisID); + betaCalibrationSpectrumList = spectrumAnalysisMapper.ReadBetaCalibrationParam("RNAUTO", analysisID); + roiChannelsSpectrumList = spectrumAnalysisMapper.ReadROIChannels("RNAUTO", analysisID, sampleId); + roiResultsSpectrumList = spectrumAnalysisMapper.ReadROIResults("RNAUTO", analysisID, sampleId); + } else { + gammaCalibrationPairsList = spectrumAnalysisMapper.ReadGammaFitChannelEnergy(analysisID, sampleId); + betaCalibrationPairsList = spectrumAnalysisMapper.ReadBetaFitChannelEnergy(analysisID, sampleId); + xeResultsSpectrumList = spectrumAnalysisMapper.ReadXeResults(dbName, analysisID, sampleId); + gammaCalibrationSpectrumList = spectrumAnalysisMapper.ReadGammaCalibrationParam("RNMAN", analysisID); + betaCalibrationSpectrumList = spectrumAnalysisMapper.ReadBetaCalibrationParam("RNMAN", analysisID); + roiChannelsSpectrumList = spectrumAnalysisMapper.ReadROIChannels("RNMAN", analysisID, sampleId); + roiResultsSpectrumList = spectrumAnalysisMapper.ReadROIResults("RNMAN", analysisID, sampleId); + } //给公用变量赋值sampleId betaDataFile.setSampleId(String.valueOf(sampleId)); //用于记录文件路径信息 @@ -2984,9 +2992,6 @@ public class SpectrumAnalysisServiceImpl extends AbstractLogOrReport implements } //根据sample文件名称获取当前文件的缓存信息 BetaDataFile sampleBetaData = cache.getIfPresent(sampleFileName + "-" + userName); - if (Objects.isNull(sampleBetaData)) { - sampleBetaData = new BetaDataFile(); - } //将当前文件用到的计算数据同步到需要计算的文件缓存 sampleBetaData.setBetaList(betaList); sampleBetaData.setBetaFittingPara(betaFittingPara); From 27d22a8173059880dbf6f06b7052158c4b6c87cf Mon Sep 17 00:00:00 2001 From: qiaoqinzheng Date: Wed, 15 Nov 2023 19:00:42 +0800 Subject: [PATCH 3/4] =?UTF-8?q?gamma=E5=8A=9F=E8=83=BD=E5=8A=A0=E8=BD=BDlc?= =?UTF-8?q?=EF=BC=8Cscac=EF=BC=8Cbaseline=E6=96=87=E4=BB=B6=E5=88=A4?= =?UTF-8?q?=E7=A9=BA=E9=97=AE=E9=A2=98=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../org/jeecg/common/util/GammaFileUtil.java | 38 ++++++++++--------- 1 file changed, 20 insertions(+), 18 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 1d9d2d33..7254a3d3 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 @@ -253,30 +253,32 @@ public class GammaFileUtil extends AbstractLogOrReport { String lcFileName = prefixName+"_"+subFileName + ".lc"; String fromPathLc = pathName + StringPool.SLASH + lcFileName; lcFile = ftpUtil.downloadFile(fromPathLc, "betaGamma"); - - List readLinesLc = FileUtils.readLines(lcFile, "UTF-8"); - //得到行数据处理后的数据结果 - List vDataLc = ReadLcScacInfo(readLinesLc); - //将数据结果赋值给 phdFile的vLc - phd.setVLc(vDataLc); - + if (Objects.nonNull(lcFile)) { + List readLinesLc = FileUtils.readLines(lcFile, "UTF-8"); + //得到行数据处理后的数据结果 + List vDataLc = ReadLcScacInfo(readLinesLc); + //将数据结果赋值给 phdFile的vLc + phd.setVLc(vDataLc); + } String scacFileName = prefixName+"_"+subFileName + ".scac"; String fromPathScac = pathName + StringPool.SLASH + scacFileName; scacFile = ftpUtil.downloadFile(fromPathScac, "betaGamma"); - - List readLinesScac = FileUtils.readLines(scacFile, "UTF-8"); - //得到行数据处理后的数据结果 - List vDataScac = ReadLcScacInfo(readLinesScac); - //将数据结果赋值给 phdFile的vLc - phd.setVScac(vDataScac); - + if (Objects.nonNull(scacFile)) { + List readLinesScac = FileUtils.readLines(scacFile, "UTF-8"); + //得到行数据处理后的数据结果 + List vDataScac = ReadLcScacInfo(readLinesScac); + //将数据结果赋值给 phdFile的vLc + phd.setVScac(vDataScac); + } String baselineFileName = prefixName+"_"+subFileName + ".baseline"; String fromPathBase = pathName + StringPool.SLASH + baselineFileName; inputStreamBase = ftpUtil.downloadFileStream(fromPathBase); - // 调用处理BaseCtrl的方法 - ReadBaseCtrlInfo(phd, inputStreamBase); - // 将phdFile的BaseCtrls的BaseLine部分数据 赋值给 phdFile的vBase - phd.setVBase(phd.getBaseCtrls().getBaseline()); + if (Objects.nonNull(inputStreamBase)) { + // 调用处理BaseCtrl的方法 + ReadBaseCtrlInfo(phd, inputStreamBase); + // 将phdFile的BaseCtrls的BaseLine部分数据 赋值给 phdFile的vBase + phd.setVBase(phd.getBaseCtrls().getBaseline()); + } }catch (IOException e){ e.printStackTrace(); } finally { From 1edb06857d085618d64bad35856bd04eb03588fe Mon Sep 17 00:00:00 2001 From: qiaoqinzheng Date: Wed, 15 Nov 2023 19:04:47 +0800 Subject: [PATCH 4/4] =?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()); // 获取当前角色的颜色配置