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

788 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
qiaoqinzheng
7feca0fdef 修改beta模块saveToDB接口问题 
修改gamma模块saveToDB接口问题
修改beta模块saveToTXT,saveToExcel,saveToHtml问题
 2023-09-21 17:20:10 +08:00
nieziyan
699a8b068b fix：报警日志绑定当前报警规则,非最新规则 2023-09-21 16:05:20 +08:00
nieziyan
fd2c65209c Merge remote-tracking branch 'origin/station' into station 2023-09-21 14:08:34 +08:00
nieziyan
3201a13cc8 fix：记录报警日志缺少RuleId 2023-09-21 14:08:15 +08:00
xiaoguangbin
f7e8a4ed02 fix：优化header和title生成 2023-09-21 11:20:38 +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
panbaolin
89d24abd35 fix:1.修改从filesource跑文件生成报告是报错问题 2023-09-20 14:42:25 +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
orgin
8b924996c4 fix: gamma 自动处理 2023-09-19 15:54:58 +08:00
qiaoqinzheng
90fc91fcff GammaFileUtil新增格式化数组内容方法 
GammaServiceImpl修改RRR导出返回内容
 2023-09-19 12:49:54 +08:00
qiaoqinzheng
82674b613c PHDFileUtil移除多余分析结果返回代码 2023-09-19 11:13:51 +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
orgin
500387e88a Merge remote-tracking branch 'xiaoguangbin/station' into station 2023-09-19 08:55:11 +08:00
orgin
9e745b6d84 fix: gamma 自动处理 2023-09-19 08:55:05 +08:00
nieziyan
b1abdedf89 update：back 2023-09-18 20:29:00 +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
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