xiaoguangbin/AnalysisSystemForRadionuclide
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
364 Commits 10 Branches 0 Tags 40 MiB
0d33209b60
Commit Graph

364 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
qiaoqinzheng
0d33209b60 GammaFileUtil查询数据库方法修改 2023-09-18 19:26:48 +08:00
orgin
a794d8f357 fix: 能谱log日志生成工具 2023-09-18 19:08:11 +08:00
orgin
e2598e14ef fix: 能谱log日志生产工具 2023-09-18 17:16:24 +08:00
panbaolin
cf39240cf0 fix:1.完成重新执行undeal文件夹里PHD文件功能2.完成重新执行filesource文件夹PHD文件功能 2023-09-18 15:18:30 +08:00
orgin
79e05be0e0 Merge remote-tracking branch 'xiaoguangbin/station' into station 2023-09-18 15:16:38 +08:00
orgin
674fc6f78b fix: 能谱log日志生产工具 2023-09-18 15:16:31 +08:00
qiaoqinzheng
0cfcd0bb72 fitting参数新增qcFi了Name,tabName进行区分数据并进行保存 
新声明一个本地缓存工具betaCache
PHDFileUtil文件保存路劲多出/符移除
GammaController新增保存Energy Calibration,Resolution Calibration,Efficiency Calibration数据接口
GammaController新增导出ARR报告接口
GammaController新增导出RRR报告接口
BgDataAnlyseResultIn实体类内容修改
 2023-09-18 14:57:37 +08:00
qiaoqinzheng
ed7493423b Merge remote-tracking branch 'origin/station' into station 2023-09-15 10:12:47 +08:00
qiaoqinzheng
6dde566838 beta功能saveToDB修改 
beta功能增加分析文件方法
gamma新增saveDataEnergy接口
 2023-09-15 10:12:37 +08:00
nieziyan
023ca06a9d Merge remote-tracking branch 'origin/station' into station 2023-09-15 10:06:17 +08:00
nieziyan
d8289d4d12 fix：Alarm 2023-09-15 10:05:31 +08:00
qiaoqinzheng
78ce76d6c3 zeroTime解析问题修改 2023-09-15 10:04:51 +08:00
nieziyan
8dc6922ff2 Merge remote-tracking branch 'origin/station' into station 2023-09-13 19:22:31 +08:00
nieziyan
17d73df309 feat：format 2023-09-13 19:22:14 +08:00
qiaoqinzheng
77178c6a61 Merge remote-tracking branch 'origin/station' into station 2023-09-13 19:21:30 +08:00
qiaoqinzheng
244c1645fd 查询用户是否对某个台站有过排班任务 
修改BgDataAnalyseResultIn实体类
saveToDB修改
 2023-09-13 19:21:23 +08:00
nieziyan
0ac87eb273 Merge remote-tracking branch 'origin/station' into station 2023-09-13 17:09:00 +08:00
nieziyan
1b16ceca8f feat：format 2023-09-13 17:08:37 +08:00
orgin
a06fbed52a fix: 修改 redis 初始化GardsNuclLinesLib数据 2023-09-13 16:34:28 +08:00
nieziyan
561533c6c3 Merge remote-tracking branch 'origin/station' into station 2023-09-13 15:33:23 +08:00
nieziyan
492795c445 fix：Gamma RLR 2023-09-13 15:33:09 +08:00
qiaoqinzheng
34ae278463 根据sampleFileName获取文件名称接口修改 
XeData返回内容增加flag字段数据
 2023-09-13 15:27:40 +08:00
qiaoqinzheng
5f7cc6be38 Merge remote-tracking branch 'origin/station' into station 2023-09-13 10:50:52 +08:00
qiaoqinzheng
b7c256a044 新增SysUserColor实体类 
GammaFileUtil部分颜色保持与用户存储颜色一致
GammaController新增主页面点击peakInformation接口
GammaController新增查询颜色配置信息接口
GammaController新增修改颜色配置信息接口
SpectrumAnalysisMapper增加新增ROIResults表数据sql
 2023-09-13 10:50:44 +08:00
