Merge remote-tracking branch 'origin/SelfStation' into SelfStation
This commit is contained in:
commit
90ecbfe99b
|
@ -309,4 +309,10 @@ public class SelfStationController {
|
||||||
public Result configureSave(@RequestBody ConfigureData configureData, HttpServletRequest request) {
|
public Result configureSave(@RequestBody ConfigureData configureData, HttpServletRequest request) {
|
||||||
return selfStationService.configureSave(configureData, 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);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -106,4 +106,6 @@ public interface ISelfStationService {
|
||||||
Result configure(String fileName, HttpServletRequest request);
|
Result configure(String fileName, HttpServletRequest request);
|
||||||
|
|
||||||
Result configureSave(ConfigureData configureData, HttpServletRequest request);
|
Result configureSave(ConfigureData configureData, HttpServletRequest request);
|
||||||
|
|
||||||
|
Result viewSpectrum(String fileName, HttpServletRequest request);
|
||||||
}
|
}
|
||||||
|
|
|
@ -2,6 +2,7 @@ package org.jeecg.modules.service.impl;
|
||||||
|
|
||||||
import cn.hutool.core.collection.ListUtil;
|
import cn.hutool.core.collection.ListUtil;
|
||||||
import cn.hutool.core.date.DateUtil;
|
import cn.hutool.core.date.DateUtil;
|
||||||
|
import cn.hutool.core.io.FileUtil;
|
||||||
import cn.hutool.core.util.ObjectUtil;
|
import cn.hutool.core.util.ObjectUtil;
|
||||||
import cn.hutool.core.util.StrUtil;
|
import cn.hutool.core.util.StrUtil;
|
||||||
import com.alibaba.fastjson.JSON;
|
import com.alibaba.fastjson.JSON;
|
||||||
|
@ -3301,6 +3302,36 @@ public class SelfStationServiceImpl implements ISelfStationService {
|
||||||
return result;
|
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分析
|
* 执行gamma分析
|
||||||
* @param phd gamma 数据
|
* @param phd gamma 数据
|
||||||
|
|
Loading…
Reference in New Issue
Block a user