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

gamma自动处理存储时部分字段数据是nan问题修改

Browse Source 
beta功能查询QC Result生成文件名称修改
This commit is contained in:
qiaoqinzheng 2023-11-20 16:05:28 +08:00
parent a86f4c384b
commit 842e2744e7
3 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
jeecg-module-beta-gamma-analyser/src/main/java/org/jeecg/common/util/GammaFileUtil.java
View File

@ -3430,8 +3430,8 @@ public class GammaFileUtil extends AbstractLogOrReport {
dvctUPPERTAIL.add(fileAnlyse.getVPeak().get(m).upperTail); dvctUPPERTAIL.add(fileAnlyse.getVPeak().get(m).upperTail);
dvctUPPERTAILALPHA.add(fileAnlyse.getVPeak().get(m).upperTailAlpha); dvctUPPERTAILALPHA.add(fileAnlyse.getVPeak().get(m).upperTailAlpha);
dvctBWWIDTHCHAN.add(fileAnlyse.getVPeak().get(m).BWWidthChan); dvctBWWIDTHCHAN.add(fileAnlyse.getVPeak().get(m).BWWidthChan);
dvctRECOILBETACHAN.add(fileAnlyse.getVPeak().get(m).recoilBetaChan.equalsIgnoreCase("nan")?Double.NaN:Double.valueOf(fileAnlyse.getVPeak().get(m).recoilBetaChan)); dvctRECOILBETACHAN.add(fileAnlyse.getVPeak().get(m).recoilBetaChan.equalsIgnoreCase("nan")?null:Double.valueOf(fileAnlyse.getVPeak().get(m).recoilBetaChan));
dvctRECOILDELTACHAN.add(fileAnlyse.getVPeak().get(m).recoilDeltaChan.equalsIgnoreCase("nan")?Double.NaN:Double.valueOf(fileAnlyse.getVPeak().get(m).recoilDeltaChan)); dvctRECOILDELTACHAN.add(fileAnlyse.getVPeak().get(m).recoilDeltaChan.equalsIgnoreCase("nan")?null:Double.valueOf(fileAnlyse.getVPeak().get(m).recoilDeltaChan));
dvctSTEPRAIO.add(fileAnlyse.getVPeak().get(m).stepRatio); dvctSTEPRAIO.add(fileAnlyse.getVPeak().get(m).stepRatio);
dvctBACKGROUNDAREA.add(fileAnlyse.getVPeak().get(m).backgroundArea); dvctBACKGROUNDAREA.add(fileAnlyse.getVPeak().get(m).backgroundArea);
dvctMEANBACKCOUNT.add(fileAnlyse.getVPeak().get(m).meanBackCount); dvctMEANBACKCOUNT.add(fileAnlyse.getVPeak().get(m).meanBackCount);

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

@ -1605,7 +1605,7 @@ public class SpectrumAnalysisServiceImpl extends AbstractLogOrReport implements
OutputStream fos = null; OutputStream fos = null;
try { try {
String fileName = sampleFileName.substring(0, sampleFileName.lastIndexOf(StringPool.DOT) - 1); String fileName = sampleFileName.substring(0, sampleFileName.lastIndexOf(StringPool.DOT) - 1);
fileName = fileName + "_QC Result.txt"; fileName = fileName + "_QC_Result.txt";
// 设置响应类型 // 设置响应类型
response.setContentType("application/octet-stream"); response.setContentType("application/octet-stream");
response.setHeader("Access-Control-Expose-Headers", "Content-Disposition"); response.setHeader("Access-Control-Expose-Headers", "Content-Disposition");

2
jeecg-module-station-operation/src/main/java/org/jeecg/common/CalculateStationData.java
View File

@ -814,8 +814,6 @@ public class CalculateStationData {
* @param stationInfos 台站信息列表 * @param stationInfos 台站信息列表
*/ */
public void mutiThreadGetStationInfo(List<StationInfo> stationInfos, RateParam mRateParam) { public void mutiThreadGetStationInfo(List<StationInfo> stationInfos, RateParam mRateParam) {
// 声明当前开始执行时间
Date startTime = new Date();
//声明一个数组用于接收最后的结果情况 //声明一个数组用于接收最后的结果情况
Map<String, StationInfo> finallySta = Objects.nonNull(redisUtil.get("dataStationInfoList"))? (Map<String, StationInfo>) redisUtil.get("dataStationInfoList"):new HashMap<>(); Map<String, StationInfo> finallySta = Objects.nonNull(redisUtil.get("dataStationInfoList"))? (Map<String, StationInfo>) redisUtil.get("dataStationInfoList"):new HashMap<>();
//声明一个线程池 //声明一个线程池