diff --git a/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/postgre/AlarmLog.java b/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/postgre/AlarmLog.java index f375178a..6e844e04 100644 --- a/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/postgre/AlarmLog.java +++ b/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/postgre/AlarmLog.java @@ -47,6 +47,12 @@ public class AlarmLog implements Serializable { @TableField(value = "alarm_value") private String alarmValue; + /** + * 当前的规则信息 + */ + @TableField(value = "operator") + private String operator; + public AlarmLog() { this.alarmStartDate = LocalDateTime.now(); } diff --git a/jeecg-boot-base-core/src/main/resources/excelTemplate/SaveExcel.xls b/jeecg-boot-base-core/src/main/resources/excelTemplate/SaveExcel.xls index 17c625ee..22c3e556 100644 Binary files a/jeecg-boot-base-core/src/main/resources/excelTemplate/SaveExcel.xls and b/jeecg-boot-base-core/src/main/resources/excelTemplate/SaveExcel.xls differ diff --git a/jeecg-boot-base-core/src/main/resources/excelTemplate/SaveHtml.html b/jeecg-boot-base-core/src/main/resources/excelTemplate/SaveHtml.html index 42d06c65..f0047357 100644 --- a/jeecg-boot-base-core/src/main/resources/excelTemplate/SaveHtml.html +++ b/jeecg-boot-base-core/src/main/resources/excelTemplate/SaveHtml.html @@ -117,12 +117,12 @@ New Gamma - CH(x) = (?1)+(?2)*x+(?3)x*x - CH(x) = (?1)+(?2)*x+(?3)x*x + CH(x) = ([[${betaCalibrationSEC.coeff1}]])+([[${betaCalibrationSEC.coeff2}]])*x+([[${betaCalibrationSEC.coeff3}]])x*x + CH(x) = ([[${gammaCalibrationSEC.coeff1}]])+([[${gammaCalibrationSEC.coeff2}]])*x+([[${gammaCalibrationSEC.coeff3}]])x*x - E(x) = (-3.33443)+(0.398048)*x+(-0.000124)x*x - E(x) = (0.879727)+(0.365551)*x+(-2.8e-05)x*x + E(x) = ([[${betaCalibrationSCE.coeff1}]])+([[${betaCalibrationSCE.coeff2}]])*x+([[${betaCalibrationSCE.coeff3}]])x*x + E(x) = ([[${gammaCalibrationSCE.coeff1}]])+([[${gammaCalibrationSCE.coeff2}]])*x+([[${gammaCalibrationSCE.coeff3}]])x*x   @@ -169,12 +169,12 @@ New Gamma - CH(x) = (?1)+(?2)*x+(?3)x*x - CH(x) = (?1)+(?2)*x+(?3)x*x + CH(x) = ([[${betaCalibrationDEC.coeff1}]])+([[${betaCalibrationDEC.coeff2}]])*x+([[${betaCalibrationDEC.coeff3}]])x*x + CH(x) = ([[${gammaCalibrationDEC.coeff1}]])+([[${gammaCalibrationDEC.coeff2}]])*x+([[${gammaCalibrationDEC.coeff3}]])x*x - E(x) = (0.879727)+(0.365551)*x+(-2.8e-05)x*x - E(x) = (0.879727)+(0.365551)*x+(-2.8e-05)x*x + E(x) = ([[${betaCalibrationDCE.coeff1}]])+([[${betaCalibrationDCE.coeff2}]])*x+([[${betaCalibrationDCE.coeff3}]])x*x + E(x) = ([[${gammaCalibrationDCE.coeff1}]])+([[${gammaCalibrationDCE.coeff2}]])*x+([[${gammaCalibrationDCE.coeff3}]])x*x   @@ -222,12 +222,12 @@ New Gamma - CH(x) = (?1)+(?2)*x+(?3)x*x - CH(x) = (?1)+(?2)*x+(?3)x*x + CH(x) = ([[${betaCalibrationGEC.coeff1}]])+([[${betaCalibrationGEC.coeff2}]])*x+([[${betaCalibrationGEC.coeff3}]])x*x + CH(x) = ([[${gammaCalibrationGEC.coeff1}]])+([[${gammaCalibrationGEC.coeff2}]])*x+([[${gammaCalibrationGEC.coeff3}]])x*x - E(x) = (-3.33443)+(0.398048)*x+(-0.000124)x*x - E(x) = (0.879727)+(0.365551)*x+(-2.8e-05)x*x + E(x) = ([[${betaCalibrationGCE.coeff1}]])+([[${betaCalibrationGCE.coeff2}]])*x+([[${betaCalibrationGCE.coeff3}]])x*x + E(x) = ([[${gammaCalibrationGCE.coeff1}]])+([[${gammaCalibrationGCE.coeff2}]])*x+([[${gammaCalibrationGCE.coeff3}]])x*x   diff --git a/jeecg-boot-base-core/src/main/resources/excelTemplate/SaveTxt.txt b/jeecg-boot-base-core/src/main/resources/excelTemplate/SaveTxt.txt index 160cbc39..775aa787 100644 --- a/jeecg-boot-base-core/src/main/resources/excelTemplate/SaveTxt.txt +++ b/jeecg-boot-base-core/src/main/resources/excelTemplate/SaveTxt.txt @@ -33,8 +33,7 @@ #SAMPLE New CALIBRATION New Beta New Gamma - CH(x) = (?1)+(?2)*x+(?3)x*x CH(x) = (?1)+(?2)*x+(?3)x*x - E(x) = (-3.33443)+(0.398048)*x+(-0.000124)x*x E(x) = (0.879727)+(0.365551)*x+(-2.8e-05)x*x +${sampleNewCalibration} #SAMPLE: LIMITS PER ROI Roi Beta Gamma @@ -47,8 +46,7 @@ ${sampleRoi} #DET New CALIBRATION New Beta New Gamma - CH(x) = (?1)+(?2)*x+(?3)x*x CH(x) = (?1)+(?2)*x+(?3)x*x - E(x) = (0.879727)+(0.365551)*x+(-2.8e-05)x*x E(x) = (0.879727)+(0.365551)*x+(-2.8e-05)x*x +${detNewCalibration} #DET: LIMITS PER ROI Roi Beta Gamma @@ -61,8 +59,7 @@ ${detRoi} #GAS New CALIBRATION New Beta New Gamma - CH(x) = (?1)+(?2)*x+(?3)x*x CH(x) = (?1)+(?2)*x+(?3)x*x - E(x) = (-3.33443)+(0.398048)*x+(-0.000124)x*x E(x) = (0.879727)+(0.365551)*x+(-2.8e-05)x*x +${gasNewCalibration} #GAS: LIMITS PER ROI Roi Beta Gamma diff --git a/jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/mapper/xml/AlarmLogMapper.xml b/jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/mapper/xml/AlarmLogMapper.xml index 9610858d..697e3bbd 100644 --- a/jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/mapper/xml/AlarmLogMapper.xml +++ b/jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/mapper/xml/AlarmLogMapper.xml @@ -30,7 +30,7 @@ l.alarm_start_date, l.alarm_info, l.alarm_value, - r.OPERATOR, + l.OPERATOR, r.source_type, CASE r.source_type diff --git a/jeecg-module-auto-process/src/main/java/org/jeecg/common/GammaFileUtil.java b/jeecg-module-auto-process/src/main/java/org/jeecg/common/GammaFileUtil.java index d822691d..ee83e1ee 100644 --- a/jeecg-module-auto-process/src/main/java/org/jeecg/common/GammaFileUtil.java +++ b/jeecg-module-auto-process/src/main/java/org/jeecg/common/GammaFileUtil.java @@ -2710,10 +2710,11 @@ public class GammaFileUtil { } public List DoubleLimit(List data){ + List rData = new LinkedList<>(); for(int pos=0;pos DoubleLimit_G(List _data) { diff --git a/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/common/util/GammaFileUtil.java b/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/common/util/GammaFileUtil.java index bf8fc06a..5caf617a 100644 --- a/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/common/util/GammaFileUtil.java +++ b/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/common/util/GammaFileUtil.java @@ -31,7 +31,9 @@ import org.xml.sax.SAXException; import javax.xml.parsers.DocumentBuilder; import javax.xml.parsers.DocumentBuilderFactory; import javax.xml.parsers.ParserConfigurationException; -import java.io.*; +import java.io.File; +import java.io.IOException; +import java.io.InputStream; import java.math.BigDecimal; import java.math.RoundingMode; import java.text.DecimalFormat; @@ -74,15 +76,8 @@ public class GammaFileUtil { ftpClient.setControlEncoding("UTF-8"); ftpClient.setFileTransferMode(FTPClient.STREAM_TRANSFER_MODE); ftpClient.changeWorkingDirectory(pathName); - List ftpFiles = Arrays.asList(ftpClient.listFiles()); - ftpFiles = ftpFiles.stream().filter(item -> item.getName().equals(fileName)).collect(Collectors.toList()); - if (ftpFiles.size() == 0) { - result.error500("ftp获取文件数据失败"); - return false; - } - FTPFile ftpFile = ftpFiles.get(0); - if (Objects.nonNull(ftpFile)) { - inputStream = ftpClient.retrieveFileStream(ftpFile.getName()); + inputStream = ftpClient.retrieveFileStream(fileName); + if (Objects.nonNull(inputStream)) { //声明一个临时文件 File file = File.createTempFile("tmp", null); //将ftp文件的输入流复制给临时文件 @@ -268,7 +263,7 @@ public class GammaFileUtil { return true; } - public void SetBaseInfo(PHDFile phd){ + public void SetBaseInfo(PHDFile phd) { String pathName = phd.getFilepath(); String fileName = phd.getFilename(); //文件名称需要加上自动处理的前缀以及修改不同的文件后缀名 @@ -279,6 +274,7 @@ public class GammaFileUtil { if (Objects.isNull(ftpClient)){ String warning = "ftp连接失败"; } + InputStream inputStream = null; try { //切换被动模式 ftpClient.enterLocalPassiveMode(); @@ -287,27 +283,27 @@ public class GammaFileUtil { ftpClient.setControlEncoding("UTF-8"); ftpClient.setFileTransferMode(FTPClient.STREAM_TRANSFER_MODE); ftpClient.changeWorkingDirectory(pathName); - List ftpFiles = Arrays.asList(ftpClient.listFiles()); String lcFileName = "RNAUTO_"+subFileName + ".lc"; - List lcFiles = ftpFiles.stream().filter(item -> item.getName().equals(lcFileName)).collect(Collectors.toList()); - if (CollectionUtils.isNotEmpty(lcFiles)){ - FTPFile lcFile = lcFiles.get(0); - if (Objects.nonNull(lcFile)){ - InputStream inputStream = ftpClient.retrieveFileStream(lcFile.getName()); - //声明一个临时文件 - File file = File.createTempFile("tmp", null); - //将ftp文件的输入流复制给临时文件 - FileUtils.copyInputStreamToFile(inputStream, file); - List readLines = FileUtils.readLines(file, "UTF-8"); - List vData = ReadLcScacInfo(readLines); - phd.setVLc(vData); - } + inputStream = ftpClient.retrieveFileStream(lcFileName); + if (Objects.nonNull(inputStream)){ + //声明一个临时文件 + File file = File.createTempFile("tmp", null); + //将ftp文件的输入流复制给临时文件 + FileUtils.copyInputStreamToFile(inputStream, file); + List readLines = FileUtils.readLines(file, "UTF-8"); + List vData = ReadLcScacInfo(readLines); + phd.setVLc(vData); } } catch (IOException e) { throw new RuntimeException(e); } finally { try { - ftpClient.disconnect(); + if (Objects.nonNull(ftpClient)) { + ftpClient.disconnect(); + } + if (Objects.nonNull(inputStream)) { + inputStream.close(); + } } catch (IOException e) { throw new RuntimeException(e); } @@ -319,6 +315,7 @@ public class GammaFileUtil { if (Objects.isNull(ftpClient)){ String warning = "ftp连接失败"; } + InputStream inputStream = null; try { //切换被动模式 ftpClient.enterLocalPassiveMode(); @@ -327,27 +324,27 @@ public class GammaFileUtil { ftpClient.setControlEncoding("UTF-8"); ftpClient.setFileTransferMode(FTPClient.STREAM_TRANSFER_MODE); ftpClient.changeWorkingDirectory(pathName); - List ftpFiles = Arrays.asList(ftpClient.listFiles()); String scacFileName = "RNAUTO_"+subFileName + ".scac"; - List scacFiles = ftpFiles.stream().filter(item -> item.getName().equals(scacFileName)).collect(Collectors.toList()); - if (CollectionUtils.isNotEmpty(scacFiles)){ - FTPFile scacFile = scacFiles.get(0); - if (Objects.nonNull(scacFile)){ - InputStream inputStream = ftpClient.retrieveFileStream(scacFile.getName()); - //声明一个临时文件 - File file = File.createTempFile("tmp", null); - //将ftp文件的输入流复制给临时文件 - FileUtils.copyInputStreamToFile(inputStream, file); - List readLines = FileUtils.readLines(file, "UTF-8"); - List vData = ReadLcScacInfo(readLines); - phd.setVScac(vData); - } + inputStream = ftpClient.retrieveFileStream(scacFileName); + if (Objects.nonNull(inputStream)){ + //声明一个临时文件 + File file = File.createTempFile("tmp", null); + //将ftp文件的输入流复制给临时文件 + FileUtils.copyInputStreamToFile(inputStream, file); + List readLines = FileUtils.readLines(file, "UTF-8"); + List vData = ReadLcScacInfo(readLines); + phd.setVScac(vData); } } catch (IOException e) { throw new RuntimeException(e); } finally { try { - ftpClient.disconnect(); + if (Objects.nonNull(ftpClient)) { + ftpClient.disconnect(); + } + if (Objects.nonNull(inputStream)) { + inputStream.close(); + } } catch (IOException e) { throw new RuntimeException(e); } @@ -359,6 +356,7 @@ public class GammaFileUtil { if (Objects.isNull(ftpClient)){ String warning = "ftp连接失败"; } + InputStream inputStream = null; try { //切换被动模式 ftpClient.enterLocalPassiveMode(); @@ -367,27 +365,27 @@ public class GammaFileUtil { ftpClient.setControlEncoding("UTF-8"); ftpClient.setFileTransferMode(FTPClient.STREAM_TRANSFER_MODE); ftpClient.changeWorkingDirectory(pathName); - List ftpFiles = Arrays.asList(ftpClient.listFiles()); String baselineFileName = "RNAUTO_"+subFileName + ".baseline"; - List baselineFiles = ftpFiles.stream().filter(item -> item.getName().equals(baselineFileName)).collect(Collectors.toList()); - if (CollectionUtils.isNotEmpty(baselineFiles)){ - FTPFile baselineFile = baselineFiles.get(0); - if (Objects.nonNull(baselineFile)){ - InputStream inputStream = ftpClient.retrieveFileStream(baselineFile.getName()); - //声明一个临时文件 - File file = File.createTempFile("tmp", null); - //将ftp文件的输入流复制给临时文件 - FileUtils.copyInputStreamToFile(inputStream, file); - List readLines = FileUtils.readLines(file, "UTF-8"); - ReadBaseCtrlInfo(phd,readLines); - phd.setVBase(phd.getBaseCtrls().getBaseline()); - } + inputStream = ftpClient.retrieveFileStream(baselineFileName); + if (Objects.nonNull(inputStream)){ + //声明一个临时文件 + File file = File.createTempFile("tmp", null); + //将ftp文件的输入流复制给临时文件 + FileUtils.copyInputStreamToFile(inputStream, file); + List readLines = FileUtils.readLines(file, "UTF-8"); + ReadBaseCtrlInfo(phd,readLines); + phd.setVBase(phd.getBaseCtrls().getBaseline()); } } catch (IOException e) { throw new RuntimeException(e); } finally { try { - ftpClient.disconnect(); + if (Objects.nonNull(ftpClient)) { + ftpClient.disconnect(); + } + if (Objects.nonNull(inputStream)) { + inputStream.close(); + } } catch (IOException e) { throw new RuntimeException(e); } @@ -395,7 +393,7 @@ public class GammaFileUtil { } } - public List ReadLcScacInfo(List readLines){ + public List ReadLcScacInfo(List readLines) { List vData = new LinkedList<>(); for (int i=0; i< readLines.size(); i++){ String line = readLines.get(i); @@ -430,7 +428,7 @@ public class GammaFileUtil { return vData; } - public void ReadBaseCtrlInfo(PHDFile phd, List readLines){ + public void ReadBaseCtrlInfo(PHDFile phd, List readLines) { for (int i=0; i< readLines.size(); i++){ String line = readLines.get(i); if (line.contains("#")){ @@ -484,59 +482,7 @@ public class GammaFileUtil { } } - public void ReadBaseCtrlInfo(PHDFile phd, InputStream in){ - try { - BufferedReader reader = new BufferedReader(new InputStreamReader(in)); - String line ; - String block_name = null; - HashMap> map = new HashMap<>(); - while (null != (line = reader.readLine())) { - if (line.contains("#")) { - block_name = line.trim(); - map.put(block_name, new LinkedList<>()); - continue; - } - List data = map.get(block_name); - String[] split = line.split("\\s+"); - for(String str : split) { - if (StringUtils.isNotBlank(str) && !str.equalsIgnoreCase("nan")){ - double d = Double.parseDouble(str); - data.add(d); - } else if (StringUtils.isNotBlank(str) && str.equalsIgnoreCase("nan")) { - data.add(0.0); - } - } - } - if(map.containsKey("#AnalyseRange")) { - List vTemp = map.get("#AnalyseRange"); - if(vTemp.size() == 2) { - phd.getBaseCtrls().setRg_low(vTemp.get(0).intValue()); - phd.getBaseCtrls().setRg_high(vTemp.get(1).intValue()); - } - } else if(map.containsKey("#XCtrl")) { - List vTemp = map.get("#XCtrl"); - phd.getBaseCtrls().setXCtrl(vTemp); - } else if(map.containsKey("#YCtrl")) { - List vTemp = map.get("#YCtrl"); - phd.getBaseCtrls().setYCtrl(vTemp); - } else if(map.containsKey("#YSlope")) { - List vTemp = map.get("#YSlope"); - phd.getBaseCtrls().setYSlope(vTemp); - } else if(map.containsKey("#Baseline")) { - List vTemp = map.get("#Baseline"); - List list = vTemp.subList(1, vTemp.size()); - phd.getBaseCtrls().setBaseline(list); - } else if(map.containsKey("#StepCounts")) { - List vTemp = map.get("#StepCounts"); - List list = vTemp.subList(1, vTemp.size()); - phd.getBaseCtrls().setStepCounts(list); - } - } catch (IOException e) { - e.printStackTrace(); - } - } - - public boolean getResultFromDB(String dbName, 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; if (dbName.equals("auto")){ @@ -547,6 +493,7 @@ public class GammaFileUtil { T_nuc_line = "RNAUTO.GARDS_NUCL_LINES_IDED"; T_nuc_act = "RNAUTO.GARDS_NUCL_IDED"; T_qc = "RNAUTO.GARDS_QC_CHECK"; + userName = "RNAUTO"; }else { T_analy = "RNMAN.GARDS_ANALYSES"; T_calib = "RNMAN.GARDS_CALIBRATION_PAIRS"; @@ -569,7 +516,7 @@ public class GammaFileUtil { } // 获取 ananlysis_id、BaseLine、Lc、Scac、峰数量、Category、谱注释等信息 - GardsAnalysesSpectrum analysis = spectrumAnalysisMapper.getAnalysis(T_analy, sampleId); + GardsAnalysesSpectrum analysis = spectrumAnalysisMapper.getAnalysis(T_analy, sampleId, userName); int peakNum = 0; if (Objects.nonNull(analysis)){ phd.setId_analysis(analysis.getIdAnalysis().toString()); @@ -830,7 +777,7 @@ public class GammaFileUtil { return true; } - public List Qcstate(PHDFile phd){ + public List Qcstate(PHDFile phd) { // Collection Time、 Acq Time、 Decay Time、 SampVol、 Be7-FWHM、 Ba140-MDC、 Xe133-MDC List qcState = new LinkedList<>(); for (int i=0;i<7; i++){ @@ -859,7 +806,7 @@ public class GammaFileUtil { return qcState; } - public void RunQC(PHDFile phd){ + public void RunQC(PHDFile phd) { System.loadLibrary("GammaAnaly"); try { Date start = DateUtils.parseDate(phd.getCollect().getCollection_start_date() + StringPool.SPACE + phd.getCollect().getCollection_start_time()); @@ -961,7 +908,7 @@ public class GammaFileUtil { } } - public Double CalculateMDC(PHDFile phd, List vMdcInfo, Double CCF){ + public Double CalculateMDC(PHDFile phd, List vMdcInfo, Double CCF) { try { System.loadLibrary("GammaAnaly"); if(vMdcInfo.size() < 3 || vMdcInfo.get(2) == 0) { @@ -1038,7 +985,7 @@ public class GammaFileUtil { } } - public boolean ReadQCLimit(Map qcItems, Map vMdcInfoMap, Double ener_Be7, String systemType){ + public boolean ReadQCLimit(Map qcItems, Map vMdcInfoMap, Double ener_Be7, String systemType) { try { String filePath = parameterFilePath+ File.separator +"SystemManager.xml"; //创建一个文档解析器工厂 @@ -1225,7 +1172,7 @@ public class GammaFileUtil { } } - public void UpdateChart(PHDFile phd, Map map, Map colorMap){ + public void UpdateChart(PHDFile phd, Map map, Map colorMap) { List m_vCount = new LinkedList<>(); long m_nCount = phd.getSpec().getNum_g_channel(); long m_nSChan = phd.getSpec().getBegin_channel(); @@ -1253,7 +1200,7 @@ public class GammaFileUtil { map.put("shapeChannelData", shapeChannelData); } - public ChartData Energy_Count(PHDFile phd, List m_vCount, long m_nCount, String color){ + public ChartData Energy_Count(PHDFile phd, List m_vCount, long m_nCount, String color) { int start = 0; long end = -1; //Energy @@ -1278,7 +1225,7 @@ public class GammaFileUtil { return data1; } - public ChartData Channel_Count(List m_vCount, long m_nCount, String color){ + public ChartData Channel_Count(List m_vCount, long m_nCount, String color) { int start = 1; long end = -1; ChartData data1 = new ChartData(); @@ -1302,7 +1249,7 @@ public class GammaFileUtil { return data1; } - public List Lc_Scac_base(boolean showLc, PHDFile phd, long m_nCount, Map colorMap){ + public List Lc_Scac_base(boolean showLc, PHDFile phd, long m_nCount, Map colorMap) { List datalist = new LinkedList<>(); int start = 0; long end = -1; @@ -1392,15 +1339,15 @@ public class GammaFileUtil { return datalist; } - public List Channel_Peak(PHDFile phd, long m_nCount, String color){ + public List Channel_Peak(PHDFile phd, long m_nCount, String color) { return PeakSet(phd.getVPeak(), phd.getVBase(), color, m_nCount, null, false); } - public List Energy_Peak(PHDFile phd, long m_nCount, String color){ + public List Energy_Peak(PHDFile phd, long m_nCount, String color) { return PeakSet(phd.getVPeak(), phd.getVBase(), color, m_nCount, phd.getUsedEnerPara().getP(), true); } - public List PeakSet(List vPeak, List vBase, String color, long m_nCount, List p, boolean bEnergy){ + public List PeakSet(List vPeak, List vBase, String color, long m_nCount, List p, boolean bEnergy) { System.loadLibrary("GammaAnaly"); List datalist = new LinkedList<>(); int peakNum = vPeak.size(); @@ -1478,7 +1425,7 @@ public class GammaFileUtil { return datalist; } - public List Energy_BaseCP(PHDFile phd){ + public List Energy_BaseCP(PHDFile phd) { System.loadLibrary("GammaAnaly"); List shapes = new LinkedList<>(); CalValuesOut calValuesOut = CalValuesHandler.calFcnEval(phd.getBaseCtrls().getXCtrl(), phd.getUsedEnerPara().getP()); @@ -1497,7 +1444,7 @@ public class GammaFileUtil { return shapes; } - public List Channel_BaseCP(PHDFile phd){ + public List Channel_BaseCP(PHDFile phd) { List shapes = new LinkedList<>(); int num = phd.getBaseCtrls().getXCtrl().size(); if(num == phd.getBaseCtrls().getYCtrl().size()) { @@ -1514,7 +1461,7 @@ public class GammaFileUtil { return shapes; } - public List AllData(boolean showLc, PHDFile phd, List m_vCount, long m_nCount, Map colorMap){ + public List AllData(boolean showLc, PHDFile phd, List m_vCount, long m_nCount, Map colorMap) { List datalist = new LinkedList<>(); datalist.add(Channel_Count(m_vCount, m_nCount, colorMap.get("Color_Spec"))); datalist.add(Energy_Count(phd, m_vCount, m_nCount, colorMap.get("Color_Spec"))); @@ -1524,7 +1471,7 @@ public class GammaFileUtil { return datalist; } - public boolean AnalyseData(PHDFile phd, ConfigureData configureData, List nuclides, boolean bSingle){ + public boolean AnalyseData(PHDFile phd, ConfigureData configureData, List nuclides, boolean bSingle) { //调用方法判断是否修改了参数 if (Objects.nonNull(configureData)){ SpecSetup phdSetting = phd.getSetting(); @@ -1633,7 +1580,7 @@ public class GammaFileUtil { } } - public void NuclidesIdent(PHDFile phd, Map map){ + public void NuclidesIdent(PHDFile phd, Map map) { // 当重新分析时先清除上一次的分析结果 phd.getMapNucActMda().clear(); for(int i=0; i Differance(PHDFile phd, List vecPeak, List m_vCount, long m_nCount){ + public List Differance(PHDFile phd, List vecPeak, List m_vCount, long m_nCount) { System.loadLibrary("GammaAnaly"); List pointlist = new LinkedList<>(); int start =0; @@ -2031,7 +1978,7 @@ public class GammaFileUtil { return pointlist; } - public void ReadData(List m_vEnergy, List m_vNuclide){ + public void ReadData(List m_vEnergy, List m_vNuclide) { try { String filePath = parameterFilePath+File.separator+"Energy_Nuclide.txt"; File file = new File(filePath); @@ -2439,7 +2386,7 @@ public class GammaFileUtil { } } - public boolean GetInterMiddlData(PHDFile phd, String userName, GStoreMiddleProcessData middleData){ + public boolean GetInterMiddlData(PHDFile phd, String userName, GStoreMiddleProcessData middleData) { boolean bRet = true; Map temp = new HashMap<>(); try { @@ -2451,7 +2398,7 @@ public class GammaFileUtil { return bRet; } - public String GetLogContent(GStoreMiddleProcessData middleData){ + public String GetLogContent(GStoreMiddleProcessData middleData) { StringBuffer strBuffer = new StringBuffer(); strBuffer.append("-------------------------- Sample Analyse Beginning at "+DateUtils.formatDate(new Date(), "yyyy-MM-dd HH:mm:ss")+" ---------------------------\n"); strBuffer.append("\n"); @@ -2622,7 +2569,7 @@ public class GammaFileUtil { return strBuffer.toString(); } - public String GetReportContent(GStoreMiddleProcessData middleData){ + public String GetReportContent(GStoreMiddleProcessData middleData) { StringBuffer strBuffer = new StringBuffer(); strBuffer.append("CNL06 GENERATED REPORT\n"); strBuffer.append(middleData.analyses_type+" RADIONUCLIDE REPORT\n"); @@ -2764,11 +2711,12 @@ public class GammaFileUtil { return strBuffer.toString(); } - public List DoubleLimit(List data){ + public List DoubleLimit(List data) { + List rData = new LinkedList<>(); for(int pos=0;pos DoubleLimit_I(List _data) { @@ -2937,13 +2885,13 @@ public class GammaFileUtil { for(int pos=0;pos dvctIDPEAK = new LinkedList<>(); + List dvctIDPEAK = new LinkedList<>(); List dvctCENTROIDCHANNEL = new LinkedList<>(); List dvctUNCCENTROIDCHANNEL = new LinkedList<>(); List dvctENERGY = new LinkedList<>(); @@ -3194,7 +3142,7 @@ public class GammaFileUtil { List dvctNuclide_name = new LinkedList<>(); List dvctComments = new LinkedList<>(); for(int m=0; m itor:fileAnlyse.getMapNucActMda().entrySet()) { List svctNUCLIDEFULLNAME = new LinkedList<>(); - List dvctIDPEAK = new LinkedList<>(); + List dvctIDPEAK = new LinkedList<>(); List dvctENERGY = new LinkedList<>(); List dvctUNCENERGY = new LinkedList<>(); List dvctABUNDANCE = new LinkedList<>(); @@ -3292,7 +3240,7 @@ public class GammaFileUtil { first = first InitList(double energy, double tolerance, List nuclides){ + public List InitList(double energy, double tolerance, List nuclides) { if(nuclides.size() < 1){ return new LinkedList<>(); } @@ -3694,7 +3642,7 @@ public class GammaFileUtil { return nuclideList; } - public void InitTable(String name, Map map, PHDFile phd, Map colorMap){ + public void InitTable(String name, Map map, PHDFile phd, Map colorMap) { InitNuclideInfo(name, map); long span = phd.getSpec().getG_energy_span(); List nuclideTableList = spectrumAnalysisMapper.getNuclideTable(name, span); @@ -3704,7 +3652,7 @@ public class GammaFileUtil { } } - public void InitNuclideInfo(String name, Map map){ + public void InitNuclideInfo(String name, Map map) { map.put("name", name); GardsNuclLib nuclideInfo = spectrumAnalysisMapper.getNuclideInfo(name); @@ -3736,7 +3684,7 @@ public class GammaFileUtil { } } - public void InitChart(List nuclideTableList, PHDFile phd, Map map, Map colorMap){ + public void InitChart(List nuclideTableList, PHDFile phd, Map map, Map colorMap) { List> chartList = new LinkedList<>(); for (int i=0; i < nuclideTableList.size(); i++){ Map chartMap = new HashMap<>(); @@ -3838,7 +3786,7 @@ public class GammaFileUtil { return channel; } - public void InitPara(PHDFile phd){ + public void InitPara(PHDFile phd) { List Acal_tail_para = new LinkedList<>(); Acal_tail_para.add(99.0); Acal_tail_para.add(0.0); @@ -3913,7 +3861,7 @@ public class GammaFileUtil { return i; } - public List FitPeakBaseLine(PHDFile phd, List vIdx){ + public List FitPeakBaseLine(PHDFile phd, List vIdx) { List tablePeaksList = new LinkedList<>(); int peakNum = vIdx.size(); for (int i=0; i ftpFiles = Arrays.asList(ftpClient.listFiles()); - ftpFiles = ftpFiles.stream().filter(item -> item.getName().equals(compareFileName)).collect(Collectors.toList()); - if (ftpFiles.size() == 0) { - result.error500("ftp获取文件数据失败"); - return m_vecCompare; - } - FTPFile ftpFile = ftpFiles.get(0); - if (Objects.nonNull(ftpFile)) { - inputStream = ftpClient.retrieveFileStream(ftpFile.getName()); + inputStream = ftpClient.retrieveFileStream(compareFileName); + if (Objects.nonNull(inputStream)) { //声明一个临时文件 File file = File.createTempFile("tmp", null); //将ftp文件的输入流复制给临时文件 @@ -4145,7 +4086,7 @@ public class GammaFileUtil { return m_vecCompare; } - public List CompareData(List m_vecCompare, long m_nCount, Map colorMap, List vEnergy){ + public List CompareData(List m_vecCompare, long m_nCount, Map colorMap, List vEnergy) { List datalist = new LinkedList<>(); int size = m_vecCompare.size(); if(size == m_nCount) { diff --git a/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/common/util/PHDFileUtil.java b/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/common/util/PHDFileUtil.java index 83d76c1d..855bfbf3 100644 --- a/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/common/util/PHDFileUtil.java +++ b/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/common/util/PHDFileUtil.java @@ -278,6 +278,8 @@ public class PHDFileUtil { } public List readLine(String filePath){ + String parameterFilePath = filePath.substring(0, filePath.lastIndexOf(StringPool.SLASH)); + String fileName = filePath.substring(filePath.lastIndexOf(StringPool.SLASH) + 1); //连接ftp FTPClient ftpClient = ftpUtil.LoginFTP(); //判断ftp是否连接成功 @@ -286,32 +288,24 @@ public class PHDFileUtil { } InputStream iStream= null; try { + //被动模式 ftpClient.enterLocalPassiveMode(); - String fileName = filePath.substring(filePath.lastIndexOf(StringPool.SLASH) + 1); - String parameterFilePath = filePath.substring(0, filePath.lastIndexOf(StringPool.SLASH)); - //判断文件路径是否为空 - if (StringUtils.isNotBlank(parameterFilePath)){ - //在当前工作路径下读取文件 - ftpClient.changeWorkingDirectory(parameterFilePath); - ftpClient.setFileType(FTPClient.BINARY_FILE_TYPE); - // 设置编码，当文件中存在中文且上传后文件乱码时可使用此配置项 - ftpClient.setControlEncoding(ftpUtil.getEncoding()); - ftpClient.setFileTransferMode(FTPClient.STREAM_TRANSFER_MODE); - List ftpFiles = Arrays.asList(ftpClient.listFiles()); - if (CollectionUtils.isNotEmpty(ftpFiles)){ - for (FTPFile ftpFile:ftpFiles) { - if (ftpFile.getName().equals(fileName)){ - //读取ftp文件的输入流 - iStream=ftpClient.retrieveFileStream(ftpFile.getName()); - //声明一个临时文件 - File file = File.createTempFile("tmp", null); - //将ftp文件的输入流复制给临时文件 - FileUtils.copyInputStreamToFile(iStream, file); - List allLines = FileUtils.readLines(file, ftpUtil.getEncoding()); - return allLines; - } - } - } + //设置文件类型--二进制文件 + ftpClient.setFileType(FTP.BINARY_FILE_TYPE); + // + ftpClient.setControlEncoding("UTF-8"); + ftpClient.setFileTransferMode(FTPClient.STREAM_TRANSFER_MODE); + //在当前工作路径下读取文件 + ftpClient.changeWorkingDirectory(parameterFilePath); + //读取ftp文件的输入流 + iStream=ftpClient.retrieveFileStream(fileName); + if (Objects.nonNull(iStream)) { + //声明一个临时文件 + File file = File.createTempFile("tmp", null); + //将ftp文件的输入流复制给临时文件 + FileUtils.copyInputStreamToFile(iStream, file); + List allLines = FileUtils.readLines(file, ftpUtil.getEncoding()); + return allLines; } } catch (IOException e) { throw new RuntimeException(e); @@ -488,38 +482,31 @@ public class PHDFileUtil { ftpClient.setFileTransferMode(FTPClient.STREAM_TRANSFER_MODE); //切换工作路径 ftpClient.changeWorkingDirectory(filePath); - //获取路径下所有的ftp文件信息 - List ftpFiles = Arrays.asList(ftpClient.listFiles()); - if (CollectionUtils.isNotEmpty(ftpFiles)) { - //获取sampleFileName - ftpFiles = ftpFiles.stream().filter(item -> item.getName().equals(sampleFileName)).collect(Collectors.toList()); - if (CollectionUtils.isNotEmpty(ftpFiles)) { - FTPFile sampleFile = ftpFiles.get(0); - //解析sampleFile - inputStream = ftpClient.retrieveFileStream(sampleFile.getName()); - //声明一个临时文件 - File file = File.createTempFile("tmp", null); - //将ftp文件的输入流复制给临时文件 - FileUtils.copyInputStreamToFile(inputStream, file); - //加载sampleFile内容 - EnergySpectrumStruct struct = EnergySpectrumHandler.getSourceData(file.getAbsolutePath()); - //获取所需要的数据 - String dataType = struct.data_type; - String systemType = struct.system_type; - String spectrumQuantity = struct.spectrum_quantity; - double acquisitionLiveTime = struct.acquisition_live_time; - String measurementId = struct.measurement_id; - String gasBkMeasurementId = struct.gas_bk_measurement_id; - String detectorBkMeasurementId = struct.detector_bk_measurement_id; - //格式化文件名称 - String fileSuffix = nameStandUtil.GetSuffix(dataType, systemType, spectrumQuantity, String.valueOf(acquisitionLiveTime)); - String measurementName = nameStandUtil.GetFileNameFromDateTime(measurementId, fileSuffix); - String gasFileName = nameStandUtil.GetFileNameFromDateTime(gasBkMeasurementId, "_G.PHD"); - String detaFileName = nameStandUtil.GetFileNameFromDateTime(detectorBkMeasurementId, "_D.PHD"); - map.put("gasFileName", gasFileName); - map.put("detaFileName", detaFileName); - map.put("sampleSystemType", systemType); - } + //解析sampleFile + inputStream = ftpClient.retrieveFileStream(sampleFileName); + if (Objects.nonNull(inputStream)) { + //声明一个临时文件 + File file = File.createTempFile("tmp", null); + //将ftp文件的输入流复制给临时文件 + FileUtils.copyInputStreamToFile(inputStream, file); + //加载sampleFile内容 + EnergySpectrumStruct struct = EnergySpectrumHandler.getSourceData(file.getAbsolutePath()); + //获取所需要的数据 + String dataType = struct.data_type; + String systemType = struct.system_type; + String spectrumQuantity = struct.spectrum_quantity; + double acquisitionLiveTime = struct.acquisition_live_time; + String measurementId = struct.measurement_id; + String gasBkMeasurementId = struct.gas_bk_measurement_id; + String detectorBkMeasurementId = struct.detector_bk_measurement_id; + //格式化文件名称 + String fileSuffix = nameStandUtil.GetSuffix(dataType, systemType, spectrumQuantity, String.valueOf(acquisitionLiveTime)); + String measurementName = nameStandUtil.GetFileNameFromDateTime(measurementId, fileSuffix); + String gasFileName = nameStandUtil.GetFileNameFromDateTime(gasBkMeasurementId, "_G.PHD"); + String detaFileName = nameStandUtil.GetFileNameFromDateTime(detectorBkMeasurementId, "_D.PHD"); + map.put("gasFileName", gasFileName); + map.put("detaFileName", detaFileName); + map.put("sampleSystemType", systemType); } } catch (IOException e) { throw new RuntimeException(e); @@ -554,18 +541,11 @@ public class PHDFileUtil { ftpClient.setFileTransferMode(FTPClient.STREAM_TRANSFER_MODE); //切换文件路径 ftpClient.changeWorkingDirectory(filePath); - //获取路径下所有文件信息 - List ftpFiles = Arrays.asList(ftpClient.listFiles()); - if (CollectionUtils.isNotEmpty(ftpFiles)){ - //根据文件名称 分别获取 sample gas det文件 - List files = ftpFiles.stream().filter(item -> item.getName().equals(fileName)).collect(Collectors.toList()); - if (CollectionUtils.isNotEmpty(files)){ - FTPFile ftpFile = files.get(0); - inputStream = ftpClient.retrieveFileStream(ftpFile.getName()); - file = File.createTempFile("tmp", null); - //将ftp文件的输入流复制给临时文件 - FileUtils.copyInputStreamToFile(inputStream, file); - } + inputStream = ftpClient.retrieveFileStream(fileName); + if (Objects.nonNull(inputStream)){ + file = File.createTempFile("tmp", null); + //将ftp文件的输入流复制给临时文件 + FileUtils.copyInputStreamToFile(inputStream, file); } } catch (IOException e) { throw new RuntimeException(e); @@ -631,18 +611,11 @@ public class PHDFileUtil { ftpClient.setFileTransferMode(FTPClient.STREAM_TRANSFER_MODE); //切换文件路径 ftpClient.changeWorkingDirectory(filePath); - //获取路径下所有文件信息 - List ftpFiles = Arrays.asList(ftpClient.listFiles()); - if (CollectionUtils.isNotEmpty(ftpFiles)){ - //根据文件名称 分别获取 sample gas det文件 - List files = ftpFiles.stream().filter(item -> item.getName().equals(fileName)).collect(Collectors.toList()); - if (CollectionUtils.isNotEmpty(files)){ - FTPFile ftpFile = files.get(0); - inputStream = ftpClient.retrieveFileStream(ftpFile.getName()); - file = File.createTempFile("tmp", null); - //将ftp文件的输入流复制给临时文件 - FileUtils.copyInputStreamToFile(inputStream, file); - } + inputStream = ftpClient.retrieveFileStream(fileName); + if (Objects.nonNull(inputStream)){ + file = File.createTempFile("tmp", null); + //将ftp文件的输入流复制给临时文件 + FileUtils.copyInputStreamToFile(inputStream, file); } } catch (IOException e) { throw new RuntimeException(e); @@ -763,18 +736,11 @@ public class PHDFileUtil { ftpClient.setFileTransferMode(FTPClient.STREAM_TRANSFER_MODE); //切换文件路径 ftpClient.changeWorkingDirectory(path); - //获取路径下所有文件信息 - List ftpFiles = Arrays.asList(ftpClient.listFiles()); - if (CollectionUtils.isNotEmpty(ftpFiles)){ - //根据文件名称 分别获取 sample gas det文件 - List files = ftpFiles.stream().filter(item -> item.getName().equals(fileName)).collect(Collectors.toList()); - if (CollectionUtils.isNotEmpty(files)){ - FTPFile ftpFile = files.get(0); - inputStream = ftpClient.retrieveFileStream(ftpFile.getName()); - file = File.createTempFile("tmp", null); - //将ftp文件的输入流复制给临时文件 - FileUtils.copyInputStreamToFile(inputStream, file); - } + inputStream = ftpClient.retrieveFileStream(fileName); + if (Objects.nonNull(inputStream)){ + file = File.createTempFile("tmp", null); + //将ftp文件的输入流复制给临时文件 + FileUtils.copyInputStreamToFile(inputStream, file); } } catch (IOException e) { throw new RuntimeException(e); @@ -837,18 +803,13 @@ public class PHDFileUtil { ftpClient.setControlEncoding("UTF-8"); ftpClient.setFileTransferMode(FTPClient.STREAM_TRANSFER_MODE); ftpClient.changeWorkingDirectory(filePath); - List ftpFiles = Arrays.asList(ftpClient.listFiles()); - ftpFiles = ftpFiles.stream().filter(item -> item.getName().equals(fileName)).collect(Collectors.toList()); - if (CollectionUtils.isNotEmpty(ftpFiles)){ - FTPFile ftpFile = ftpFiles.get(0); - if (Objects.nonNull(ftpFile)){ - inputStream = ftpClient.retrieveFileStream(ftpFile.getName()); - //声明一个临时文件 - File file = File.createTempFile("tmp", null); - //将ftp文件的输入流复制给临时文件 - FileUtils.copyInputStreamToFile(inputStream, file); - struct = EnergySpectrumHandler.getSourceData(file.getAbsolutePath()); - } + inputStream = ftpClient.retrieveFileStream(fileName); + if (Objects.nonNull(inputStream)){ + //声明一个临时文件 + File file = File.createTempFile("tmp", null); + //将ftp文件的输入流复制给临时文件 + FileUtils.copyInputStreamToFile(inputStream, file); + struct = EnergySpectrumHandler.getSourceData(file.getAbsolutePath()); } } catch (IOException e) { throw new RuntimeException(e); 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 3e597dba..62039957 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,8 +24,8 @@ public class GammaController { @GetMapping("initValue") @ApiOperation(value = "初始化gamma数据", notes = "初始化gamma数据") - public Result initValue(Integer sampleId, String dbName) { - return gammaService.initValue(sampleId, dbName); + public Result initValue(Integer sampleId, String dbName, HttpServletRequest request) { + return gammaService.initValue(sampleId, dbName, request); } @GetMapping("gammaByDB") diff --git a/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/controller/SSEController.java b/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/controller/SSEController.java deleted file mode 100644 index 01cbb043..00000000 --- a/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/controller/SSEController.java +++ /dev/null @@ -1,46 +0,0 @@ -package org.jeecg.modules.controller; - -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; -import org.springframework.web.servlet.mvc.method.annotation.SseEmitter; - -import java.io.IOException; -import java.util.Map; -import java.util.concurrent.ConcurrentHashMap; - -@RestController -@RequestMapping("sse") -public class SSEController { - private static Map sseCache = new ConcurrentHashMap<>(); - - @GetMapping("subscribe") - public SseEmitter subscribe(String id) { - // 超时时间设置为1小时 - SseEmitter sseEmitter = new SseEmitter(3600_000L); - sseCache.put(id, sseEmitter); - sseEmitter.onTimeout(() -> sseCache.remove(id)); - sseEmitter.onCompletion(() -> System.out.println("完成！！！")); - return sseEmitter; - } - - @GetMapping("push") - public String push(String id, String content) throws IOException { - SseEmitter sseEmitter = sseCache.get(id); - if (sseEmitter != null) { - sseEmitter.send(content); - } - return "over"; - } - - @GetMapping("over") - public String over(String id) { - SseEmitter sseEmitter = sseCache.get(id); - if (sseEmitter != null) { - sseEmitter.complete(); - sseCache.remove(id); - } - return "over"; - } - -} 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 f7e000db..33c7305b 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 @@ -46,11 +46,6 @@ public class SpectrumAnalysesController { return spectrumAnalysisService.getDBSpectrumList(queryRequest, gardsSampleData, dbName, menuTypes, AllUsers, CollectStopB, AcqStartB, startDate, endDate, request); } - @GetMapping("getSpectrumFiles") - public Result getSpectrumFiles(HttpServletRequest request) { - return spectrumAnalysisService.getSpectrumFiles(request); - } - @GetMapping("getFilesBySampleFile") @ApiOperation(value = "根据sampleFile查询出关联的文件信息", notes = "根据sampleFile查询出关联的文件信息") public Result getFilesBySampleFile(String fileName, HttpServletRequest request) { @@ -59,8 +54,8 @@ public class SpectrumAnalysesController { @GetMapping("getDBSpectrumChart") @ApiOperation(value = "查询折线图相关信息接口", notes = "查询折线图相关信息接口") - public Result getDBSpectrumChart(String dbName, Integer sampleId) { - return spectrumAnalysisService.getDBSpectrumChart(dbName, sampleId); + public Result getDBSpectrumChart(String dbName, Integer sampleId, HttpServletRequest request) { + return spectrumAnalysisService.getDBSpectrumChart(dbName, sampleId, request); } @GetMapping("getFileSpectrumChart") diff --git a/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/entity/vo/BgDataAnlyseResultIn.java b/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/entity/vo/BgDataAnlyseResultIn.java index c6dc88c1..df0bfa60 100644 --- a/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/entity/vo/BgDataAnlyseResultIn.java +++ b/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/entity/vo/BgDataAnlyseResultIn.java @@ -231,8 +231,32 @@ public class BgDataAnlyseResultIn implements Serializable { List gammaCalibrationSpectrumList; + GardsCalibrationSpectrum gammaCalibrationSCE; + + GardsCalibrationSpectrum gammaCalibrationSEC; + + GardsCalibrationSpectrum gammaCalibrationGCE; + + GardsCalibrationSpectrum gammaCalibrationGEC; + + GardsCalibrationSpectrum gammaCalibrationDCE; + + GardsCalibrationSpectrum gammaCalibrationDEC; + List betaCalibrationSpectrumList; + GardsCalibrationSpectrum betaCalibrationSCE; + + GardsCalibrationSpectrum betaCalibrationSEC; + + GardsCalibrationSpectrum betaCalibrationGCE; + + GardsCalibrationSpectrum betaCalibrationGEC; + + GardsCalibrationSpectrum betaCalibrationDCE; + + GardsCalibrationSpectrum betaCalibrationDEC; + List roiChannelsSpectrumList; List roiResultsSpectrumList; diff --git a/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/mapper/GardsAnalysesManMapper.java b/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/mapper/GardsAnalysesManMapper.java index d8d6de03..d85ce577 100644 --- a/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/mapper/GardsAnalysesManMapper.java +++ b/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/mapper/GardsAnalysesManMapper.java @@ -1,11 +1,12 @@ package org.jeecg.modules.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import org.apache.ibatis.annotations.Param; import org.jeecg.modules.base.entity.rnman.GardsAnalyses; import org.jeecg.modules.entity.GardsAnalysesSpectrum; public interface GardsAnalysesManMapper extends BaseMapper { - void updateEntity(GardsAnalysesSpectrum analyses); + void updateEntity(@Param(value = "analyses") GardsAnalysesSpectrum analyses); } diff --git a/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/mapper/GardsCalibrationSpectrumMapper.java b/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/mapper/GardsCalibrationSpectrumMapper.java index 3fbdc68b..3f24e6f8 100644 --- a/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/mapper/GardsCalibrationSpectrumMapper.java +++ b/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/mapper/GardsCalibrationSpectrumMapper.java @@ -1,7 +1,13 @@ package org.jeecg.modules.mapper; +import com.baomidou.mybatisplus.annotation.InterceptorIgnore; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import org.apache.ibatis.annotations.Param; import org.jeecg.modules.base.entity.rnman.GardsCalibration; public interface GardsCalibrationSpectrumMapper extends BaseMapper { + + @InterceptorIgnore(tenantLine = "true") + void insertCalibrationGamma(@Param(value = "calibration") GardsCalibration calibration); + } diff --git a/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/mapper/SpectrumAnalysisMapper.java b/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/mapper/SpectrumAnalysisMapper.java index 911e709d..bf5a9ef8 100644 --- a/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/mapper/SpectrumAnalysisMapper.java +++ b/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/mapper/SpectrumAnalysisMapper.java @@ -22,7 +22,7 @@ public interface SpectrumAnalysisMapper { Page getDBSpectrumList(IPage page, GardsSampleDataSpectrum gardsSampleData, String dbName, List stationTypes, boolean CollectStopB, boolean AcqStartB, String startTime, String endTime, List userStations, boolean AllUsers); - SpectrumFileRecord getDBSpectrumFilePath(String dbName, Integer sampleId); + SpectrumFileRecord getDBSpectrumFilePath(String dbName, Integer sampleId, Integer analysisID); List getXeDataList(Integer sampleId); @@ -56,7 +56,7 @@ public interface SpectrumAnalysisMapper { String getStatus(@Param(value = "sampleId") Integer sampleId); - GardsAnalysesSpectrum getAnalysis(@Param(value = "dbName") String dbName, @Param(value = "sampleId") Integer sampleId); + GardsAnalysesSpectrum getAnalysis(@Param(value = "dbName") String dbName, @Param(value = "sampleId") Integer sampleId, @Param(value = "userName") String userName); List getPeaks(@Param(value = "dbName") String dbName, @Param(value = "idAnalysis") Integer idAnalysis); @@ -78,7 +78,7 @@ public interface SpectrumAnalysisMapper { List UserNuclide(@Param(value = "systemType") String systemType, @Param(value = "userName") String userName); - Integer getAnalysisID(@Param(value = "dbName") String dbName, @Param(value = "sampleId") Integer sampleId); + Integer getAnalysisID(@Param(value = "dbName") String dbName, @Param(value = "sampleId") Integer sampleId, @Param(value = "userName") String userName); List ReadGammaFitChannelEnergy(@Param(value = "idAnalysis") Integer idAnalysis, @Param(value = "sampleId") Integer sampleId); diff --git a/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/mapper/xml/GardsAnalysesManMapper.xml b/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/mapper/xml/GardsAnalysesManMapper.xml index 836abe6a..823aff17 100644 --- a/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/mapper/xml/GardsAnalysesManMapper.xml +++ b/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/mapper/xml/GardsAnalysesManMapper.xml @@ -5,8 +5,8 @@ UPDATE RNMAN.GARDS_ANALYSES - SET ANALYSISBEGIN = to_date(#{analyses.analysisBeginStr},'yyyy/MM/dd HH:mm:ss'), - ANALYSISEND = to_date(#{analyses.analysisEndStr},'yyyy/MM/dd HH:mm:ss'), + SET ANALYSISBEGIN = to_date(#{analyses.analysisBeginStr},'yyyy/MM/dd HH:mi:ss'), + ANALYSISEND = to_date(#{analyses.analysisEndStr},'yyyy/MM/dd HH:mi:ss'), SOFTWARE = #{analyses.software}, SWVERSION = #{analyses.swVersion}, COMMENTS = #{analyses.comments}, diff --git a/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/mapper/xml/GardsCalibrationSpectrumMapper.xml b/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/mapper/xml/GardsCalibrationSpectrumMapper.xml new file mode 100644 index 00000000..5f18eb40 --- /dev/null +++ b/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/mapper/xml/GardsCalibrationSpectrumMapper.xml @@ -0,0 +1,29 @@ + + + + + + INSERT INTO + RNMAN.GARDS_CALIBRATION( + SAMPLE_ID, + IDANALYSIS, + SAMPLE_TYPE, + CALTYPE, + FUNCTION, + FUNCTIONDEF, + STARTOFRANGE, + ENDOFRANGE, + COEFF_STRING) + VALUES(#{calibration.sampleId}, + #{calibration.idAnalysis}, + #{calibration.sampleType}, + #{calibration.calType}, + #{calibration.function}, + #{calibration.functionDef}, + #{calibration.startOfRange}, + #{calibration.endOfRange}, + #{calibration.coeffString}) + + + + \ No newline at end of file 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 5d2c4d47..35155864 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 @@ -123,6 +123,7 @@ ${dbName}.GARDS_ANALYSES analyses analyses.SAMPLE_ID = #{sampleId} + AND analyses.IDANALYSIS = #{analysisID} AND org_sample.SAMPLE_ID=analyses.SAMPLE_ID @@ -379,6 +380,7 @@ FROM ${dbName} WHERE SAMPLE_ID = #{sampleId} + and ANALYST = #{userName}