panbaolin
61da5a5c50 fix:1.优化存储邮件解析日志功能2.修改原始库、分析库数据存储条件3.修改统一异常报错处理逻辑 2023-09-13 10:24:28 +08:00
orgin
c9fed16807 fix:修改变量类型 2023-09-13 09:17:54 +08:00
orgin
46a1be1479 fix:修改变量类型 2023-09-13 09:16:31 +08:00
nieziyan
ae2dfc2697 Merge remote-tracking branch 'origin/station' into station 2023-09-13 08:54:44 +08:00
nieziyan
78d14289f4 feat：Beta RLR 2023-09-13 08:54:29 +08:00
panbaolin
6390dc224a fix:1.完成B分析生成报告功能 2023-09-12 15:16:20 +08:00
nieziyan
3707146ad2 Merge remote-tracking branch 'origin/station' into station 2023-09-12 10:25:17 +08:00
nieziyan
7b9ce715fb fix：Bug Fix 2023-09-12 10:10:01 +08:00
qiaoqinzheng
66013338fe SpectrumAnalysisMapper.xml方法名getUserNuclideNames错误修改 2023-09-12 10:04:00 +08:00
qiaoqinzheng
b4e0bd30e7 NameStandUtil文件名称日期格式的小数部分规则修改 2023-09-12 09:22:47 +08:00
nieziyan
f74a2a8358 fix：Bug Fix 2023-09-11 22:11:13 +08:00
nieziyan
136920dfeb fix：Code Merge 2023-09-11 19:46:08 +08:00
nieziyan
21a706a263 Merge remote-tracking branch 'origin/station' into station 
# Conflicts:
#	jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/service/ISpectrumAnalysisService.java
#	jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/service/impl/SpectrumAnalysisServiceImpl.java
 2023-09-11 19:28:30 +08:00
nieziyan
46f3299f07 feat：RLR Export 2023-09-11 19:20:09 +08:00
qiaoqinzheng
881f8664da beta增加文件名称等传参 
GammaController新增initValue接口，修改查看Energy Calibration数据，修改查看Resolution Calibration数据
AnalyseData修改dbName为dbNames，新增sampleFileNames,gasFileNames,detFileNames字段
StatisticsQueryData新增detectorId字段
BgDataAnlyseResultIn新增bProcessed字段
新增RRRLogInfo实体类
GardsCalibrationPairsSpectrum,GardsCalibrationSpectrum,GardsROIChannelSpectrum新增dataType字段
getDetectorList新增返回字段detectorId
 2023-09-11 19:18:44 +08:00
nieziyan
d98a4de4b1 feat：RLR Export 2023-09-09 17:23:31 +08:00
nieziyan
c9ccba3a7e fix：分页Bug 
feat：模板文件
 2023-09-08 11:32:18 +08:00
nieziyan
609852532a fix：.gitignore 2023-09-07 20:09:42 +08:00
nieziyan
72b017a650 feat：Export Excel 2023-09-07 19:04:39 +08:00
qiaoqinzheng
5cc898bf83 gammaController层增加方法注解 
实现InteractiveTool页面新增行数确定新增接口
实现InteractiveTool页面delete按钮
实现Config User Library页面save按钮
实现InteractiveTool页面增加核素信息接口
实现InteractiveTool页面删除核素信息接口
实现InteractiveTool页面查看峰对应备注信息接口
实现InteractiveTool页面add峰对应备注信息接口
实现InteractiveTool页面查看备注信息接口
实现InteractiveTool页面add备注信息接口
查看Gamma Viewer Log页面数据修改接口内容
DBUtil存放位置修改
GammaFileUtil增加InitPeakTable方法
GammaFileUtil增加CalcNuclideMDA方法
GammaFileUtil增加ReCalcMdaMdc方法
NameStandUtil方法内容修改
PHDFileUtil新增FileNameByStandardForm方法
PHDFileUtil新增GetMatchFile方法
PHDFileUtil新增GetQCPHD方法
PeakInfo实体类comments增加默认赋值
新增AcceptInfo，AnalyseBetaInfo，CommentsInfo，NuclideInfo，UserLibraryInfo实体类
修改GardsXeResultsSpectrum实体类
新增deleteNuclidesByUserName方法
 2023-09-07 16:54:40 +08:00
qiaoqinzheng
868f0b7a93 Merge remote-tracking branch 'origin/station' into station 2023-09-07 15:03:40 +08:00
qiaoqinzheng
d1dcb4b5cc logMange树形结构问题修改 2023-09-07 15:03:31 +08:00
panbaolin
919bae79f7 fix:1.完成B分析功能数据存储功能 2023-09-07 09:32:26 +08:00
nieziyan
61f328d577 feat：ExportFile 2023-09-06 20:07:10 +08:00
nieziyan
a210b75205 feat：Sample_G_Analysis 2023-09-05 22:37:09 +08:00
nieziyan
fb4b563aee fix：NullPointException 2023-09-05 16:23:12 +08:00