nieziyan
|
23ccf6bfac
|
fix：移除FtpUtil引用
|
2023-10-16 15:20:53 +08:00 |
|
panbaolin
|
b3f5f0d276
|
fix:1.修改ftp文件管理改为本地文件管理
|
2023-10-16 14:08:13 +08:00 |
|
nieziyan
|
99469f7ac1
|
Merge remote-tracking branch 'origin/station' into station
|
2023-10-16 14:03:03 +08:00 |
|
nieziyan
|
8acd75c8b6
|
fix：修改日志文件名称
|
2023-10-16 14:02:41 +08:00 |
|
orgin
|
3aec8a468a
|
fix：删除无用代码
|
2023-10-16 09:14:31 +08:00 |
|
qiaoqinzheng
|
beacd2ab40
|
beta重新分析后缓存数据类型与分析缓存数据类型不一致问题修改
|
2023-10-13 19:42:22 +08:00 |
|
qiaoqinzheng
|
2714989491
|
beta功能实现分析以及重新分析功能，以及相关的页面数据变化
gamma实现InteractiveTool页面的fitPeak功能
gamma新增InteractiveTool页面的acceptBaseLine接口
gamma功能修改log，report文本内容的对齐格式
AbstractLogOrReport新增相关gamma的log，report需要的独立的对齐方法
AcceptInfo新增newPeak,flag字段用来控制InteractiveTool页面的peak变化
新增BaseLineCtrls实体类
|
2023-10-13 19:37:03 +08:00 |
|
nieziyan
|
0e4d702b96
|
fix：bug修复
|
2023-10-13 18:14:14 +08:00 |
|
nieziyan
|
54d1e95474
|
fix：1.启用验证码 2.FTP目录创建问题
|
2023-10-13 11:13:47 +08:00 |
|
nieziyan
|
6c7c4d8724
|
fix：修改服务名称
|
2023-10-12 19:18:15 +08:00 |
|
nieziyan
|
e1aa3b0fc6
|
Merge remote-tracking branch 'origin/station' into station
|
2023-10-12 15:59:01 +08:00 |
|
nieziyan
|
30cb94a4ce
|
fix：1.移动核素库位置2.pom.xml文件
|
2023-10-12 15:58:37 +08:00 |
|
xiaoguangbin
|
b685cf53de
|
fix：gamma分析师推送消息类型 常量
|
2023-10-12 14:27:43 +08:00 |
|
xiaoguangbin
|
f838ba0a08
|
fix：gamma自动处理生成报告
|
2023-10-12 14:27:04 +08:00 |
|
xiaoguangbin
|
a807f410c3
|
fix：解决能谱文件名称中没有full或者repl的情况下 不能正确识别能谱问题
|
2023-10-12 14:24:46 +08:00 |
|
xiaoguangbin
|
27c0fdd629
|
fix：解决gamma分析过程通过websocket给前端推送消息失败问题
|
2023-10-12 14:23:26 +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 |
|
qiaoqinzheng
|
4a17dca010
|
gamma模块saveToTXT功能
|
2023-10-11 18:47:52 +08:00 |
|
panbaolin
|
b3e0a4fc73
|
fix:1.提交日志/报告抽象类
|
2023-10-11 16:26:55 +08:00 |
|
qiaoqinzheng
|
d9ba592743
|
gamma模块saveToTXT功能
|
2023-10-11 15:21:27 +08:00 |
|
qiaoqinzheng
|
e3b251ee2d
|
gamma保存configure配置后刷新页面bUpdateCal数据
|
2023-10-11 11:04:29 +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
|
557cbe19f3
|
beta初始化数据加载内容新增及修改
|
2023-10-10 10:13:22 +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 |
|
xiaoguangbin
|
80c50d525f
|
Merge remote-tracking branch 'origin/station' into station
|
2023-10-10 09:57:00 +08:00 |
|
xiaoguangbin
|
75d5fb4c68
|
fix：自动处理对能谱 data_type判断进行完善
|
2023-10-10 09:56:50 +08:00 |
|
panbaolin
|
ea5093e51d
|
fix:1.合并结构体及jni类，统一使用beta-gamma子工程
|
2023-10-10 09:51:29 +08:00 |
|
orgin
|
94ea96b788
|
fix：gamma分析增加process
|
2023-10-09 19:42:11 +08:00 |
|
orgin
|
3c61268127
|
delete: ceshi
|
2023-10-09 17:21:08 +08:00 |
|
orgin
|
398a4a498c
|
fix: ceshi
|
2023-10-09 16:12:01 +08:00 |
|
qiaoqinzheng
|
d4d5653d02
|
算法所需实体类及调用方法提出到公用模块下
修改自动处理程序存储数据有误问题
新增ParameterProperties类
新增NumberFormatUtil工具类
|
2023-10-09 09:39:05 +08:00 |
|
qiaoqinzheng
|
386cec88c9
|
获取文件路径部分错误提交内容修改
|
2023-10-08 08:48:38 +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 |
|
xiaoguangbin
|
1a5bc8d4ec
|
fix：gamma自动处理panduan
|
2023-09-28 14:46:09 +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 |
|
panbaolin
|
6f9abda53f
|
Merge branch 'station' of http://git.hivekion.com:3000/xiaoguangbin/AnalysisSystemForRadionuclide into station
|
2023-09-27 10:38:19 +08:00 |
|