Commit Graph

285 Commits

Author SHA1 Message Date
nieziyan
cb7449fcd6 feat:运管监控服务调用 2023-12-11 18:54:56 +08:00
nieziyan
ecac7a9240 fix:Analysis log搜索 2023-12-08 18:17:35 +08:00
nieziyan
fc1f6b20f5 fix:Analysis log 2023-12-08 14:08:14 +08:00
nieziyan
ad6fdb06ed Merge remote-tracking branch 'origin/station' into station 2023-12-07 19:02:30 +08:00
nieziyan
263d014cc1 feat:完善Monitor 2023-12-07 19:01:54 +08:00
panbaolin
7a1aa66027 Merge branch 'station' of http://git.hivekion.com:3000/xiaoguangbin/AnalysisSystemForRadionuclide into station 2023-12-07 08:44:52 +08:00
panbaolin
68460340d5 fix:1.修改邮件过程日志功能,解决并发情况下有些日志不能正确写入问题 2023-12-07 08:44:32 +08:00
nieziyan
d24be7eda1 fix:数据采集 2023-12-06 17:12:08 +08:00
qiaoqinzheng
9f64646c77 人工交互分析gamma重新分析峰数据调用算法部分代码修改,dll改为调用http服务的方式 2023-12-05 09:22:34 +08:00
nieziyan
723c5a1706 feat:Database 各项统计信息采集 2023-12-01 20:49:59 +08:00
nieziyan
ccf4d796ef feat:数据库统计 fix:bugs 2023-11-30 19:44:51 +08:00
nieziyan
5f4d2f1d41 fix:优化状态监控,新增服务器状态监控 2023-11-29 19:10:10 +08:00
nieziyan
b4fae893cb fix:1.优化查询 2.异常预处理 2023-11-28 18:35:53 +08:00
nieziyan
1cdc481f18 fix:1.优化SQL 2.缓存Email Sender 2023-11-28 10:27:18 +08:00
nieziyan
c349b9e2d8 feat:concAvg log 2023-11-27 17:04:01 +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
nieziyan
dbff5a719b fix:完善Email Monitor 2023-11-23 19:13:35 +08:00
nieziyan
5bd6ecb437 feat:email status monitor 2023-11-23 16:33:30 +08:00
nieziyan
3377c6ba7b feat:Email&Database Status Monitor 2023-11-22 18:26:57 +08:00
nieziyan
0de89da6f6 fix:bug 2023-11-21 19:15:29 +08:00
nieziyan
6f6f25e763 feat:Database Monitor 2023-11-21 18:41:12 +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
a3dee8432c beta功能statistics返回数据格式修改
beta功能全部分析结果赋值问题修改
2023-11-17 17:27:48 +08:00
qiaoqinzheng
ce637d74b4 Merge remote-tracking branch 'origin/station' into station 2023-11-16 17:01:22 +08:00
qiaoqinzheng
537b013f14 gamma功能导出RRR报告内容部分对不齐问题修改 2023-11-16 17:01:13 +08:00
nieziyan
a5e0c6dd60 Merge remote-tracking branch 'origin/station' into station 2023-11-16 16:05:38 +08:00
nieziyan
58db07b591 feat:qiyeEmail账号信息 2023-11-16 16:04:56 +08:00
qiaoqinzheng
12bdd63d4b beta功能分析Statistics页面内容增加xeResultFlag查询过滤条件
gamma功能核素相关内容查询速度优化
2023-11-16 15:33:54 +08:00
nieziyan
ea129e94ab Merge remote-tracking branch 'origin/station' into station 2023-11-15 11:42:47 +08:00
nieziyan
99fe2ef8b7 fix:1.公式2.tableInfo 2023-11-15 11:42:19 +08:00
qiaoqinzheng
f94c24cc78 beta人工交互分析数据库加载接口增加字段analyst 2023-11-15 09:49:18 +08:00
nieziyan
4ef79c1a2b Merge remote-tracking branch 'origin/station' into station 2023-11-14 18:59:11 +08:00
nieziyan
a970060ad5 fix:1.RRR公式修正 2.TableInfo重构 2023-11-14 18:58:49 +08:00
qiaoqinzheng
65c15847b0 web模块下载zip文件功能其他谱文件下载修改 2023-11-14 18:06:58 +08:00
qiaoqinzheng
bbfd2c477b beta功能查询条件数据接口参数内容修改,返回当前用户当天关注台站及探测器信息,勾选allUser返回全部台站,探测器信息
gamma功能加载主页面数据接口增加字段analyst获取对应分析员的分析结果
web模块增加downloadFile方法用于下载sample及sample相关分析谱文件
mapper类缺少注解问题修改
2023-11-14 14:58:57 +08:00
qiaoqinzheng
f2f9eb49f3 PeakInfo删除多余复制实体类 2023-11-13 15:41:19 +08:00
qiaoqinzheng
329e6859b9 Merge remote-tracking branch 'origin/station' into station 2023-11-13 10:41:06 +08:00
qiaoqinzheng
4487f91705 gamma功能数据库加载数据null问题修改
gamma功能peak的recoilBetaChan,recoilDeltaChan参数默认赋值nan
beta生成RRR报告old数据颠倒
2023-11-13 10:40:05 +08:00
nieziyan
75253d81db Merge remote-tracking branch 'origin/station' into station 2023-11-10 20:17:57 +08:00
nieziyan
862db91080 fix:重新编写save 2023-11-10 20:17:24 +08:00
panbaolin
c4ba5341c3 fix:1.完成统计报告功能 2023-11-10 14:18:25 +08:00
nieziyan
f39dc57682 Merge remote-tracking branch 'origin/station' into station 2023-11-10 08:44:02 +08:00
nieziyan
dfe683e59e feat:PostGreSql 2023-11-10 08:43:38 +08:00
qiaoqinzheng
702b4c3d0f beta重新分析原有数据影响现有数据问题修改
beta重新分析方法修改
beta生成日志报告内容和原程序对不上的部分进行小数约分修改
gamma功能计算核素信息部分数据对应错误修改
gamma功能生成报告,生成日志部分内容小数约分修改,页面展示字段内容修改
2023-11-09 17:22:04 +08:00
qiaoqinzheng
2c28a746f5 gamma最大值是-9999的情况下替换成inf
生成报告根据最大宽度切割时,丢失最后一条数据问题修改
2023-11-08 17:03:53 +08:00
qiaoqinzheng
e937652cc1 Merge remote-tracking branch 'origin/station' into station 2023-11-08 16:48:34 +08:00
qiaoqinzheng
0b4f395673 beta功能生成RRR报告修改
gamma功能生成RRR报告缺少空白行问题修改
2023-11-08 16:48:28 +08:00