panbaolin/SourceTermAnalysisSystem_java
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

核素信息接口添加筛选条件

Browse Source
This commit is contained in:
duwenyuan 2025-10-17 19:16:09 +08:00
parent 98a5d1d78d
commit b1d3a0a09d
4 changed files with 40 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
jeecg-module-data-analyze/src/main/java/org/jeecg/controller/DataAnalysisController.java
View File

@ -135,7 +135,7 @@ public class DataAnalysisController {
public Result findStationList(String systemType) {
Result result = new Result();
try {
List<GardsStations> gardsStations = sampleStatAnalysisService.findStationListByMenuName();
List<GardsStations> gardsStations = sampleStatAnalysisService.findStationListByMenuName(systemType);
result.setCode(200);
result.setSuccess(true);
result.setResult(gardsStations);
@ -149,7 +149,7 @@ public class DataAnalysisController {
public Result findNuclideList(String systemType) {
Result result = new Result();
try {
List<SysDefaultNuclide> defaultNuclides = sampleStatAnalysisService.findNuclideList();
List<SysDefaultNuclide> defaultNuclides = sampleStatAnalysisService.findNuclideList(systemType);
result.setCode(200);
result.setSuccess(true);
result.setResult(defaultNuclides);

27
jeecg-module-data-analyze/src/main/java/org/jeecg/entity/SystemType.java Normal file
View File

@ -0,0 +1,27 @@
package org.jeecg.entity;
public enum SystemType {
/**
* 颗粒物
*/
PARTICULATE("P"),
/**
* β-γ
*/
BETA("B"),
/**
* γ
*/
GAMMA("G");
private String type;
SystemType(String type) {
this.type = type;
}
public String getType(){
return this.type;
}
}

4
jeecg-module-data-analyze/src/main/java/org/jeecg/service/ISampleStatAnalysisService.java
View File

@ -27,7 +27,7 @@ public interface ISampleStatAnalysisService extends IService<GardsSampleData> {
Result getNuclideActivityConcAnalyze(String sampleType, Integer[] stationIds, String nuclideName, Integer dataSource, Date startDate, Date endDate);
List<GardsStations> findStationListByMenuName();
List<SysDefaultNuclide> findNuclideList();
List<GardsStations> findStationListByMenuName(String systemType);
List<SysDefaultNuclide> findNuclideList(String systemType);
}

11
jeecg-module-data-analyze/src/main/java/org/jeecg/service/impl/SampleStatAnalysisService.java
View File

@ -436,7 +436,7 @@ public class SampleStatAnalysisService extends ServiceImpl<GardsSampleStatAnalys
}
@Override
public List<GardsStations> findStationListByMenuName() {
public List<GardsStations> findStationListByMenuName(String systemType) {
List<GardsStations> gardsStations = new LinkedList<>();
//获取台站信息
gardsStations = this.baseMapper.findStationListByMenuName();
@ -445,10 +445,17 @@ public class SampleStatAnalysisService extends ServiceImpl<GardsSampleStatAnalys
@Override
@DS("master")
public List<SysDefaultNuclide> findNuclideList() {
public List<SysDefaultNuclide> findNuclideList(String systemType) {
LambdaQueryWrapper<SysDefaultNuclide> queryWrapper = new LambdaQueryWrapper<>();
queryWrapper.eq(SysDefaultNuclide::getUseType, 4);
if (systemType.equals("B")) {
queryWrapper.eq(SysDefaultNuclide::getNuclideType, SystemType.BETA.getType());
} else if (systemType.equals("G")) {
queryWrapper.eq(SysDefaultNuclide::getNuclideType, SystemType.GAMMA.getType());
} else if (systemType.equals("P")) {
queryWrapper.eq(SysDefaultNuclide::getNuclideType, SystemType.PARTICULATE.getType());
}
List<SysDefaultNuclide> defaultNuclides = defaultNuclideMapper.selectList(queryWrapper);
return defaultNuclides;
}