xiaoguangbin/AnalysisSystemForRadionuclide
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix:1.优化能谱处理类结构

Browse Source
This commit is contained in:
panbaolin 2023-08-30 17:22:12 +08:00
parent 26f16fc210
commit b5cdc53181
16 changed files with 17 additions and 85 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
jeecg-module-auto-process/src/main/java/org/jeecg/modules/service/impl/B_EnergyBlockServiceImpl.java
View File

@ -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<GardsCalibrationPairsOrigMapper, GardsCalibrationPairsOrig> 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<GardsCalibrationPairsOrigMapper, GardsCalibrationPairsOrig> implements ISpectrumBlockService, BlockConstant {
/**
* #b_Energy数据块中的刻度点。

7
jeecg-module-auto-process/src/main/java/org/jeecg/modules/service/impl/B_ResolutionBlockServiceImpl.java
View File

@ -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<GardsCalibrationPairsOrigMapper, GardsCalibrationPairsOrig> 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<GardsCalibrationPairsOrigMapper, GardsCalibrationPairsOrig> implements ISpectrumBlockService, BlockConstant {
/**
* #b_Resolution数据块中的刻度点。

5
jeecg-module-auto-process/src/main/java/org/jeecg/modules/service/impl/B_SpectrumBlockServiceImpl.java
View File

@ -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<GardsSpectrumMapper, GardsSpectrum> implements ISpectrumBlockService {
private final static String SYSTEMTYPE_B = "B";
public class B_SpectrumBlockServiceImpl extends ServiceImpl<GardsSpectrumMapper, GardsSpectrum> implements ISpectrumBlockService, BlockConstant {
/**
* #b_Spectrum数据块中的数据。

7
jeecg-module-auto-process/src/main/java/org/jeecg/modules/service/impl/G_EfficiencyBlockServiceImpl.java
View File

@ -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<GardsCalibrationPairsOrigMapper, GardsCalibrationPairsOrig> 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<GardsCalibrationPairsOrigMapper, GardsCalibrationPairsOrig> implements ISpectrumBlockService, BlockConstant {
/**
* #g_efficiency数据块中的刻度点。

7
jeecg-module-auto-process/src/main/java/org/jeecg/modules/service/impl/G_EnergyBlockServiceImpl.java
View File

@ -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<GardsCalibrationPairsOrigMapper, GardsCalibrationPairsOrig> 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<GardsCalibrationPairsOrigMapper, GardsCalibrationPairsOrig> implements ISpectrumBlockService, BlockConstant {
/**
* #g_energy数据块中的刻度点。

7
jeecg-module-auto-process/src/main/java/org/jeecg/modules/service/impl/G_ResolutionBlockServiceImpl.java
View File

@ -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<GardsCalibrationPairsOrigMapper, GardsCalibrationPairsOrig> 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<GardsCalibrationPairsOrigMapper, GardsCalibrationPairsOrig> implements ISpectrumBlockService, BlockConstant {
/**
* #g_Resolution数据块中的刻度点。

4
jeecg-module-auto-process/src/main/java/org/jeecg/modules/service/impl/G_SpectrumBlockServiceImpl.java
View File

@ -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<GardsSpectrumMapper, GardsSpectrum> implements ISpectrumBlockService {
public class G_SpectrumBlockServiceImpl extends ServiceImpl<GardsSpectrumMapper, GardsSpectrum> implements ISpectrumBlockService, BlockConstant {
private final static String SYSTEMTYPE_G = "G";
/**
* #G_Spectrum数据块中的数据。

8
jeecg-module-auto-process/src/main/java/org/jeecg/modules/spectrum/AlertSpectrum.java
View File

@ -77,14 +77,6 @@ public class AlertSpectrum extends SpectrumHandler{
}
}
/**
* 处理原始数据
*/
@Override
protected void handlerAnalysisResult() {
}
/**
* 调用dll解析邮件
*/

9
jeecg-module-auto-process/src/main/java/org/jeecg/modules/spectrum/DetbkphdSpectrum.java
View File

@ -48,13 +48,4 @@ public class DetbkphdSpectrum extends S_D_Q_G_SpectrumHandler{
}
}
/**
* 处理分析结果
*
* @param struct
*/
@Override
protected void handlerAnalysisResult() {
}
}

8
jeecg-module-auto-process/src/main/java/org/jeecg/modules/spectrum/GasbkphdSpectrum.java
View File

@ -49,12 +49,4 @@ public class GasbkphdSpectrum extends S_D_Q_G_SpectrumHandler{
super.next.handler();
}
}
/**
* 处理分析结果
*/
@Override
protected void handlerAnalysisResult() {
}
}

8
jeecg-module-auto-process/src/main/java/org/jeecg/modules/spectrum/HealthStatusSpectrum.java
View File

@ -76,14 +76,6 @@ public class HealthStatusSpectrum extends SpectrumHandler{
}
}
/**
* 处理分析结果
*/
@Override
protected void handlerAnalysisResult() {
}
/**
* 调用dll解析邮件
*/

8
jeecg-module-auto-process/src/main/java/org/jeecg/modules/spectrum/MetSpectrum.java
View File

@ -76,14 +76,6 @@ public class MetSpectrum extends SpectrumHandler{
}
}
/**
* 处理分析结果
*/
@Override
protected void handlerAnalysisResult() {
}
/**
* 调用dll解析邮件
*/

8
jeecg-module-auto-process/src/main/java/org/jeecg/modules/spectrum/QcphdSpectrum.java
View File

@ -49,12 +49,4 @@ public class QcphdSpectrum extends S_D_Q_G_SpectrumHandler{
super.next.handler();
}
}
/**
* 处理分析结果
*/
@Override
protected void handlerAnalysisResult() {
}
}

2
jeecg-module-auto-process/src/main/java/org/jeecg/modules/spectrum/S_D_Q_G_SpectrumHandler.java
View File

@ -48,7 +48,7 @@ public abstract class S_D_Q_G_SpectrumHandler extends SpectrumHandler{
/**
* 基础数据
*/
private GardsSampleData sampleData;
protected GardsSampleData sampleData;
/**
* 前置检查

5
jeecg-module-auto-process/src/main/java/org/jeecg/modules/spectrum/SpectrumHandler.java
View File

@ -91,11 +91,6 @@ public abstract class SpectrumHandler extends Chain{
*/
protected abstract void handler() throws Exception;
/**
* 处理分析结果
*/
protected abstract void handlerAnalysisResult();
/**
* 调用dll解析邮件
*/

2
jeecg-module-auto-process/src/main/java/org/jeecg/modules/spectrum/SpectrumServiceQuotes.java
View File

@ -46,4 +46,6 @@ public class SpectrumServiceQuotes {
private final GardsSampleDataService sampleDataService;
private final GardsAnalysesService analysesService;
}