diff --git a/jeecg-module-auto-process/src/main/java/org/jeecg/modules/service/impl/B_EnergyBlockServiceImpl.java b/jeecg-module-auto-process/src/main/java/org/jeecg/modules/service/impl/B_EnergyBlockServiceImpl.java index be1f2bb8..61a6775d 100644 --- a/jeecg-module-auto-process/src/main/java/org/jeecg/modules/service/impl/B_EnergyBlockServiceImpl.java +++ b/jeecg-module-auto-process/src/main/java/org/jeecg/modules/service/impl/B_EnergyBlockServiceImpl.java @@ -7,6 +7,7 @@ import org.jeecg.modules.base.entity.original.GardsCalibrationPairsOrig; import org.jeecg.modules.base.entity.original.GardsSampleData; import org.jeecg.modules.mapper.GardsCalibrationPairsOrigMapper; import org.jeecg.modules.native_jni.struct.EnergySpectrumStruct; +import org.jeecg.modules.service.BlockConstant; import org.jeecg.modules.service.ISpectrumBlockService; import org.springframework.stereotype.Service; import java.util.List; @@ -15,11 +16,7 @@ import java.util.List; * #b_Energy块 */ @Service("#b_Energy") -public class B_EnergyBlockServiceImpl extends ServiceImpl implements ISpectrumBlockService { - - private final static String PHD = "PHD"; - private final static String SYSTEMTYPE_B = "B"; - private final static String ENERGY_CAL = "ENERGY_CAL"; +public class B_EnergyBlockServiceImpl extends ServiceImpl implements ISpectrumBlockService, BlockConstant { /** * #b_Energy数据块中的刻度点。 diff --git a/jeecg-module-auto-process/src/main/java/org/jeecg/modules/service/impl/B_ResolutionBlockServiceImpl.java b/jeecg-module-auto-process/src/main/java/org/jeecg/modules/service/impl/B_ResolutionBlockServiceImpl.java index 068c9047..424ce195 100644 --- a/jeecg-module-auto-process/src/main/java/org/jeecg/modules/service/impl/B_ResolutionBlockServiceImpl.java +++ b/jeecg-module-auto-process/src/main/java/org/jeecg/modules/service/impl/B_ResolutionBlockServiceImpl.java @@ -7,6 +7,7 @@ import org.jeecg.modules.base.entity.original.GardsCalibrationPairsOrig; import org.jeecg.modules.base.entity.original.GardsSampleData; import org.jeecg.modules.mapper.GardsCalibrationPairsOrigMapper; import org.jeecg.modules.native_jni.struct.EnergySpectrumStruct; +import org.jeecg.modules.service.BlockConstant; import org.jeecg.modules.service.ISpectrumBlockService; import org.springframework.stereotype.Service; import java.util.List; @@ -15,11 +16,7 @@ import java.util.List; * #b_Resolution块 */ @Service("#b_Resolution") -public class B_ResolutionBlockServiceImpl extends ServiceImpl implements ISpectrumBlockService { - - private final static String PHD = "PHD"; - private final static String SYSTEMTYPE_B = "B"; - private final static String RESOLUTION_CAL = "Resolution"; +public class B_ResolutionBlockServiceImpl extends ServiceImpl implements ISpectrumBlockService, BlockConstant { /** * #b_Resolution数据块中的刻度点。 diff --git a/jeecg-module-auto-process/src/main/java/org/jeecg/modules/service/impl/B_SpectrumBlockServiceImpl.java b/jeecg-module-auto-process/src/main/java/org/jeecg/modules/service/impl/B_SpectrumBlockServiceImpl.java index acf6ed7e..17fa1679 100644 --- a/jeecg-module-auto-process/src/main/java/org/jeecg/modules/service/impl/B_SpectrumBlockServiceImpl.java +++ b/jeecg-module-auto-process/src/main/java/org/jeecg/modules/service/impl/B_SpectrumBlockServiceImpl.java @@ -5,6 +5,7 @@ import org.jeecg.modules.base.entity.original.GardsSampleData; import org.jeecg.modules.base.entity.original.GardsSpectrum; import org.jeecg.modules.mapper.GardsSpectrumMapper; import org.jeecg.modules.native_jni.struct.EnergySpectrumStruct; +import org.jeecg.modules.service.BlockConstant; import org.jeecg.modules.service.ISpectrumBlockService; import org.springframework.stereotype.Service; import java.util.Date; @@ -13,9 +14,7 @@ import java.util.Date; * #b_Spectrum块 */ @Service("#b_Spectrum") -public class B_SpectrumBlockServiceImpl extends ServiceImpl implements ISpectrumBlockService { - - private final static String SYSTEMTYPE_B = "B"; +public class B_SpectrumBlockServiceImpl extends ServiceImpl implements ISpectrumBlockService, BlockConstant { /** * #b_Spectrum数据块中的数据。 diff --git a/jeecg-module-auto-process/src/main/java/org/jeecg/modules/service/impl/G_EfficiencyBlockServiceImpl.java b/jeecg-module-auto-process/src/main/java/org/jeecg/modules/service/impl/G_EfficiencyBlockServiceImpl.java index b6aab609..31aedef8 100644 --- a/jeecg-module-auto-process/src/main/java/org/jeecg/modules/service/impl/G_EfficiencyBlockServiceImpl.java +++ b/jeecg-module-auto-process/src/main/java/org/jeecg/modules/service/impl/G_EfficiencyBlockServiceImpl.java @@ -7,6 +7,7 @@ import org.jeecg.modules.base.entity.original.GardsCalibrationPairsOrig; import org.jeecg.modules.base.entity.original.GardsSampleData; import org.jeecg.modules.mapper.GardsCalibrationPairsOrigMapper; import org.jeecg.modules.native_jni.struct.EnergySpectrumStruct; +import org.jeecg.modules.service.BlockConstant; import org.jeecg.modules.service.ISpectrumBlockService; import org.springframework.stereotype.Service; import java.util.List; @@ -15,11 +16,7 @@ import java.util.List; * #g_Efficiency块 */ @Service("#g_Efficiency") -public class G_EfficiencyBlockServiceImpl extends ServiceImpl implements ISpectrumBlockService { - - private final static String PHD = "PHD"; - private final static String SYSTEMTYPE_G = "G"; - private final static String EFFICIENCY_CAL ="efficiency"; +public class G_EfficiencyBlockServiceImpl extends ServiceImpl implements ISpectrumBlockService, BlockConstant { /** * #g_efficiency数据块中的刻度点。 diff --git a/jeecg-module-auto-process/src/main/java/org/jeecg/modules/service/impl/G_EnergyBlockServiceImpl.java b/jeecg-module-auto-process/src/main/java/org/jeecg/modules/service/impl/G_EnergyBlockServiceImpl.java index 1621cc36..13c93d69 100644 --- a/jeecg-module-auto-process/src/main/java/org/jeecg/modules/service/impl/G_EnergyBlockServiceImpl.java +++ b/jeecg-module-auto-process/src/main/java/org/jeecg/modules/service/impl/G_EnergyBlockServiceImpl.java @@ -7,6 +7,7 @@ import org.jeecg.modules.base.entity.original.GardsCalibrationPairsOrig; import org.jeecg.modules.base.entity.original.GardsSampleData; import org.jeecg.modules.mapper.GardsCalibrationPairsOrigMapper; import org.jeecg.modules.native_jni.struct.EnergySpectrumStruct; +import org.jeecg.modules.service.BlockConstant; import org.jeecg.modules.service.ISpectrumBlockService; import org.springframework.stereotype.Service; import java.util.List; @@ -15,11 +16,7 @@ import java.util.List; * #g_energy块 */ @Service("#g_Energy") -public class G_EnergyBlockServiceImpl extends ServiceImpl implements ISpectrumBlockService { - - private final static String PHD = "PHD"; - private final static String SYSTEMTYPE_G = "G"; - private final static String ENERGY_CAL = "ENERGY_CAL"; +public class G_EnergyBlockServiceImpl extends ServiceImpl implements ISpectrumBlockService, BlockConstant { /** * #g_energy数据块中的刻度点。 diff --git a/jeecg-module-auto-process/src/main/java/org/jeecg/modules/service/impl/G_ResolutionBlockServiceImpl.java b/jeecg-module-auto-process/src/main/java/org/jeecg/modules/service/impl/G_ResolutionBlockServiceImpl.java index cc91e07c..99fdc7f8 100644 --- a/jeecg-module-auto-process/src/main/java/org/jeecg/modules/service/impl/G_ResolutionBlockServiceImpl.java +++ b/jeecg-module-auto-process/src/main/java/org/jeecg/modules/service/impl/G_ResolutionBlockServiceImpl.java @@ -7,6 +7,7 @@ import org.jeecg.modules.base.entity.original.GardsCalibrationPairsOrig; import org.jeecg.modules.base.entity.original.GardsSampleData; import org.jeecg.modules.mapper.GardsCalibrationPairsOrigMapper; import org.jeecg.modules.native_jni.struct.EnergySpectrumStruct; +import org.jeecg.modules.service.BlockConstant; import org.jeecg.modules.service.ISpectrumBlockService; import org.springframework.stereotype.Service; import java.util.List; @@ -15,11 +16,7 @@ import java.util.List; * #g_Resolution块 */ @Service("#g_Resolution") -public class G_ResolutionBlockServiceImpl extends ServiceImpl implements ISpectrumBlockService { - - private final static String PHD = "PHD"; - private final static String SYSTEMTYPE_G = "G"; - private final static String RESOLUTION_CAL = "Resolution"; +public class G_ResolutionBlockServiceImpl extends ServiceImpl implements ISpectrumBlockService, BlockConstant { /** * #g_Resolution数据块中的刻度点。 diff --git a/jeecg-module-auto-process/src/main/java/org/jeecg/modules/service/impl/G_SpectrumBlockServiceImpl.java b/jeecg-module-auto-process/src/main/java/org/jeecg/modules/service/impl/G_SpectrumBlockServiceImpl.java index 7098c9eb..2b768e16 100644 --- a/jeecg-module-auto-process/src/main/java/org/jeecg/modules/service/impl/G_SpectrumBlockServiceImpl.java +++ b/jeecg-module-auto-process/src/main/java/org/jeecg/modules/service/impl/G_SpectrumBlockServiceImpl.java @@ -5,6 +5,7 @@ import org.jeecg.modules.base.entity.original.GardsSampleData; import org.jeecg.modules.base.entity.original.GardsSpectrum; import org.jeecg.modules.mapper.GardsSpectrumMapper; import org.jeecg.modules.native_jni.struct.EnergySpectrumStruct; +import org.jeecg.modules.service.BlockConstant; import org.jeecg.modules.service.ISpectrumBlockService; import org.springframework.stereotype.Service; import java.util.Date; @@ -13,9 +14,8 @@ import java.util.Date; * #g_Spectrum块 */ @Service("#g_Spectrum") -public class G_SpectrumBlockServiceImpl extends ServiceImpl implements ISpectrumBlockService { +public class G_SpectrumBlockServiceImpl extends ServiceImpl implements ISpectrumBlockService, BlockConstant { - private final static String SYSTEMTYPE_G = "G"; /** * #G_Spectrum数据块中的数据。 diff --git a/jeecg-module-auto-process/src/main/java/org/jeecg/modules/spectrum/AlertSpectrum.java b/jeecg-module-auto-process/src/main/java/org/jeecg/modules/spectrum/AlertSpectrum.java index 7acdf9e2..a6e2cd7d 100644 --- a/jeecg-module-auto-process/src/main/java/org/jeecg/modules/spectrum/AlertSpectrum.java +++ b/jeecg-module-auto-process/src/main/java/org/jeecg/modules/spectrum/AlertSpectrum.java @@ -77,14 +77,6 @@ public class AlertSpectrum extends SpectrumHandler{ } } - /** - * 处理原始数据 - */ - @Override - protected void handlerAnalysisResult() { - - } - /** * 调用dll解析邮件 */ diff --git a/jeecg-module-auto-process/src/main/java/org/jeecg/modules/spectrum/DetbkphdSpectrum.java b/jeecg-module-auto-process/src/main/java/org/jeecg/modules/spectrum/DetbkphdSpectrum.java index 55722e6a..b63d8fc8 100644 --- a/jeecg-module-auto-process/src/main/java/org/jeecg/modules/spectrum/DetbkphdSpectrum.java +++ b/jeecg-module-auto-process/src/main/java/org/jeecg/modules/spectrum/DetbkphdSpectrum.java @@ -48,13 +48,4 @@ public class DetbkphdSpectrum extends S_D_Q_G_SpectrumHandler{ } } - /** - * 处理分析结果 - * - * @param struct - */ - @Override - protected void handlerAnalysisResult() { - - } } diff --git a/jeecg-module-auto-process/src/main/java/org/jeecg/modules/spectrum/GasbkphdSpectrum.java b/jeecg-module-auto-process/src/main/java/org/jeecg/modules/spectrum/GasbkphdSpectrum.java index 2b24545b..df098027 100644 --- a/jeecg-module-auto-process/src/main/java/org/jeecg/modules/spectrum/GasbkphdSpectrum.java +++ b/jeecg-module-auto-process/src/main/java/org/jeecg/modules/spectrum/GasbkphdSpectrum.java @@ -49,12 +49,4 @@ public class GasbkphdSpectrum extends S_D_Q_G_SpectrumHandler{ super.next.handler(); } } - - /** - * 处理分析结果 - */ - @Override - protected void handlerAnalysisResult() { - - } } diff --git a/jeecg-module-auto-process/src/main/java/org/jeecg/modules/spectrum/HealthStatusSpectrum.java b/jeecg-module-auto-process/src/main/java/org/jeecg/modules/spectrum/HealthStatusSpectrum.java index 996c77a7..a910f4f9 100644 --- a/jeecg-module-auto-process/src/main/java/org/jeecg/modules/spectrum/HealthStatusSpectrum.java +++ b/jeecg-module-auto-process/src/main/java/org/jeecg/modules/spectrum/HealthStatusSpectrum.java @@ -76,14 +76,6 @@ public class HealthStatusSpectrum extends SpectrumHandler{ } } - /** - * 处理分析结果 - */ - @Override - protected void handlerAnalysisResult() { - - } - /** * 调用dll解析邮件 */ diff --git a/jeecg-module-auto-process/src/main/java/org/jeecg/modules/spectrum/MetSpectrum.java b/jeecg-module-auto-process/src/main/java/org/jeecg/modules/spectrum/MetSpectrum.java index a6023810..2702a357 100644 --- a/jeecg-module-auto-process/src/main/java/org/jeecg/modules/spectrum/MetSpectrum.java +++ b/jeecg-module-auto-process/src/main/java/org/jeecg/modules/spectrum/MetSpectrum.java @@ -76,14 +76,6 @@ public class MetSpectrum extends SpectrumHandler{ } } - /** - * 处理分析结果 - */ - @Override - protected void handlerAnalysisResult() { - - } - /** * 调用dll解析邮件 */ diff --git a/jeecg-module-auto-process/src/main/java/org/jeecg/modules/spectrum/QcphdSpectrum.java b/jeecg-module-auto-process/src/main/java/org/jeecg/modules/spectrum/QcphdSpectrum.java index f0e1c677..8e99266d 100644 --- a/jeecg-module-auto-process/src/main/java/org/jeecg/modules/spectrum/QcphdSpectrum.java +++ b/jeecg-module-auto-process/src/main/java/org/jeecg/modules/spectrum/QcphdSpectrum.java @@ -49,12 +49,4 @@ public class QcphdSpectrum extends S_D_Q_G_SpectrumHandler{ super.next.handler(); } } - - /** - * 处理分析结果 - */ - @Override - protected void handlerAnalysisResult() { - - } } diff --git a/jeecg-module-auto-process/src/main/java/org/jeecg/modules/spectrum/S_D_Q_G_SpectrumHandler.java b/jeecg-module-auto-process/src/main/java/org/jeecg/modules/spectrum/S_D_Q_G_SpectrumHandler.java index e868e590..e0174d01 100644 --- a/jeecg-module-auto-process/src/main/java/org/jeecg/modules/spectrum/S_D_Q_G_SpectrumHandler.java +++ b/jeecg-module-auto-process/src/main/java/org/jeecg/modules/spectrum/S_D_Q_G_SpectrumHandler.java @@ -48,7 +48,7 @@ public abstract class S_D_Q_G_SpectrumHandler extends SpectrumHandler{ /** * 基础数据 */ - private GardsSampleData sampleData; + protected GardsSampleData sampleData; /** * 前置检查 diff --git a/jeecg-module-auto-process/src/main/java/org/jeecg/modules/spectrum/SpectrumHandler.java b/jeecg-module-auto-process/src/main/java/org/jeecg/modules/spectrum/SpectrumHandler.java index 7a0e7b3a..cc717375 100644 --- a/jeecg-module-auto-process/src/main/java/org/jeecg/modules/spectrum/SpectrumHandler.java +++ b/jeecg-module-auto-process/src/main/java/org/jeecg/modules/spectrum/SpectrumHandler.java @@ -91,11 +91,6 @@ public abstract class SpectrumHandler extends Chain{ */ protected abstract void handler() throws Exception; - /** - * 处理分析结果 - */ - protected abstract void handlerAnalysisResult(); - /** * 调用dll解析邮件 */ diff --git a/jeecg-module-auto-process/src/main/java/org/jeecg/modules/spectrum/SpectrumServiceQuotes.java b/jeecg-module-auto-process/src/main/java/org/jeecg/modules/spectrum/SpectrumServiceQuotes.java index 124ac66d..b60098c0 100644 --- a/jeecg-module-auto-process/src/main/java/org/jeecg/modules/spectrum/SpectrumServiceQuotes.java +++ b/jeecg-module-auto-process/src/main/java/org/jeecg/modules/spectrum/SpectrumServiceQuotes.java @@ -46,4 +46,6 @@ public class SpectrumServiceQuotes { private final GardsSampleDataService sampleDataService; + private final GardsAnalysesService analysesService; + }