Commit Graph

624 Commits

Author SHA1 Message Date
xiaoguangbin
41536737d8 fix:gamma 自动处理解决calibration插入问题;前端无法渲染数据问题 2023-09-26 18:43:43 +08:00
qiaoqinzheng
07e872718a GardsNuclLinesIded字段与数据库对应错误修改
Gamma页面save To DB接口部分存储失败修改
GammaFileUtil判断是否发生改变方法还原
2023-09-26 16:54:05 +08:00
qiaoqinzheng
ab2506e5c1 Merge remote-tracking branch 'origin/station' into station 2023-09-26 15:23:53 +08:00
qiaoqinzheng
f41b378856 GammaController新增addComment方法
修改分析后结果赋值问题
2023-09-26 15:23:47 +08:00
xiaoguangbin
18d205e21b fix:gamma 自动处理 2023-09-26 11:01:53 +08:00
qiaoqinzheng
a0c1a335ee 修改解析方法返回内容的解析方式 2023-09-26 10:16:45 +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
16decebdb9 Merge remote-tracking branch 'origin/station' into station 2023-09-25 19:00:52 +08:00
xiaoguangbin
fbd353ea39 fix:gamma 生成lc scac baseline工具優化 2023-09-25 19:00:37 +08:00
panbaolin
2845a41af7 fix:1.修改B谱分析功能中分析结束时间、日志路径信息没有正确存到库里面的问题 2023-09-25 18:44:51 +08:00
orgin
0ac2c77e27 fix: gamma LC SCAC Baseline 文件生成 2023-09-25 17:23:19 +08:00
qiaoqinzheng
bb2822a25a GammaController分析方法获取返回数据方式修改,testFun接口内容修改 2023-09-25 17:16:30 +08:00
qiaoqinzheng
f3406dabb4 SpecSetup修改实体类字段信息
UserTaskUtil新增查询用户信息方法
GammaController新增configureSave接口,实现Reprocessing接口
ConfigureData修改字段名称
2023-09-25 11:24:42 +08:00
panbaolin
3ce210b557 fix:1.修改B谱日志写入文件bug 2023-09-25 09:26:57 +08:00
xiaoguangbin
efc9261331 fix:解决Gamma default params表有空的value报错问题 2023-09-24 21:54:21 +08:00
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
panbaolin
c49318a57f fix:1.完成自动处理B分析日志功能2.优化自动处理功能结构测试B分析日志功能 2023-09-22 22:51:44 +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
orgin
2d0ea1e754 fix: gamma自动处理 2023-09-22 17:17:59 +08:00
orgin
e08f3d4208 delete:nameStandUtil 2023-09-22 13:52:12 +08:00
orgin
e32e1085f1 delete 2023-09-22 13:49:55 +08:00
qiaoqinzheng
6d64193002 gamma新增测试dll方法 2023-09-22 11:22:37 +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
orgin
93b3d4db56 fix: 优化ReadBaseCtrlInfo方法 2023-09-21 19:59:45 +08:00
orgin
7e1839ebc0 fix: 优化ReadBaseCtrlInfo方法 2023-09-21 19:58:46 +08:00
orgin
03954a4d2a Merge remote-tracking branch 'xiaoguangbin/station' into station
# Conflicts:
#	jeecg-module-spectrum-analysis/src/main/java/org/jeecg/common/util/GammaFileUtil.java
2023-09-21 19:56:16 +08:00
orgin
e314d1b149 fix: 优化ReadBaseCtrlInfo方法 2023-09-21 19:55:26 +08:00
qiaoqinzheng
6a90cfbc71 Merge remote-tracking branch 'origin/station' into station 2023-09-21 17:20:41 +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
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