fix:
This commit is contained in:
parent
b50cf9325b
commit
7a17501078
|
@ -2,12 +2,15 @@ package org.jeecg.modules.spectrum;
|
||||||
|
|
||||||
import cn.hutool.core.util.StrUtil;
|
import cn.hutool.core.util.StrUtil;
|
||||||
import org.jeecg.common.constant.Setting;
|
import org.jeecg.common.constant.Setting;
|
||||||
|
import org.jeecg.modules.base.entity.configuration.GardsNuclLinesLib;
|
||||||
import org.jeecg.modules.base.vo.PHDFile;
|
import org.jeecg.modules.base.vo.PHDFile;
|
||||||
import org.jeecg.modules.base.vo.SpecSetup;
|
import org.jeecg.modules.base.vo.SpecSetup;
|
||||||
|
import org.jeecg.modules.service.GardsAnalysesService;
|
||||||
import org.jeecg.modules.service.IGardsGammaDefaultParamsService;
|
import org.jeecg.modules.service.IGardsGammaDefaultParamsService;
|
||||||
import org.springframework.beans.factory.annotation.Autowired;
|
import org.springframework.beans.factory.annotation.Autowired;
|
||||||
import org.springframework.stereotype.Component;
|
import org.springframework.stereotype.Component;
|
||||||
|
|
||||||
|
import java.util.List;
|
||||||
import java.util.Map;
|
import java.util.Map;
|
||||||
|
|
||||||
@Component
|
@Component
|
||||||
|
@ -16,6 +19,9 @@ public class Prepare_G_Analysis {
|
||||||
@Autowired
|
@Autowired
|
||||||
private IGardsGammaDefaultParamsService gammaDefaultParamsService;
|
private IGardsGammaDefaultParamsService gammaDefaultParamsService;
|
||||||
|
|
||||||
|
@Autowired
|
||||||
|
private GardsAnalysesService analysesService;
|
||||||
|
|
||||||
public PHDFile getSettingFromDB(String systemType){
|
public PHDFile getSettingFromDB(String systemType){
|
||||||
Map<String, String> mapSetting = gammaDefaultParamsService.mapSetting();
|
Map<String, String> mapSetting = gammaDefaultParamsService.mapSetting();
|
||||||
PHDFile phdFile = new PHDFile();
|
PHDFile phdFile = new PHDFile();
|
||||||
|
@ -70,4 +76,17 @@ public class Prepare_G_Analysis {
|
||||||
setting.setRiskLevelK(Double.parseDouble(RiskLevelK));
|
setting.setRiskLevelK(Double.parseDouble(RiskLevelK));
|
||||||
return phdFile;
|
return phdFile;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public Map<String, List<GardsNuclLinesLib>> getNuclideLinesG(){
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
|
||||||
|
public Map<String,List<GardsNuclLinesLib>> getNuclideLinesP(){
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
|
||||||
|
public void saveAnalysis(){
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
|
@ -27,7 +27,7 @@ public class Sample_G_Analysis {
|
||||||
init();
|
init();
|
||||||
String systemType = energySpectrumStruct.system_type;
|
String systemType = energySpectrumStruct.system_type;
|
||||||
PHDFile phdFile = prepareGAnalysis.getSettingFromDB(systemType);
|
PHDFile phdFile = prepareGAnalysis.getSettingFromDB(systemType);
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
private void init(){
|
private void init(){
|
||||||
|
|
|
@ -51,4 +51,6 @@ public class SysDefaultNuclideController extends JeecgController<SysDefaultNucli
|
||||||
public Result<?> add(@RequestBody List<SysDefaultNuclide> nuclides) {
|
public Result<?> add(@RequestBody List<SysDefaultNuclide> nuclides) {
|
||||||
return service.add(nuclides);
|
return service.add(nuclides);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue
Block a user