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

Merge remote-tracking branch 'origin/SelfStation' into SelfStation

Browse Source
This commit is contained in:
xiaoguangbin 2024-07-19 15:34:23 +08:00
commit 90ecbfe99b
3 changed files with 39 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/controller/SelfStationController.java
View File

@ -309,4 +309,10 @@ public class SelfStationController {
public Result configureSave(@RequestBody ConfigureData configureData, HttpServletRequest request) {
return selfStationService.configureSave(configureData, request);
}
@GetMapping("viewSpectrum")
@ApiOperation(value = "查看Spectrum数据", notes = "查看Spectrum数据")
public Result viewSpectrum(String fileName, HttpServletRequest request) {
return selfStationService.viewSpectrum(fileName, request);
}
}

2
jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/service/ISelfStationService.java
View File

@ -106,4 +106,6 @@ public interface ISelfStationService {
Result configure(String fileName, HttpServletRequest request);
Result configureSave(ConfigureData configureData, HttpServletRequest request);
Result viewSpectrum(String fileName, HttpServletRequest request);
}

31
jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/service/impl/SelfStationServiceImpl.java
View File

@ -2,6 +2,7 @@ package org.jeecg.modules.service.impl;
import cn.hutool.core.collection.ListUtil;
import cn.hutool.core.date.DateUtil;
import cn.hutool.core.io.FileUtil;
import cn.hutool.core.util.ObjectUtil;
import cn.hutool.core.util.StrUtil;
import com.alibaba.fastjson.JSON;
@ -3301,6 +3302,36 @@ public class SelfStationServiceImpl implements ISelfStationService {
return result;
}
@Override
public Result viewSpectrum(String fileName, HttpServletRequest request) {
Result result = new Result();
//获取用户名
String userName = JwtUtil.getUserNameByToken(request);
//读取本地缓存
Cache<String, SelfStationData> selfCache = selfStationCache.getSelfCache();
SelfStationData selfStationData = selfCache.getIfPresent(fileName + StringPool.DASH + userName);
if (Objects.isNull(selfStationData)) {
result.error500("Please select the parse file first！");
return result;
}
Map<String, List<String>> map = new HashMap<>();
if(FileUtil.exist(selfStationData.getSampleTmpPath())) {
List<String> lines = FileUtil.readUtf8Lines(selfStationData.getSampleTmpPath());
map.put("sample", lines);
}
if(FileUtil.exist(selfStationData.getDetTmpPath())) {
List<String> lines = FileUtil.readUtf8Lines(selfStationData.getDetTmpPath());
map.put("detBg", lines);
}
if (FileUtil.exist(selfStationData.getQcTmpPath())) {
List<String> lines = FileUtil.readUtf8Lines(selfStationData.getQcTmpPath());
map.put("qc", lines);
}
result.setSuccess(true);
result.setResult(map);
return result;
}
/**
* 执行gamma分析
* @param phd gamma 数据