Commit Graph

168 Commits

Author SHA1 Message Date
nieziyan
d9731c97e9 feat:增加枚举 2023-09-28 11:16:05 +08:00
nieziyan
3386e05ee0 Merge remote-tracking branch 'origin/station' into station 2023-09-28 10:42:52 +08:00
nieziyan
0149c0b823 update:rename 2023-09-28 10:42:21 +08:00
xiaoguangbin
bbd35a11e8 fix:gamma自动处理lc等文件保存至ftp目录下之后 删除临时文件 2023-09-28 10:16:21 +08:00
xiaoguangbin
99c534c44d fix:邮箱连接测试log 2023-09-28 10:05:55 +08:00
xiaoguangbin
fba4ac0915 fix:寫入穩定格式化處理優化 2023-09-27 15:10:26 +08:00
xiaoguangbin
4492eb5902 fix:baseline等文件生成内容对齐优化 2023-09-26 22:34:04 +08:00
panbaolin
960b8be389 fix:1.修改B谱分析功能中存储报告路径去除文件后缀2.优化健康谱、报警谱日志功能3.添加获取邮件时可获取系统启动时间后的邮件功能逻辑 2023-09-25 19:22:49 +08:00
nieziyan
6b171b737d Merge remote-tracking branch 'origin/station' into station 2023-09-26 19:19:28 +08:00
nieziyan
b1d989c9cf feat:Server监控
fix:修改监控项同步策略
2023-09-26 19:19:01 +08:00
qiaoqinzheng
07e872718a GardsNuclLinesIded字段与数据库对应错误修改
Gamma页面save To DB接口部分存储失败修改
GammaFileUtil判断是否发生改变方法还原
2023-09-26 16:54:05 +08:00
xiaoguangbin
18d205e21b fix:gamma 自动处理 2023-09-26 11:01:53 +08:00
nieziyan
5b2ca8213b Merge remote-tracking branch 'origin/station' into station 2023-09-25 19:38:24 +08:00
nieziyan
37987f1bfa feat:Server监控 2023-09-25 19:38:07 +08:00
xiaoguangbin
fbd353ea39 fix:gamma 生成lc scac baseline工具優化 2023-09-25 19:00:37 +08:00
orgin
0ac2c77e27 fix: gamma LC SCAC Baseline 文件生成 2023-09-25 17:23:19 +08:00
qiaoqinzheng
f3406dabb4 SpecSetup修改实体类字段信息
UserTaskUtil新增查询用户信息方法
GammaController新增configureSave接口,实现Reprocessing接口
ConfigureData修改字段名称
2023-09-25 11:24:42 +08:00
qiaoqinzheng
0e4b4039e3 GammaController新增testFun测试dll分析方法
PHDFile新增userId,xmlFilePath字段
修改部分实体类内字段大小写问题
CalValuesHandler去掉多余的计算方法,新增实现analyseSpectrum方法
新增BaseCtrlStack实体类
2023-09-24 18:43:20 +08:00
nieziyan
51373c79d2 Merge remote-tracking branch 'origin/station' into station 2023-09-22 19:39:59 +08:00
nieziyan
f53f8e4dca feat:Server监控 2023-09-22 19:39:38 +08:00
orgin
9c9fbbb80e fix: gamma分析进度通过 redis 订阅发送 webSocket 消息 2023-09-22 19:19:25 +08:00
nieziyan
751c5d8cf2 Merge remote-tracking branch 'origin/station' into station 2023-09-21 20:49:45 +08:00
nieziyan
f984421fc1 feat:Server监控 2023-09-21 20:49:31 +08:00
qiaoqinzheng
6a90cfbc71 Merge remote-tracking branch 'origin/station' into station 2023-09-21 17:20:41 +08:00
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
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
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
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
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
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
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
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
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