diff --git a/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/entity/vo/StructInsertInput.java b/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/entity/vo/StructInsertInput.java new file mode 100644 index 00000000..4d26353b --- /dev/null +++ b/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/entity/vo/StructInsertInput.java @@ -0,0 +1,62 @@ +package org.jeecg.modules.entity.vo; + +import lombok.Data; + +import java.io.Serializable; +import java.util.List; + +@Data +public class StructInsertInput implements Serializable { + + //-----------------input:------------------ + List peakCentroid; + + List fwhmc; + + List tail; + + List tailAlpha; + + List upperTail; + + List upperTailAlpha; + + List area; + + List stepRatio; + + List usedEnerPara; + + List usedResoPara; + + List usedEffiPara; + + long num_g_channel; + + long begin_channel; + + List XCtrl; + + List YCtrl; + + List YSlope; + + int rg_low; + + int rg_high; + + List para_tail; + + List para_tailAlpha; + + List para_tailRight; + + List para_tailRightAlpha; + + List para_stepRatio; + + int curChan; + + List vCount; + +} diff --git a/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/entity/vo/StructInsertOutput.java b/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/entity/vo/StructInsertOutput.java new file mode 100644 index 00000000..f1bb26cb --- /dev/null +++ b/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/entity/vo/StructInsertOutput.java @@ -0,0 +1,34 @@ +package org.jeecg.modules.entity.vo; + +import lombok.Data; + +import java.io.Serializable; +import java.util.List; + +@Data +public class StructInsertOutput implements Serializable { + + //-----------------output:------------------ + List energy; + + List sensitivity; + + List fwhm; + + List efficiency; + + List BWWidthChan; + + List recoilBetaChan; + + List recoilDeltaChan; + + List vIdx; + + List vLeft; + + List vRight; + + List vCentroid; + +} diff --git a/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/native_jni/CalValuesHandler.java b/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/native_jni/CalValuesHandler.java index 6be425bf..c735d032 100644 --- a/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/native_jni/CalValuesHandler.java +++ b/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/native_jni/CalValuesHandler.java @@ -1,6 +1,8 @@ package org.jeecg.modules.native_jni; import org.jeecg.modules.entity.vo.PeakInfo; +import org.jeecg.modules.entity.vo.StructInsertInput; +import org.jeecg.modules.entity.vo.StructInsertOutput; import org.jeecg.modules.native_jni.struct.CalValuesOut; import java.util.List; @@ -13,6 +15,12 @@ public class CalValuesHandler { 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); + }