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 |
|
panbaolin
|
6f9abda53f
|
Merge branch 'station' of http://git.hivekion.com:3000/xiaoguangbin/AnalysisSystemForRadionuclide into station
|
2023-09-27 10:38:19 +08:00 |
|
xiaoguangbin
|
bbd35a11e8
|
fix：gamma自动处理lc等文件保存至ftp目录下之后 删除临时文件
|
2023-09-28 10:16:21 +08:00 |
|
xiaoguangbin
|
c05c8f4b68
|
fix：gamma自动处理修改log路径
|
2023-09-28 10:11:47 +08:00 |
|
xiaoguangbin
|
0cb00dcb42
|
Merge remote-tracking branch 'origin/station' into station
|
2023-09-28 10:06:10 +08:00 |
|
xiaoguangbin
|
99c534c44d
|
fix：邮箱连接测试log
|
2023-09-28 10:05:55 +08:00 |
|
qiaoqinzheng
|
e012393bb1
|
Beta保存时qc文件路径不存在导致空问题修改
|
2023-09-28 10:04:30 +08:00 |
|
xiaoguangbin
|
fba4ac0915
|
fix：寫入穩定格式化處理優化
|
2023-09-27 15:10:26 +08:00 |
|
panbaolin
|
4faf2c198c
|
fix:1.修改日志路径保存时不包含log前缀
|
2023-09-27 10:38:02 +08:00 |
|
xiaoguangbin
|
59cc54cf24
|
fix：service
|
2023-09-27 08:54:25 +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 |
|
xiaoguangbin
|
f4dd3111d9
|
Merge remote-tracking branch 'origin/station' into station
|
2023-09-26 18:44:05 +08:00 |
|
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 |
|