diff --git a/jeecg-module-auto-process/src/main/java/org/jeecg/modules/ftp/FTPUtils.java b/jeecg-module-auto-process/src/main/java/org/jeecg/modules/ftp/FTPUtils.java index 8a14d548..f1aec232 100644 --- a/jeecg-module-auto-process/src/main/java/org/jeecg/modules/ftp/FTPUtils.java +++ b/jeecg-module-auto-process/src/main/java/org/jeecg/modules/ftp/FTPUtils.java @@ -38,7 +38,8 @@ public class FTPUtils { this.client.setFileType(FTPClient.BINARY_FILE_TYPE); this.client.setControlEncoding(this.encoding); this.client.setFileTransferMode(FTPClient.STREAM_TRANSFER_MODE); - +// this.client.setDataTimeout(60000); +// this.client.setConnectTimeout(); //判断是否连接成功 int reply = client.getReplyCode(); if (!FTPReply.isPositiveCompletion(reply)) { diff --git a/jeecg-module-auto-process/src/main/java/org/jeecg/modules/native_jni/CalValuesHandler.java b/jeecg-module-auto-process/src/main/java/org/jeecg/modules/native_jni/CalValuesHandler.java deleted file mode 100644 index c74161b8..00000000 --- a/jeecg-module-auto-process/src/main/java/org/jeecg/modules/native_jni/CalValuesHandler.java +++ /dev/null @@ -1,30 +0,0 @@ -package org.jeecg.modules.native_jni; - -import org.jeecg.modules.eneity.vo.StructInsertInput; -import org.jeecg.modules.eneity.vo.StructInsertOutput; -import org.jeecg.modules.entity.vo.PeakInfo; -import org.jeecg.modules.native_jni.struct.CalValuesOut; - -import java.util.List; - -public class CalValuesHandler { - - public static native CalValuesOut calFcnEval(List x, List para); - - public static native CalValuesOut energyToChannel(List energy, List para); - - public static native CalValuesOut calDerivEval(List channel, List para); - - public static native double calDerivaOut(double Chan, List p); - - public static native List interp1(PeakInfo peak, List t_base, List regChan); - - public static native StructInsertOutput insertPeaks(StructInsertInput structInsertInput); - - public static native List calFitPara(String type, int funcId, List x, List y, List err); - - public static native StructInsertOutput ComputePeakRange(int peakSize, int m_nCount, List vCentroid, List vFwhmCh, List vTail, List vUpperTail); - - public static native String analyseSpectrum(String phd, String mapLines, String phdFilePath); - -} diff --git a/jeecg-module-auto-process/src/main/java/org/jeecg/modules/native_jni/EnergySpectrumHandler.java b/jeecg-module-auto-process/src/main/java/org/jeecg/modules/native_jni/EnergySpectrumHandler.java deleted file mode 100644 index 898469b3..00000000 --- a/jeecg-module-auto-process/src/main/java/org/jeecg/modules/native_jni/EnergySpectrumHandler.java +++ /dev/null @@ -1,48 +0,0 @@ -package org.jeecg.modules.native_jni; - -import org.jeecg.modules.native_jni.struct.*; - -import java.util.List; - -/** - * 能谱处理本地类 - */ -public class EnergySpectrumHandler { - - /** - * 获取能谱原始数据 - * @param path 能谱文件路径 - * @return 能谱原始数据 - */ - public static native EnergySpectrumStruct getSourceData(String path); - - /** - * 获取健康状态谱原始数据 - * @param path 能谱文件路径 - * @return 能谱原始数据 - */ - public static native SOHSpectrumStruct getSOHSourceData(String path); - - /** - * 获取警告谱原始数据 - * @param path 能谱文件路径 - * @return 能谱原始数据 - */ - public static native AlertSpectrumStruct getAlertSourceData(String path); - - /** - * 获取气象谱原始数据 - * @param path 能谱文件路径 - * @return 能谱原始数据 - */ - public static native MetSpectrumStruct getMetSourceData(String path); - - /** - * BetaGamma 分析算法 - * @param sampleFile 样品谱文件 - * @param gasFile 气体谱文件 - * @param detFile 探测器本地谱文件 - * @return - */ - public static native BgAnalyseResult bgAnalyse(String sampleFile, String gasFile, String detFile); -} diff --git a/jeecg-module-auto-process/src/main/java/org/jeecg/modules/native_jni/TestDll.java b/jeecg-module-auto-process/src/main/java/org/jeecg/modules/native_jni/TestDll.java deleted file mode 100644 index e019d29c..00000000 --- a/jeecg-module-auto-process/src/main/java/org/jeecg/modules/native_jni/TestDll.java +++ /dev/null @@ -1,18 +0,0 @@ -package org.jeecg.modules.native_jni; - -import com.alibaba.fastjson.JSON; -import org.jeecg.modules.native_jni.struct.EnergySpectrumStruct; - -public class TestDll { - - public static void main(String[] args) throws InterruptedException { - String dllPath = "D:\\Work\\核素\\C++\\c++lib\\ReadPHDFile.dll"; - String sourcePath = "D:\\Work\\核素\\C++\\谱文件样例\\Gamma\\CNP21_001-20170116_0245_S.PHD"; - while (true){ - System.load(dllPath); - final EnergySpectrumStruct sourceData = EnergySpectrumHandler.getSourceData(sourcePath); - System.out.println(sourceData); - Thread.sleep(10000L); - } - } -} diff --git a/jeecg-module-auto-process/src/main/java/org/jeecg/modules/native_jni/struct/BgAnalyseResult.java b/jeecg-module-auto-process/src/main/java/org/jeecg/modules/native_jni/struct/BgAnalyseResult.java deleted file mode 100644 index 8f56f139..00000000 --- a/jeecg-module-auto-process/src/main/java/org/jeecg/modules/native_jni/struct/BgAnalyseResult.java +++ /dev/null @@ -1,191 +0,0 @@ -package org.jeecg.modules.native_jni.struct; - -import java.util.List; - -public class BgAnalyseResult { - /************************** GARDS_XE_RESULTS START**************************/ - /************************** XE_131m **************************/ - public double Xe131m_con; - public double Xe131m_uncer; - public double MDC_Xe131m; - public double LC_Xe131m; - public int XE_131m_NID_FLAG; - - /************************** XE_133 **************************/ - public double Xe133_con; - public double Xe133_uncer; - public double MDC_Xe133; - public double LC_Xe133; - public int XE_133_NID_FLAG; - /************************** XE_133m **************************/ - public double Xe133m_con; - public double Xe133m_uncer; - public double MDC_Xe133m; - public double LC_Xe133m; - public int XE_133m_NID_FLAG; - - /************************** XE_135 **************************/ - public double Xe135_con; - public double Xe135_uncer; - public double MDC_Xe135; - public double LC_Xe135; - public int XE_135_NID_FLAG; - /************************** GARDS_XE_RESULTS end **************************/ - - /************************** GARDS_ROI_RESULTS START**************************/ - public List ROI; - public List LC; - public List s_roi_cts; - public List g_roi_cts; - public List d_roi_cts; - public List s_deduct_d_cts; - public List g_deduct_d_cts; - public List ROI_net_coutns; - public List ROI_net_coutns_err; - public List ROI_con_uncer; - public List ROI_con_uncer_err; - public List MDC; - public List dNidFlag; - public List LC_CTS; - - /************************** GARDS_ROI_RESULTS end **************************/ - - /************************** GARDS_CALIBRATION START**************************/ - public List s_b_fitting_e_c; - public int s_b_fitting_type; - public String s_b_fitting_type_def; - public List s_g_fitting_e_c; - public int s_g_fitting_type; - public String s_g_fitting_type_def; - public List s_b_fitting_c_e; - public List s_g_fitting_c_e; - - public List g_b_fitting_e_c; - public int g_b_fitting_type; - public String g_b_fitting_type_def; - public List g_g_fitting_e_c; - public int g_g_fitting_type; - public String g_g_fitting_type_def; - public List g_b_fitting_c_e; - public List g_g_fitting_c_e; - - public List d_b_fitting_e_c; - public int d_b_fitting_type; - public String d_b_fitting_type_def; - public List d_g_fitting_e_c; - public int d_g_fitting_type; - public String d_g_fitting_type_def; - public List d_b_fitting_c_e; - public List d_g_fitting_c_e; - - /************************** GARDS_CALIBRATION end **************************/ - - /************************** GARDS_ROI_CHANNELS START**************************/ - public List S_ROI; - public List S_ROI_B_Boundary_start; - public List S_ROI_B_Boundary_stop; - public List S_ROI_G_Boundary_start; - public List S_ROI_G_Boundary_stop; - public List G_ROI; - public List G_ROI_B_Boundary_start; - public List G_ROI_B_Boundary_stop; - public List G_ROI_G_Boundary_start; - public List G_ROI_G_Boundary_stop; - public List D_ROI; - public List D_ROI_B_Boundary_start; - public List D_ROI_B_Boundary_stop; - public List D_ROI_G_Boundary_start; - public List D_ROI_G_Boundary_stop; - /************************** GARDS_ROI_CHANNELS end **************************/ - - /** - * 分析结果标记，true成功，false失败 - */ - public boolean analyse_flag; - /** - * 失败原因 - */ - public String error_log; - - - @Override - public String toString() { - return "BgAnalyseResult{" + - "Xe131m_con=" + Xe131m_con + - ", Xe131m_uncer=" + Xe131m_uncer + - ", MDC_Xe131m=" + MDC_Xe131m + - ", LC_Xe131m=" + LC_Xe131m + - ", XE_131m_NID_FLAG=" + XE_131m_NID_FLAG + - ", Xe133_con=" + Xe133_con + - ", Xe133_uncer=" + Xe133_uncer + - ", MDC_Xe133=" + MDC_Xe133 + - ", LC_Xe133=" + LC_Xe133 + - ", XE_133_NID_FLAG=" + XE_133_NID_FLAG + - ", Xe133m_con=" + Xe133m_con + - ", Xe133m_uncer=" + Xe133m_uncer + - ", MDC_Xe133m=" + MDC_Xe133m + - ", LC_Xe133m=" + LC_Xe133m + - ", XE_133m_NID_FLAG=" + XE_133m_NID_FLAG + - ", Xe135_con=" + Xe135_con + - ", Xe135_uncer=" + Xe135_uncer + - ", MDC_Xe135=" + MDC_Xe135 + - ", LC_Xe135=" + LC_Xe135 + - ", XE_135_NID_FLAG=" + XE_135_NID_FLAG + - ", ROI=" + ROI + - ", LC=" + LC + - ", s_roi_cts=" + s_roi_cts + - ", g_roi_cts=" + g_roi_cts + - ", d_roi_cts=" + d_roi_cts + - ", s_deduct_d_cts=" + s_deduct_d_cts + - ", g_deduct_d_cts=" + g_deduct_d_cts + - ", ROI_net_coutns=" + ROI_net_coutns + - ", ROI_net_coutns_err=" + ROI_net_coutns_err + - ", ROI_con_uncer=" + ROI_con_uncer + - ", ROI_con_uncer_err=" + ROI_con_uncer_err + - ", MDC=" + MDC + - ", dNidFlag=" + dNidFlag + - ", LC_CTS=" + LC_CTS + - ", s_b_fitting_e_c=" + s_b_fitting_e_c + - ", s_b_fitting_type=" + s_b_fitting_type + - ", s_b_fitting_type_def='" + s_b_fitting_type_def + '\'' + - ", s_g_fitting_e_c=" + s_g_fitting_e_c + - ", s_g_fitting_type=" + s_g_fitting_type + - ", s_g_fitting_type_def='" + s_g_fitting_type_def + '\'' + - ", s_b_fitting_c_e=" + s_b_fitting_c_e + - ", s_g_fitting_c_e=" + s_g_fitting_c_e + - ", g_b_fitting_e_c=" + g_b_fitting_e_c + - ", g_b_fitting_type=" + g_b_fitting_type + - ", g_b_fitting_type_def='" + g_b_fitting_type_def + '\'' + - ", g_g_fitting_e_c=" + g_g_fitting_e_c + - ", g_g_fitting_type=" + g_g_fitting_type + - ", g_g_fitting_type_def='" + g_g_fitting_type_def + '\'' + - ", g_b_fitting_c_e=" + g_b_fitting_c_e + - ", g_g_fitting_c_e=" + g_g_fitting_c_e + - ", d_b_fitting_e_c=" + d_b_fitting_e_c + - ", d_b_fitting_type=" + d_b_fitting_type + - ", d_b_fitting_type_def='" + d_b_fitting_type_def + '\'' + - ", d_g_fitting_e_c=" + d_g_fitting_e_c + - ", d_g_fitting_type=" + d_g_fitting_type + - ", d_g_fitting_type_def='" + d_g_fitting_type_def + '\'' + - ", d_b_fitting_c_e=" + d_b_fitting_c_e + - ", d_g_fitting_c_e=" + d_g_fitting_c_e + - ", S_ROI=" + S_ROI + - ", S_ROI_B_Boundary_start=" + S_ROI_B_Boundary_start + - ", S_ROI_B_Boundary_stop=" + S_ROI_B_Boundary_stop + - ", S_ROI_G_Boundary_start=" + S_ROI_G_Boundary_start + - ", S_ROI_G_Boundary_stop=" + S_ROI_G_Boundary_stop + - ", G_ROI=" + G_ROI + - ", G_ROI_B_Boundary_start=" + G_ROI_B_Boundary_start + - ", G_ROI_B_Boundary_stop=" + G_ROI_B_Boundary_stop + - ", G_ROI_G_Boundary_start=" + G_ROI_G_Boundary_start + - ", G_ROI_G_Boundary_stop=" + G_ROI_G_Boundary_stop + - ", D_ROI=" + D_ROI + - ", D_ROI_B_Boundary_start=" + D_ROI_B_Boundary_start + - ", D_ROI_B_Boundary_stop=" + D_ROI_B_Boundary_stop + - ", D_ROI_G_Boundary_start=" + D_ROI_G_Boundary_start + - ", D_ROI_G_Boundary_stop=" + D_ROI_G_Boundary_stop + - ", analyse_flag=" + analyse_flag + - ", error_log='" + error_log + '\'' + - '}'; - } -} diff --git a/jeecg-module-auto-process/src/main/java/org/jeecg/modules/native_jni/struct/CalValuesOut.java b/jeecg-module-auto-process/src/main/java/org/jeecg/modules/native_jni/struct/CalValuesOut.java deleted file mode 100644 index 1846200f..00000000 --- a/jeecg-module-auto-process/src/main/java/org/jeecg/modules/native_jni/struct/CalValuesOut.java +++ /dev/null @@ -1,13 +0,0 @@ -package org.jeecg.modules.native_jni.struct; - -import java.util.List; - -public class CalValuesOut { - - public int rowNum; - - public int colNum; - - public List counts; - -} diff --git a/jeecg-module-auto-process/src/main/java/org/jeecg/modules/native_jni/struct/EnergySpectrumStruct.java b/jeecg-module-auto-process/src/main/java/org/jeecg/modules/native_jni/struct/EnergySpectrumStruct.java deleted file mode 100644 index c58a5f44..00000000 --- a/jeecg-module-auto-process/src/main/java/org/jeecg/modules/native_jni/struct/EnergySpectrumStruct.java +++ /dev/null @@ -1,557 +0,0 @@ -package org.jeecg.modules.native_jni.struct; - -import lombok.Data; - -import java.util.List; -import java.util.Objects; - -/** - * 能谱结构体字段信息 - */ -@Data -public class EnergySpectrumStruct { - - /************************* Infomations ******************/ - /** - * 消息类型 - */ - public String msg_type; - /** - * 消息id - */ - public String msg_id; - /** - * 数据类型 - */ - public String data_type; - - /************************* Header Black ******************/ - /** - * designator - */ - public String designator; - /** - * site code - */ - public String site_code; - /** - * detector code - */ - public String detector_code; - /** - * system type: P for particulate; B for gas with 3-D β - γ coincidence detection; and - */ - public String system_type; - /** - * sample geometry - */ - public String sample_geometry; - /** - * spectrum qualifier: preliminary ( PREL )or full ( FULL) - */ - public String spectrum_quantity; - /** - * sample reference identification - */ - public String sample_ref_id; - /** - * measurement identification - */ - public String measurement_id; - /** - * detector background measurement identification - */ - public String detector_bk_measurement_id; - /** - * gas background measurement identification (memory effect) - */ - public String gas_bk_measurement_id; - /** - * transmit date (yyyy / mm / dd) - */ - public String transmit_date; - /** - * transmit time (hh : mm : ss . s) - */ - public String transmit_time; - - /************************* Sample ******************/ - public double dimension_1; - public double dimension_2; - - /************************* Comment ******************/ - public String comment; - - /************************* Acquisition Block ******************/ - /** - * acquisition start date (yyyy / mm / dd) - */ - public String acquisition_start_date; - /** - * acquisition start time (hh : mm : ss . s) - */ - public String acquisition_start_time; - /** - * acquisition real time (s) - */ - public double acquisition_real_time; - /** - * acquisition live time (s) - */ - public double acquisition_live_time; - - /************************* Collection Block ******************/ - - /** - * collection start date (yyyy / mm / dd) - */ - public String collection_start_date; - /** - * collection start time (hh : mm : ss . s) - */ - public String collection_start_time; - /** - * collection stop date (yyyy / mm / dd) - */ - public String collection_stop_date; - /** - * collection stop time (hh : mm : ss . s) - */ - public String collection_stop_time; - /** - * total air volume sampled (standard cubic meters [scm]) - */ - public double air_volume; - - /************************* Processing Block ******************/ - /** - * sample volume of Xe (cm 3 ) - */ - public double sample_volume_of_Xe; - /** - * uncertainty (cm 3 ) - */ - public double uncertainty_1; - /** - * Xe collection yield (Xe gas in sample/total Xe gas sampled) - */ - public double Xe_collection_yield; - /** - * uncertainty (Xe gas in sample/total Xe gas sampled) - */ - public double uncertainty_2; - /** - * archive bottle identification - */ - public String archive_bottle_id; - - /************************* Calibration Block ******************/ - /** - * date of last calibration (yyyy / mm / dd) - */ - public String date_calibration; - /** - * time of last calibration (hh : mm : ss) - */ - public String time_calibration; - - /************************* g_Energy Block ******************/ - /** - * γ -energy (keV) - */ - public List g_energy; - /** - * centroid channel - */ - public List g_centroid_channel; - /** - * uncertainty (channels) - */ - public List g_uncertainty; - - public int g_record_count; - - /************************* b_Energy Block ******************/ - /** - * electron energy (keV) - */ - public List b_electron_energy; - /** - * decay mode descriptor: B for β-particle, C for conversion electron (CE) - */ - public List b_decay_mode; - /** - * maximum channel of β-particle distribution or centroid channel of CE (channels) - */ - public List b_channel; - /** - * uncertainty (channels) - */ - public List b_uncertainty; - - public int b_record_count; - - /************************* g_Resolution Block ******************/ - /** - * γ -energy (keV) - */ - public List g_r_energy; - /** - * FWHM (keV) - */ - public List g_r_FWHM; - /** - * uncertainty (keV) - */ - public List g_r_uncertainty; - - public int g_r_record_count; - - /************************* b_Resolution Block ******************/ - /** - * electron energy (keV) - */ - public List b_r_electron_energy; - /** - * FWHM (keV) - */ - public List b_r_FWHM; - /** - * uncertainty (keV) - */ - public List b_r_uncertainty; - - public int b_r_record_count; - - /************************* g_Efficiency Block ******************/ - /** - * γ -energy (keV) - */ - public List g_e_energy; - /** - * efficiency (counts in peak/photon emitted) - */ - public List g_e_efficiency; - /** - * uncertainty (counts in peak/photon emitted) - */ - public List g_e_uncertainty; - - public int g_e_record_count; - - /************************* ROI_Limits Block ******************/ - /** - * ROI number - */ - public List ROI_number; - /** - * 2-D ROI β-range start, x 1 (keV) - */ - public List POI_B_x1; - /** - * 2-D ROI β-range stop, x 2 (keV) - */ - public List POI_B_x2; - /** - * 2-D ROI γ-range start, y 1 (keV) - */ - public List POI_G_y1; - /** - * 2-D ROI γ-range stop, y 2 (keV) - */ - public List POI_G_y2; - - public int roi_record_count; - - /************************* b-gEfficiency Block ******************/ - /** - * nuclide name - */ - public List bg_nuclide_name; - /** - * ROI number - */ - public List bg_ROI_number; - /** - * β-γ coincidence efficiency (counts in ROI/β-γ pair emitted) - */ - public List bg_efficiency; - /** - * uncertainty (counts in ROI/β-γ pair emitted) - */ - public List bg_uncertainty; - - public int bg_record_count; - - /************************* Ratios Block ******************/ - /** - * ratio identifier - */ - public List ratio_id; - /** - * ROI number for the higher γ -energy ROI - */ - public List ROI_num_highter_G_energy_ROI; - /** - * ROI number for the lower γ -energy ROI - */ - public List ROI_num_lower_G_energy_ROI; - /** - * Q_DECLARE_METATYPE(RMSSOHData::HeaderBlock)count ratio(counts in higher γ -energy ROI/counts in lower γ -energy ROI) - */ - public List count_ratio; - /** - * count ratio uncertainty (percent) - */ - public List count_ratio_uncertainty; - - public int ratio_record_count; - - /************************* g_Spectrum Block ******************/ - /** - * number of γ channels - */ - public long num_g_channel; - /** - * γ-energy span (keV) - */ - public long g_energy_span; - /** - * begin of channels - */ - public long g_begin_channel; - /** - * count at channel - */ - public List g_counts; - - /************************* b_Spectrum Block ******************/ - /** - * number of β -channels - */ - public long num_b_channel; - /** - * β -energy span (keV) - */ - public long b_energy_span; - /** - * begin of channels - */ - public long b_begin_channel; - /** - * counts at channels - */ - public List b_counts; - - /************************* Histogram Block ******************/ - /** - * β-channels - */ - public long b_channels; - /** - * γ-channels - */ - public long g_channels; - /** - * β-energy span - */ - public long b_h_energy_span; - /** - * γ-energy span - */ - public long g_h_energy_span; - /** - * counts at channels - */ - public List h_counts; - - /************************* Certificate_Block ******************/ - /** - * total source activity (Bq) - */ - public double total_source_activity; - /** - * assay date (yyyy / mm / dd) - */ - public String assay_date; - /** - * assay time (hh : mm : ss) - */ - public String assay_time; - /** - * units of activity: “B,” “b” for Bq or “[blank]”; if nothing, then “B” is assigned - */ - public String units_activity; - /** - * nuclide name - */ - public List nuclide_name; - /** - * half-life in seconds, hours, days, or years - */ - public List half_life_time; - /** - * time unit(Y, D, H, S) - */ - public List time_unit; - /** - * activity of nuclide at time of assay - */ - public List activity_nuclide_time_assay; - /** - * uncertainty (%) - */ - public List uncertainty; - /** - * γ-energy (keV) - */ - public List cer_g_energy; - /** - * γ-intensity (percent) - */ - public List g_intensity; - /** - * electron decay mode descriptor: B for β particle or C for conversion electron (CE), 0 for none (that is, γ-only source) - */ - public List electron_decay_mode; - /** - * maximum β-particle energy or CE energy (keV) - */ - public List maximum_energy; - /** - * intensity of β-particle (percent) - */ - public List intensity_b_particle; - - public int record_count; - - /************************* Totaleff Block ******************/ - /** - * γ-energy (keV) - */ - public List t_g_energy; - /** - * total efficiency (counts/photon emitted) - */ - public List total_efficiency; - /** - * uncertainty (counts/photon emitted) - */ - public List t_uncertainty; - - public int t_record_count; - - public EnergySpectrumStruct() { - super(); - } - - @Override - public String toString() { - return "EnergySpectrumStruct{" + - "msg_type='" + msg_type + '\'' + - ", msg_id='" + msg_id + '\'' + - ", data_type='" + data_type + '\'' + - ", designator='" + designator + '\'' + - ", site_code='" + site_code + '\'' + - ", detector_code='" + detector_code + '\'' + - ", system_type='" + system_type + '\'' + - ", sample_geometry='" + sample_geometry + '\'' + - ", spectrum_quantity='" + spectrum_quantity + '\'' + - ", sample_ref_id='" + sample_ref_id + '\'' + - ", measurement_id='" + measurement_id + '\'' + - ", detector_bk_measurement_id='" + detector_bk_measurement_id + '\'' + - ", gas_bk_measurement_id='" + gas_bk_measurement_id + '\'' + - ", transmit_date='" + transmit_date + '\'' + - ", transmit_time='" + transmit_time + '\'' + - ", dimension_1=" + dimension_1 + - ", dimension_2=" + dimension_2 + - ", comment='" + comment + '\'' + - ", acquisition_start_date='" + acquisition_start_date + '\'' + - ", acquisition_start_time='" + acquisition_start_time + '\'' + - ", acquisition_real_time=" + acquisition_real_time + - ", acquisition_live_time=" + acquisition_live_time + - ", collection_start_date='" + collection_start_date + '\'' + - ", collection_start_time='" + collection_start_time + '\'' + - ", collection_stop_date='" + collection_stop_date + '\'' + - ", collection_stop_time='" + collection_stop_time + '\'' + - ", air_volume=" + air_volume + - ", sample_volume_of_Xe=" + sample_volume_of_Xe + - ", uncertainty_1=" + uncertainty_1 + - ", Xe_collection_yield=" + Xe_collection_yield + - ", uncertainty_2=" + uncertainty_2 + - ", archive_bottle_id='" + archive_bottle_id + '\'' + - ", date_calibration='" + date_calibration + '\'' + - ", time_calibration='" + time_calibration + '\'' + - ", g_energy=" + g_energy + - ", g_centroid_channel=" + g_centroid_channel + - ", g_uncertainty=" + g_uncertainty + - ", g_record_count=" + g_record_count + - ", b_electron_energy=" + b_electron_energy + - ", b_decay_mode=" + b_decay_mode + - ", b_channel=" + b_channel + - ", b_uncertainty=" + b_uncertainty + - ", b_record_count=" + b_record_count + - ", g_r_energy=" + g_r_energy + - ", g_r_FWHM=" + g_r_FWHM + - ", g_r_uncertainty=" + g_r_uncertainty + - ", g_r_record_count=" + g_r_record_count + - ", b_r_electron_energy=" + b_r_electron_energy + - ", b_r_FWHM=" + b_r_FWHM + - ", b_r_uncertainty=" + b_r_uncertainty + - ", b_r_record_count=" + b_r_record_count + - ", g_e_energy=" + g_e_energy + - ", g_e_efficiency=" + g_e_efficiency + - ", g_e_uncertainty=" + g_e_uncertainty + - ", g_e_record_count=" + g_e_record_count + - ", ROI_number=" + ROI_number + - ", POI_B_x1=" + POI_B_x1 + - ", POI_B_x2=" + POI_B_x2 + - ", POI_G_y1=" + POI_G_y1 + - ", POI_G_y2=" + POI_G_y2 + - ", roi_record_count=" + roi_record_count + - ", bg_nuclide_name=" + bg_nuclide_name + - ", bg_ROI_number=" + bg_ROI_number + - ", bg_efficiency=" + bg_efficiency + - ", bg_uncertainty=" + bg_uncertainty + - ", bg_record_count=" + bg_record_count + - ", ratio_id=" + ratio_id + - ", ROI_num_highter_G_energy_ROI=" + ROI_num_highter_G_energy_ROI + - ", ROI_num_lower_G_energy_ROI=" + ROI_num_lower_G_energy_ROI + - ", count_ratio=" + count_ratio + - ", count_ratio_uncertainty=" + count_ratio_uncertainty + - ", ratio_record_count=" + ratio_record_count + - ", num_g_channel=" + num_g_channel + - ", g_energy_span=" + g_energy_span + - ", g_begin_channel=" + g_begin_channel + - ", g_counts=" + g_counts + - ", num_b_channel=" + num_b_channel + - ", b_energy_span=" + b_energy_span + - ", b_begin_channel=" + b_begin_channel + - ", b_counts=" + b_counts + - ", b_channels=" + b_channels + - ", g_channels=" + g_channels + - ", b_h_energy_span=" + b_h_energy_span + - ", g_h_energy_span=" + g_h_energy_span + - ", h_counts=" + h_counts + - ", total_source_activity=" + total_source_activity + - ", assay_date='" + assay_date + '\'' + - ", assay_time='" + assay_time + '\'' + - ", units_activity='" + units_activity + '\'' + - ", nuclide_name=" + nuclide_name + - ", half_life_time=" + half_life_time + - ", time_unit=" + time_unit + - ", activity_nuclide_time_assay=" + activity_nuclide_time_assay + - ", uncertainty=" + uncertainty + - ", cer_g_energy=" + cer_g_energy + - ", g_intensity=" + g_intensity + - ", electron_decay_mode=" + electron_decay_mode + - ", maximum_energy=" + maximum_energy + - ", intensity_b_particle=" + intensity_b_particle + - ", record_count=" + record_count + - ", t_g_energy=" + t_g_energy + - ", total_efficiency=" + total_efficiency + - ", t_uncertainty=" + t_uncertainty + - ", t_record_count=" + t_record_count + - '}'; - } -} diff --git a/jeecg-module-beta-gamma-analyser/src/main/java/org/jeecg/modules/native_jni/EnergySpectrumHandler.java b/jeecg-module-beta-gamma-analyser/src/main/java/org/jeecg/modules/native_jni/EnergySpectrumHandler.java index acf974c2..672e8204 100644 --- a/jeecg-module-beta-gamma-analyser/src/main/java/org/jeecg/modules/native_jni/EnergySpectrumHandler.java +++ b/jeecg-module-beta-gamma-analyser/src/main/java/org/jeecg/modules/native_jni/EnergySpectrumHandler.java @@ -1,9 +1,6 @@ package org.jeecg.modules.native_jni; -import org.jeecg.modules.native_jni.struct.BgAnalyseResult; -import org.jeecg.modules.native_jni.struct.BgBoundary; -import org.jeecg.modules.native_jni.struct.CalcBgBoundaryParam; -import org.jeecg.modules.native_jni.struct.EnergySpectrumStruct; +import org.jeecg.modules.native_jni.struct.*; import java.util.List; @@ -51,4 +48,25 @@ public class EnergySpectrumHandler { */ public static native BgAnalyseResult bgAnalyse(String sampleFile, String gasFile, String detFile); + /** + * 获取健康状态谱原始数据 + * @param path 能谱文件路径 + * @return 能谱原始数据 + */ + public static native SOHSpectrumStruct getSOHSourceData(String path); + + /** + * 获取警告谱原始数据 + * @param path 能谱文件路径 + * @return 能谱原始数据 + */ + public static native AlertSpectrumStruct getAlertSourceData(String path); + + /** + * 获取气象谱原始数据 + * @param path 能谱文件路径 + * @return 能谱原始数据 + */ + public static native MetSpectrumStruct getMetSourceData(String path); + } diff --git a/jeecg-module-auto-process/src/main/java/org/jeecg/modules/native_jni/struct/AlertSpectrumStruct.java b/jeecg-module-beta-gamma-analyser/src/main/java/org/jeecg/modules/native_jni/struct/AlertSpectrumStruct.java similarity index 100% rename from jeecg-module-auto-process/src/main/java/org/jeecg/modules/native_jni/struct/AlertSpectrumStruct.java rename to jeecg-module-beta-gamma-analyser/src/main/java/org/jeecg/modules/native_jni/struct/AlertSpectrumStruct.java diff --git a/jeecg-module-beta-gamma-analyser/src/main/java/org/jeecg/modules/native_jni/struct/EnergySpectrumStruct.java b/jeecg-module-beta-gamma-analyser/src/main/java/org/jeecg/modules/native_jni/struct/EnergySpectrumStruct.java index b02d240d..b546732f 100644 --- a/jeecg-module-beta-gamma-analyser/src/main/java/org/jeecg/modules/native_jni/struct/EnergySpectrumStruct.java +++ b/jeecg-module-beta-gamma-analyser/src/main/java/org/jeecg/modules/native_jni/struct/EnergySpectrumStruct.java @@ -1,10 +1,13 @@ package org.jeecg.modules.native_jni.struct; +import lombok.Data; + import java.util.List; /** * 能谱结构体字段信息 */ +@Data public class EnergySpectrumStruct { /************************* Infomations ******************/ /** @@ -440,113 +443,4 @@ public class EnergySpectrumStruct { super(); } - @Override - public String toString() { - return "EnergySpectrumStruct{" + - "msg_type='" + msg_type + '\'' + - ", msg_id='" + msg_id + '\'' + - ", data_type='" + data_type + '\'' + - ", designator='" + designator + '\'' + - ", site_code='" + site_code + '\'' + - ", detector_code='" + detector_code + '\'' + - ", system_type='" + system_type + '\'' + - ", sample_geometry='" + sample_geometry + '\'' + - ", spectrum_quantity='" + spectrum_quantity + '\'' + - ", sample_ref_id='" + sample_ref_id + '\'' + - ", measurement_id='" + measurement_id + '\'' + - ", detector_bk_measurement_id='" + detector_bk_measurement_id + '\'' + - ", gas_bk_measurement_id='" + gas_bk_measurement_id + '\'' + - ", transmit_date='" + transmit_date + '\'' + - ", transmit_time='" + transmit_time + '\'' + - ", comment='" + comment + '\'' + - ", acquisition_start_date='" + acquisition_start_date + '\'' + - ", acquisition_start_time='" + acquisition_start_time + '\'' + - ", acquisition_real_time=" + acquisition_real_time + - ", acquisition_live_time=" + acquisition_live_time + - ", collection_start_date='" + collection_start_date + '\'' + - ", collection_start_time='" + collection_start_time + '\'' + - ", collection_stop_date='" + collection_stop_date + '\'' + - ", collection_stop_time='" + collection_stop_time + '\'' + - ", air_volume=" + air_volume + - ", sample_volume_of_Xe=" + sample_volume_of_Xe + - ", uncertainty_1=" + uncertainty_1 + - ", Xe_collection_yield=" + Xe_collection_yield + - ", uncertainty_2=" + uncertainty_2 + - ", archive_bottle_id='" + archive_bottle_id + '\'' + - ", date_calibration='" + date_calibration + '\'' + - ", time_calibration='" + time_calibration + '\'' + - ", g_energy=" + g_energy + - ", g_centroid_channel=" + g_centroid_channel + - ", g_uncertainty=" + g_uncertainty + - ", g_record_count=" + g_record_count + - ", b_electron_energy=" + b_electron_energy + - ", b_decay_mode=" + b_decay_mode + - ", b_channel=" + b_channel + - ", b_uncertainty=" + b_uncertainty + - ", b_record_count=" + b_record_count + - ", g_r_energy=" + g_r_energy + - ", g_r_FWHM=" + g_r_FWHM + - ", g_r_uncertainty=" + g_r_uncertainty + - ", g_r_record_count=" + g_r_record_count + - ", b_r_electron_energy=" + b_r_electron_energy + - ", b_r_FWHM=" + b_r_FWHM + - ", b_r_uncertainty=" + b_r_uncertainty + - ", b_r_record_count=" + b_r_record_count + - ", g_e_energy=" + g_e_energy + - ", g_e_efficiency=" + g_e_efficiency + - ", g_e_uncertainty=" + g_e_uncertainty + - ", g_e_record_count=" + g_e_record_count + - ", ROI_number=" + ROI_number + - ", POI_B_x1=" + POI_B_x1 + - ", POI_B_x2=" + POI_B_x2 + - ", POI_G_y1=" + POI_G_y1 + - ", POI_G_y2=" + POI_G_y2 + - ", roi_record_count=" + roi_record_count + - ", bg_nuclide_name=" + bg_nuclide_name + - ", bg_ROI_number=" + bg_ROI_number + - ", bg_efficiency=" + bg_efficiency + - ", bg_uncertainty=" + bg_uncertainty + - ", bg_record_count=" + bg_record_count + - ", ratio_id=" + ratio_id + - ", ROI_num_highter_G_energy_ROI=" + ROI_num_highter_G_energy_ROI + - ", ROI_num_lower_G_energy_ROI=" + ROI_num_lower_G_energy_ROI + - ", count_ratio=" + count_ratio + - ", count_ratio_uncertainty=" + count_ratio_uncertainty + - ", ratio_record_count=" + ratio_record_count + - ", num_g_channel=" + num_g_channel + - ", g_energy_span=" + g_energy_span + - ", g_begin_channel=" + g_begin_channel + - ", g_counts=" + g_counts + - ", num_b_channel=" + num_b_channel + - ", b_energy_span=" + b_energy_span + - ", b_begin_channel=" + b_begin_channel + - ", b_counts=" + b_counts + - ", b_channels=" + b_channels + - ", g_channels=" + g_channels + - ", b_h_energy_span=" + b_h_energy_span + - ", g_h_energy_span=" + g_h_energy_span + - ", h_counts=" + h_counts + - ", total_source_activity=" + total_source_activity + - ", assay_date='" + assay_date + '\'' + - ", assay_time='" + assay_time + '\'' + - ", units_activity='" + units_activity + '\'' + - ", nuclide_name=" + nuclide_name + - ", half_life_time=" + half_life_time + - ", time_unit=" + time_unit + - ", activity_nuclide_time_assay=" + activity_nuclide_time_assay + - ", uncertainty=" + uncertainty + - ", cer_g_energy=" + cer_g_energy + - ", g_intensity=" + g_intensity + - ", electron_decay_mode=" + electron_decay_mode + - ", maximum_energy=" + maximum_energy + - ", intensity_b_particle=" + intensity_b_particle + - ", record_count=" + record_count + - '}'; - } - - public static void main(String[] args) { - EnergySpectrumStruct s = new EnergySpectrumStruct(); - System.out.println(s); - System.out.println(s.gas_bk_measurement_id); - } } diff --git a/jeecg-module-auto-process/src/main/java/org/jeecg/modules/native_jni/struct/MetSpectrumStruct.java b/jeecg-module-beta-gamma-analyser/src/main/java/org/jeecg/modules/native_jni/struct/MetSpectrumStruct.java similarity index 100% rename from jeecg-module-auto-process/src/main/java/org/jeecg/modules/native_jni/struct/MetSpectrumStruct.java rename to jeecg-module-beta-gamma-analyser/src/main/java/org/jeecg/modules/native_jni/struct/MetSpectrumStruct.java diff --git a/jeecg-module-auto-process/src/main/java/org/jeecg/modules/native_jni/struct/SOHSpectrumStruct.java b/jeecg-module-beta-gamma-analyser/src/main/java/org/jeecg/modules/native_jni/struct/SOHSpectrumStruct.java similarity index 100% rename from jeecg-module-auto-process/src/main/java/org/jeecg/modules/native_jni/struct/SOHSpectrumStruct.java rename to jeecg-module-beta-gamma-analyser/src/main/java/org/jeecg/modules/native_jni/struct/SOHSpectrumStruct.java diff --git a/jeecg-server-cloud/jeecg-auto-process-start/src/main/resources/application.yml b/jeecg-server-cloud/jeecg-auto-process-start/src/main/resources/application.yml index c74f45bc..a5d0fe92 100644 --- a/jeecg-server-cloud/jeecg-auto-process-start/src/main/resources/application.yml +++ b/jeecg-server-cloud/jeecg-auto-process-start/src/main/resources/application.yml @@ -15,5 +15,5 @@ spring: config: import: - optional:nacos:jeecg.yaml - - optional:nacos:jeecg-@profile.name@.yaml + - optional:nacos:jeecg-@profile.name@-pbl.yaml