Commit Graph

1078 Commits

Author SHA1 Message Date
panbaolin
26f16fc210 Merge branch 'station' of http://git.hivekion.com:3000/xiaoguangbin/AnalysisSystemForRadionuclide into station 2023-08-30 17:18:22 +08:00
panbaolin
81b4ebb878 fix:1.添加分析库service 2023-08-30 17:13:27 +08:00
nieziyan
dc6ef1a3c4 fix:完善 2023-08-30 16:29:28 +08:00
nieziyan
c2f303b5fb Merge remote-tracking branch 'origin/station' into station 2023-08-29 09:13:03 +08:00
nieziyan
68d113f0ab feat:谱文件排序 2023-08-29 09:12:45 +08:00
qiaoqinzheng
d6f40d1025 Merge remote-tracking branch 'origin/station' into station 2023-08-28 17:14:52 +08:00
qiaoqinzheng
1164b9c9ea 台站运行管理查询有效率接口新增used返回字段内容 2023-08-28 17:14:36 +08:00
panbaolin
376be83157 Merge branch 'station' of http://git.hivekion.com:3000/xiaoguangbin/AnalysisSystemForRadionuclide into station 2023-08-28 16:45:42 +08:00
panbaolin
b44497f968 fix:1.优化代码中文件路径、换行符等代码换成常量及系统API提高可移植性 2023-08-28 16:45:21 +08:00
nieziyan
ebf03f6949 Merge remote-tracking branch 'origin/station' into station 2023-08-28 16:09:36 +08:00
nieziyan
c6cf8e8570 feat:谱文件 2023-08-28 16:09:08 +08:00
qiaoqinzheng
101c851b34 新增ComputePeakRange方法 2023-08-28 15:14:56 +08:00
qiaoqinzheng
fc757f9f3e 新增insertPeaks方法
新增calFitPara方法
2023-08-28 15:12:23 +08:00
panbaolin
81a0ccf569 fix:1.优化ftp工具结构,每个线程内只打开一次ftp,使用完毕关闭ftp
2.完成各能谱正常情况下执行步骤日志存储
2023-08-27 14:22:20 +08:00
nieziyan
2ffe64f352 Merge remote-tracking branch 'origin/station' into station 2023-08-24 17:07:36 +08:00
nieziyan
736210780b feat:谱文件上传 2023-08-24 17:07:19 +08:00
orgin
77701a5d2b feat:nacos pgsql数据库表结构 2023-08-23 15:09:39 +08:00
orgin
eb726a9061 Merge remote-tracking branch 'origin/station' into station 2023-08-23 15:06:49 +08:00
orgin
d0a088791f feat:解决nacos 无法持久化到 pgsql的问题 2023-08-23 15:06:37 +08:00
nieziyan
24910d27f4 Merge remote-tracking branch 'origin/station' into station 2023-08-22 16:53:38 +08:00
nieziyan
77bea6bda4 feat:持久化监控项 2023-08-22 16:52:26 +08:00
qiaoqinzheng
b0925663ab 自动处理相关配置信息增加日志路径
新增公用实体类GardsNuclLinesLib
新增实体类LocalCache缓存信息到本地jvm
新增实体类分别处理对应数据
实现查询InteractiveTool,ZeroTime,Korsum,KorSumInput,energyCalibration,resolutionCalibration,EfficiencyCalibration,NuclideLibrary,configUserLibrary,viewComment,peakInformation,viewARR,viewRRR,radionuclideActivity,Spectrum,sampleInformation,viewQCResult,viewRLR,viewAutomaticAnalysisLog,viewGammaviewerLog接口
2023-08-21 16:46:29 +08:00
nieziyan
72a8d901ea Merge remote-tracking branch 'origin/station' into station 2023-08-18 17:10:54 +08:00
nieziyan
2a8ccef920 feat:完善 2023-08-18 17:10:34 +08:00
orgin
9b9af8a481 feat:解决定时器启动时卡死问题 2023-08-18 17:07:59 +08:00
panbaolin
d39247d991 fix:1.完成各能谱原始库数据存储、原始eml邮件存储、能谱文件存储、邮件日志存储 2023-08-18 11:10:19 +08:00
nieziyan
da69a39e95 feat:后端接口 2023-08-17 20:24:10 +08:00
qiaoqinzheng
2bc6d4352b Merge remote-tracking branch 'origin/station' into station 2023-08-16 08:55:48 +08:00
qiaoqinzheng
b58fa3dceb 新增information实体类 2023-08-16 08:55:39 +08:00
nieziyan
5fd4e44a6c Merge remote-tracking branch 'origin/station' into station 2023-08-16 08:48:09 +08:00
nieziyan
29ecd492e9 feat:预警结果保存|通知 2023-08-16 08:47:46 +08:00
qiaoqinzheng
cef2f3d410 Merge remote-tracking branch 'origin/station' into station 2023-08-14 14:34:21 +08:00
qiaoqinzheng
0b7a03f283 该峰处的探测效率不确定度字段名称修改
关闭流修改
2023-08-14 14:34:09 +08:00
nieziyan
cdfdbc374a Merge remote-tracking branch 'origin/station' into station 2023-08-11 18:37:48 +08:00
nieziyan
321e0e19bd feat:分析结果预警 2023-08-11 18:37:07 +08:00
qiaoqinzheng
ff969e71a4 Merge remote-tracking branch 'origin/station' into station 2023-08-10 08:47:47 +08:00
qiaoqinzheng
08d2602c69 实现公式计算新的曲线接口
新增获取gamma对应count数据接口
新增gamma页面查询DB接口返回折线图接口
实现configure按钮接口
2023-08-10 08:47:39 +08:00
nieziyan
ba319f5246 Merge remote-tracking branch 'origin/station' into station 2023-08-04 16:03:29 +08:00
nieziyan
f4167456b7 feat:分析结果预警 2023-08-04 16:03:03 +08:00
orgin
cf0888d172 feat:增加 系统管理-核素默认配置分页查询接口 2023-08-04 15:59:08 +08:00
qiaoqinzheng
614e0205d0 Merge remote-tracking branch 'origin/station' into station 2023-08-02 10:36:07 +08:00
qiaoqinzheng
1e9c2b156d 计算台站数据的质量 2023-08-02 10:36:00 +08:00
nieziyan
694162ed78 Merge remote-tracking branch 'origin/station' into station 2023-08-01 21:28:53 +08:00
nieziyan
8e9f2fc4e1 update:完善 2023-08-01 21:28:36 +08:00
qiaoqinzheng
23265b3046 根据新的参数计算新的曲线数据接口实现 2023-08-01 17:15:46 +08:00
qiaoqinzheng
24b115744a 截取数组多截取问题修改 2023-08-01 16:04:52 +08:00
panbaolin
6314f037e4 fix:1.删除邮件管理器@Compoint注解,添加能谱解析状态枚举 2023-08-01 15:11:52 +08:00
nieziyan
996c487908 feat:合并 2023-08-01 11:56:48 +08:00
nieziyan
e4fa2ada44 Merge remote-tracking branch 'origin/station' into station 2023-08-01 11:29:50 +08:00
qiaoqinzheng
e01beceacf 报警模块工具类冲突导致问题修改 2023-08-01 11:29:30 +08:00