xiaoguangbin
|
7d0fddfc81
|
Revert "fix：解决Gamma default params表有空的value报错问题"
This reverts commit f41a8dad0c.
|
2023-09-24 21:53:37 +08:00 |
|
xiaoguangbin
|
f41a8dad0c
|
fix：解决Gamma default params表有空的value报错问题
|
2023-09-24 21:53:19 +08:00 |
|
qiaoqinzheng
|
0e4b4039e3
|
GammaController新增testFun测试dll分析方法
PHDFile新增userId,xmlFilePath字段
修改部分实体类内字段大小写问题
CalValuesHandler去掉多余的计算方法，新增实现analyseSpectrum方法
新增BaseCtrlStack实体类
|
2023-09-24 18:43:20 +08:00 |
|
orgin
|
9c9fbbb80e
|
fix: gamma分析进度通过 redis 订阅发送 webSocket 消息
|
2023-09-22 19:19:25 +08:00 |
|
qiaoqinzheng
|
6d64193002
|
gamma新增测试dll方法
|
2023-09-22 11:22:37 +08:00 |
|
qiaoqinzheng
|
50787c22fe
|
修改beta模块saveToDB接口问题
修改gamma模块saveToDB接口问题
修改beta模块saveToTXT,saveToExcel,saveToHtml问题
|
2023-09-21 17:20:34 +08:00 |
|
qiaoqinzheng
|
720e1bf975
|
修改beta模块saveToDB接口问题
修改gamma模块saveToDB接口问题
修改beta模块saveToTXT,saveToExcel,saveToHtml问题
|
2023-09-21 17:20:29 +08:00 |
|
qiaoqinzheng
|
7feca0fdef
|
修改beta模块saveToDB接口问题
修改gamma模块saveToDB接口问题
修改beta模块saveToTXT,saveToExcel,saveToHtml问题
|
2023-09-21 17:20:10 +08:00 |
|
nieziyan
|
5eb536c21d
|
Merge remote-tracking branch 'origin/station' into station
|
2023-09-20 19:20:14 +08:00 |
|
nieziyan
|
80f3a55812
|
feat：saveTo*
|
2023-09-20 19:19:56 +08:00 |
|
qiaoqinzheng
|
9bf98b819c
|
NameStandUtil移动到公用工具类中
修改Gamma模块下SaveToDB接口问题
|
2023-09-20 19:13:44 +08:00 |
|
qiaoqinzheng
|
bec2a892a1
|
GammaFileUtil修改文件内容获取错误问题
NameStandUtil修改文件路径错误问题
修改Gamma模块saveToDB接口
|
2023-09-20 17:13:23 +08:00 |
|
qiaoqinzheng
|
5e5474eb2f
|
Energy,Resolution,Efficiency功能的call增加判断
|
2023-09-20 16:29:31 +08:00 |
|
qiaoqinzheng
|
59d063d415
|
GammaController功能Energy Calibration,Resolution Calibration, Efficiency Calibration功能新增width字段进行计算
GammaController新增导入本地文件临时加载Energy Calibration,Resolution Calibration, Efficiency Calibration功能
|
2023-09-20 16:21:48 +08:00 |
|
nieziyan
|
f20fdb4271
|
Merge remote-tracking branch 'origin/station' into station
|
2023-09-19 20:11:25 +08:00 |
|
nieziyan
|
055147f72d
|
feat：back
|
2023-09-19 20:11:07 +08:00 |
|
qiaoqinzheng
|
90fc91fcff
|
GammaFileUtil新增格式化数组内容方法
GammaServiceImpl修改RRR导出返回内容
|
2023-09-19 12:49:54 +08:00 |
|
qiaoqinzheng
|
93c34a433f
|
auto模块GammaFileUtil报错解决
auto模块实体类包下新增StructInsertInput,StructInsertOutput,TablePeaks文件
auto模块移动CalVluesOut实体类位置
auto模块引入CalValuesHandler代码
auto模块引入ejml包
SpectrumAnalysisServiceImpl去掉多余返回内容
GammaServiceImpl修改Energy，Resolution，Efficiency模块返回内容问题
|
2023-09-19 11:12:51 +08:00 |
|
nieziyan
|
b4178e071a
|
Merge remote-tracking branch 'origin/station' into station
# Conflicts:
# jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/service/impl/SpectrumAnalysisServiceImpl.java
|
2023-09-18 20:07:52 +08:00 |
|
nieziyan
|
5835ef9543
|
feat：saveTo*
|
2023-09-18 19:58:08 +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 |
|
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
|
1b16ceca8f
|
feat：format
|
2023-09-13 17:08:37 +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
|
b7c256a044
|
新增SysUserColor实体类
GammaFileUtil部分颜色保持与用户存储颜色一致
GammaController新增主页面点击peakInformation接口
GammaController新增查询颜色配置信息接口
GammaController新增修改颜色配置信息接口
SpectrumAnalysisMapper增加新增ROIResults表数据sql
|
2023-09-13 10:50:44 +08:00 |
|
nieziyan
|
78d14289f4
|
feat：Beta RLR
|
2023-09-13 08:54:29 +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 |
|
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 |
|
nieziyan
|
61f328d577
|
feat：ExportFile
|
2023-09-06 20:07:10 +08:00 |
|
qiaoqinzheng
|
e82a59dd38
|
移动并修改vo实体类引入
实现gamma模块下saveToDB
|
2023-09-04 17:17:37 +08:00 |
|