Commit Graph

783 Commits

Author SHA1 Message Date
panbaolin
ff6d8b9baa fix:1.修改所有能谱文件日志的sourcefile属性路径 2023-12-04 19:44:45 +08:00
nieziyan
3b062b2de8 Merge remote-tracking branch 'origin/station' into station 2023-12-01 21:00:14 +08:00
nieziyan
723c5a1706 feat:Database 各项统计信息采集 2023-12-01 20:49:59 +08:00
qiaoqinzheng
cece7bb5e6 人工交互分析gamma模块分析峰数据时,页面获取字段直接赋值到对应峰信息 2023-12-01 11:35:06 +08:00
nieziyan
312aebbc99 Merge remote-tracking branch 'origin/station' into station 2023-11-30 19:45:08 +08:00
nieziyan
ccf4d796ef feat:数据库统计 fix:bugs 2023-11-30 19:44:51 +08:00
orgin
5ba3fe7664 fix:删除无用配置 2023-11-30 17:25:16 +08:00
nieziyan
5f4d2f1d41 fix:优化状态监控,新增服务器状态监控 2023-11-29 19:10:10 +08:00
nieziyan
ba40f06460 Merge remote-tracking branch 'origin/station' into station 2023-11-28 18:36:09 +08:00
nieziyan
b4fae893cb fix:1.优化查询 2.异常预处理 2023-11-28 18:35:53 +08:00
qiaoqinzheng
8bdb7b57b1 人工交互分析gamma模块分析时无法读取到txt文件路径问题导致mapNucActMda数据错误问题
人工交互分析gamma模块CollectTime字段精度问题修改
2023-11-28 17:15:02 +08:00
qiaoqinzheng
9f8d730a6f 人工交互分析模块beta部分进入energyCalibration页面beta部分tab页E TO C公式计算参数修改
人工交互分析计算时间差值精度问题修改
台站运行管理时间间隔精度问题修改
2023-11-28 15:19:56 +08:00
nieziyan
b5775437e1 Merge remote-tracking branch 'origin/station' into station 2023-11-28 10:27:51 +08:00
nieziyan
1cdc481f18 fix:1.优化SQL 2.缓存Email Sender 2023-11-28 10:27:18 +08:00
qiaoqinzheng
73a4550b56 Merge remote-tracking branch 'origin/station' into station 2023-11-27 19:16:28 +08:00
qiaoqinzheng
810cc21732 gamma向数据库存储人工交互分析结果时24小时制问题修改
自动处理console文件标识增加
自动处理程序beta部分det,gas文件路径多\导致无法加载问题修改
beta,gamma存储数据库时台站没有权限时,提示哪个台站没有对应权限
2023-11-27 19:16:20 +08:00
nieziyan
aa82d70c40 Merge remote-tracking branch 'origin/station' into station 2023-11-27 17:04:25 +08:00
nieziyan
c349b9e2d8 feat:concAvg log 2023-11-27 17:04:01 +08:00
panbaolin
0756bddc6c fix:1.修改邮件解析源枚举 2023-11-27 10:26:51 +08:00
nieziyan
8044187299 Merge remote-tracking branch 'origin/station' into station
# Conflicts:
#	jeecg-boot-base-core/src/main/java/org/jeecg/common/email/EmailServiceManager.java
2023-11-24 17:25:16 +08:00
nieziyan
00b2036e6e fix:1.仅限企业Email查询配额信息2.SSl/非SSL邮箱兼容 2023-11-24 17:21:41 +08:00
panbaolin
5a2c670a10 fix:1.完成邮件解析日志功能2.修改邮件解析统计报告sql 3.修改能谱解析日志 2023-11-24 16:09:39 +08:00
qiaoqinzheng
fc89b36c95 gamma自动处理增加处理结束后删除临时文件相关代码
人工交互分析gamma模块saveToPHD文件名称修改
2023-11-24 11:13:47 +08:00
qiaoqinzheng
fb2517ccbc beta自动处理生成报告文件部分模块小数约分内容修改 2023-11-24 10:17:43 +08:00
nieziyan
dbff5a719b fix:完善Email Monitor 2023-11-23 19:13:35 +08:00
nieziyan
997f1af022 Merge remote-tracking branch 'origin/station' into station 2023-11-23 16:33:53 +08:00
nieziyan
5bd6ecb437 feat:email status monitor 2023-11-23 16:33:30 +08:00
qiaoqinzheng
b4f4939110 beta-gamma公用分析模块去除多余引入启动类相关maven 2023-11-23 15:30:15 +08:00
qiaoqinzheng
85ae1a7dce Merge remote-tracking branch 'origin/station' into station 2023-11-23 09:06:27 +08:00
qiaoqinzheng
87c90d5f14 自动处理程序beta相关代码生成ARR报告数字格式化修改
自动处理程序beta相关代码生成ARR报告公式相关文本内容修改
2023-11-23 09:06:20 +08:00
nieziyan
a732adbd92 Merge remote-tracking branch 'origin/station' into station 2023-11-22 18:28:37 +08:00
nieziyan
3377c6ba7b feat:Email&Database Status Monitor 2023-11-22 18:26:57 +08:00
qiaoqinzheng
dcfda8015b nacos请求生成access_log日志位置修改 2023-11-22 17:05:37 +08:00
qiaoqinzheng
6527e70adb 运行生成日志自动处理增加输出控制台信息相关配置
各系统程序错误日志生成位置修改,错误日志文件名称格式修改
2023-11-22 16:49:17 +08:00
qiaoqinzheng
6d8e267079 Merge remote-tracking branch 'origin/station' into station 2023-11-22 15:57:22 +08:00
qiaoqinzheng
7e0251f715 自动处理beta部分sample文件查询gas,det文件匹配全谱文件 2023-11-22 15:57:13 +08:00
orgin
3fb212a3ef fix:解决 calibration 为空数组执行 sql 报错问题 2023-11-22 15:34:59 +08:00
qiaoqinzheng
65ef853af3 Merge remote-tracking branch 'origin/station' into station 2023-11-22 09:12:15 +08:00
qiaoqinzheng
fa943742db web页面查看详情内容接口返回数据判断逻辑修改 2023-11-22 09:12:09 +08:00
nieziyan
0de89da6f6 fix:bug 2023-11-21 19:15:29 +08:00
nieziyan
5ab82f8883 Merge remote-tracking branch 'origin/station' into station 2023-11-21 18:41:37 +08:00
nieziyan
6f6f25e763 feat:Database Monitor 2023-11-21 18:41:12 +08:00
qiaoqinzheng
b3f9c7d3fb 修改自动处理程序gamma部分峰对应核素内容错误问题
修改自动处理程序gamma部分启动时缓存核素信息格式错误问题
修改自动处理程序gamma部分存储峰对应核素信息错误问题
2023-11-21 16:14:24 +08:00
qiaoqinzheng
39ef3f14c0 自动处理生成日志代码内容修改 2023-11-21 11:43:45 +08:00
xiaoguangbin
58fbc30eb3 fix: nucl_ided_Nucidename拼写错误,改为nucl_ided_Nuclidename 2023-11-21 09:12:36 +08:00
nieziyan
8e1b03cf7d Merge remote-tracking branch 'origin/station' into station 2023-11-20 19:12:56 +08:00
nieziyan
3b3b61eca5 feat:1.表空间使用率2.Database|Email Monitor 2023-11-20 19:12:32 +08:00
qiaoqinzheng
b66919fe5c 人工交互查询数据库增加判断如果读取出来的数据小于等于最小值则赋值-9999,否则正常赋值 2023-11-20 16:38:58 +08:00
qiaoqinzheng
2cdbc8fd85 人工交互查询数据库如果是空的赋值-9999,如果不是空的正常赋值 2023-11-20 16:34:48 +08:00
qiaoqinzheng
99c29c9e07 auto查询数据库数据时查询人工交互表问题修改 2023-11-20 16:28:29 +08:00