Commit Graph

190 Commits

Author SHA1 Message Date
panbaolin
87e4d33f3b fix:1.放开邮件查询条件 2023-10-16 17:07:50 +08:00
panbaolin
b3f5f0d276 fix:1.修改ftp文件管理改为本地文件管理 2023-10-16 14:08:13 +08:00
nieziyan
54d1e95474 fix:1.启用验证码 2.FTP目录创建问题 2023-10-13 11:13:47 +08:00
xiaoguangbin
b685cf53de fix:gamma分析师推送消息类型 常量 2023-10-12 14:27:43 +08:00
nieziyan
df34dd9199 add:新增Gamma SaveToExcel-G 导出模板 2023-10-12 11:30:20 +08:00
nieziyan
3156a8e608 Merge remote-tracking branch 'origin/station' into station 2023-10-12 11:20:37 +08:00
nieziyan
94665f35a5 feat:Gamma savaToExcel 2023-10-12 11:19:08 +08:00
panbaolin
6aaffd8fbd fix:1.修改临时存放文件目录为相对路径2.重启jar后清空临时存储目录3.修改生成报告功能为纯代码生成4.解决ftp并发创建目录失败问题 2023-10-12 11:17:55 +08:00
nieziyan
571502cc36 Merge remote-tracking branch 'origin/station' into station
# Conflicts:
#	jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/service/impl/GammaServiceImpl.java
2023-10-11 19:10:19 +08:00
nieziyan
af83b5b03f feat:Gamma saveToExcel 2023-10-11 18:55:02 +08:00
panbaolin
b3e0a4fc73 fix:1.提交日志/报告抽象类 2023-10-11 16:26:55 +08:00
qiaoqinzheng
170081ea08 gamma算法insertPeak,ComputePeakRange调整
gamma缓存key修改
移动gamma,beta算法内容以及相关的算法类
2023-10-11 10:32:17 +08:00
nieziyan
9e89b4aea9 Merge remote-tracking branch 'origin/station' into station 2023-10-10 21:12:57 +08:00
nieziyan
03fab5f900 fix:添加邮箱异常 2023-10-10 21:12:42 +08:00
qiaoqinzheng
67c2a6b355 Gamma分析算法修改传递参数内容
Gamma分析算法新增参数接收当前进度执行结果
自动处理程序,人工交互分析启动类增加dll调用
2023-10-10 10:12:46 +08:00
xiaoguangbin
bd1bb8cf46 fix:自动处理对能谱 data_type判断进行完善 2023-10-10 09:58:05 +08:00
qiaoqinzheng
d4d5653d02 算法所需实体类及调用方法提出到公用模块下
修改自动处理程序存储数据有误问题
新增ParameterProperties类
新增NumberFormatUtil工具类
2023-10-09 09:39:05 +08:00
nieziyan
8b4834aadc Merge remote-tracking branch 'origin/station' into station 2023-10-07 20:12:28 +08:00
nieziyan
5a661771e3 fix:修改消息队列 2023-10-07 19:25:42 +08:00
panbaolin
32ebf4915c fix:1.完成邮件分析成功发送给redis 2.解决获取邮件按条件查询bug 2023-10-07 18:42:04 +08:00
qiaoqinzheng
950407d6da 整合GammaFileUtil工具类
新增模块jeecg-module-BetaGammaAnalyser
移动部分实体类到jeecg-module-BetaGammaAnalyser模块下
2023-10-07 16:48:07 +08:00
qiaoqinzheng
cc7775edaa 临时文件使用后删除
核素信息映射问题修改
2023-09-28 15:55:32 +08:00
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
xiaoguangbin
bbd35a11e8 fix:gamma自动处理lc等文件保存至ftp目录下之后 删除临时文件 2023-09-28 10:16:21 +08:00
xiaoguangbin
99c534c44d fix:邮箱连接测试log 2023-09-28 10:05:55 +08:00
xiaoguangbin
fba4ac0915 fix:寫入穩定格式化處理優化 2023-09-27 15:10:26 +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
qiaoqinzheng
07e872718a GardsNuclLinesIded字段与数据库对应错误修改
Gamma页面save To DB接口部分存储失败修改
GammaFileUtil判断是否发生改变方法还原
2023-09-26 16:54:05 +08:00
xiaoguangbin
18d205e21b fix:gamma 自动处理 2023-09-26 11:01:53 +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
fbd353ea39 fix:gamma 生成lc scac baseline工具優化 2023-09-25 19:00:37 +08:00
orgin
0ac2c77e27 fix: gamma LC SCAC Baseline 文件生成 2023-09-25 17:23:19 +08:00
qiaoqinzheng
f3406dabb4 SpecSetup修改实体类字段信息
UserTaskUtil新增查询用户信息方法
GammaController新增configureSave接口,实现Reprocessing接口
ConfigureData修改字段名称
2023-09-25 11:24:42 +08:00
qiaoqinzheng
0e4b4039e3 GammaController新增testFun测试dll分析方法
PHDFile新增userId,xmlFilePath字段
修改部分实体类内字段大小写问题
CalValuesHandler去掉多余的计算方法,新增实现analyseSpectrum方法
新增BaseCtrlStack实体类
2023-09-24 18:43:20 +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
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
qiaoqinzheng
6a90cfbc71 Merge remote-tracking branch 'origin/station' into station 2023-09-21 17:20:41 +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
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