qiaoqinzheng
|
c5f4b20183
|
FileFtransitUtil去掉方法的静态关键字
|
2023-10-20 08:53:47 +08:00 |
|
panbaolin
|
8718aeed1c
|
Merge remote-tracking branch 'origin/station' into station
|
2023-10-19 20:39:16 +08:00 |
|
panbaolin
|
f61d91114b
|
fix:1.若能谱文件已解析成功，遇见重复解析时无论报任何错都不应再修改状态
|
2023-10-19 20:38:55 +08:00 |
|
nieziyan
|
3351503b40
|
Merge remote-tracking branch 'origin/station' into station
|
2023-10-19 20:32:40 +08:00 |
|
nieziyan
|
7beaa9a06a
|
feat：del PHDFile Cache
|
2023-10-19 20:32:05 +08:00 |
|
qiaoqinzheng
|
45ff312c38
|
Spc相关实体类内容修改
新建实体类GermaniumCalib
实现WriteSpc方法
|
2023-10-19 20:30:44 +08:00 |
|
qiaoqinzheng
|
05c345425d
|
上传文件格式化文件名称代码修改增加正则表达式判断问题修改
|
2023-10-19 19:06:36 +08:00 |
|
qiaoqinzheng
|
7e4353675e
|
Merge remote-tracking branch 'origin/station' into station
|
2023-10-19 18:55:37 +08:00 |
|
qiaoqinzheng
|
e2ac538042
|
上传文件格式化文件名称代码修改增加正则表达式判断
|
2023-10-19 18:55:26 +08:00 |
|
xiaoguangbin
|
740274df1a
|
fix:解决gamma自动处理 在进行beancCope时出错问题
|
2023-10-19 17:22:42 +08:00 |
|
nieziyan
|
457bb8e5bb
|
fix：bug
|
2023-10-19 16:13:10 +08:00 |
|
qiaoqinzheng
|
06c2302a56
|
gamma功能分析后返回bAnalyed字段信息
|
2023-10-19 15:08:57 +08:00 |
|
qiaoqinzheng
|
3ff927c9bf
|
PHDFileUtil新增解析文件方法
上传文件名称格式化
去掉Extrapolation分析方法的todo
|
2023-10-19 11:21:41 +08:00 |
|
qiaoqinzheng
|
774dc70ab6
|
float类型数据换成double后精度问题导致计算错误修改
读取Spc文件方法实现
|
2023-10-19 10:13:56 +08:00 |
|
qiaoqinzheng
|
191bff95ab
|
修改读取Spc文件方法
修改Extrapolation分析接口中返回内容字母大小写问题
|
2023-10-19 09:33:41 +08:00 |
|
qiaoqinzheng
|
6a456f7b8f
|
Beta新增Extrapolation页面分析接口返回内容修改
|
2023-10-18 14:59:02 +08:00 |
|
nieziyan
|
4f528dff93
|
Merge remote-tracking branch 'origin/station' into station
|
2023-10-18 11:32:36 +08:00 |
|
nieziyan
|
238e5d0384
|
feat：ReadSCP
|
2023-10-18 11:32:13 +08:00 |
|
qiaoqinzheng
|
b954d0a238
|
Beta功能生成RRR报告问题修改
移除没用的dll调用
Beta新增Extrapolation页面分析接口
Gamma功能新增Ims转Iec,Iec转Ims接口
新增FtransitEnum枚举
新增FileFtransitUtil工具类
新增FileData，FileDataInfo，AnalyseExtInfo实体类
EnergySpectrumStruct多余注解问题修改
EnergySpectrumHandler新增方法GetFittingPara,GetFittingData
|
2023-10-18 11:31:13 +08:00 |
|
nieziyan
|
2628be8cb0
|
feat：ReadSCP
|
2023-10-17 20:45:59 +08:00 |
|
qiaoqinzheng
|
9820d285e7
|
GammaFileUtil创建报告生成地址问题修改
|
2023-10-17 09:45:04 +08:00 |
|
qiaoqinzheng
|
363d7e659b
|
Merge remote-tracking branch 'origin/station' into station
|
2023-10-17 09:41:40 +08:00 |
|
qiaoqinzheng
|
df7e0c648e
|
新建FileData实体类
创建FileFtransitUtil实体类
|
2023-10-17 09:41:34 +08:00 |
|
nieziyan
|
a0278801ca
|
fix：Ftp改为本地
|
2023-10-16 20:18:45 +08:00 |
|
nieziyan
|
2ce51ac78d
|
Merge remote-tracking branch 'origin/station' into station
|
2023-10-16 19:19:06 +08:00 |
|
nieziyan
|
ae5bead768
|
fix：Ftp改为本地
|
2023-10-16 19:18:42 +08:00 |
|
qiaoqinzheng
|
5e88c491bb
|
导出ARR报告多余内容删除
|
2023-10-16 18:25:03 +08:00 |
|
nieziyan
|
fcaf1b8519
|
Merge remote-tracking branch 'origin/station' into station
|
2023-10-16 18:19:36 +08:00 |
|
qiaoqinzheng
|
59f35cd7cc
|
AcceptInfo实体类新增tablePeaksList字段
CalValuesHandler新增方法fitPeakFull重新拟合peak的数据
gamma功能修改acceptResults接口及对应执行体代码
GammaFileUtil保存文件路径修改
SpectrumPathProperties新增保存文件路径
|
2023-10-16 18:19:07 +08:00 |
|
nieziyan
|
0b4f808fb3
|
Merge branch 'station20231013' into station
|
2023-10-16 17:30:03 +08:00 |
|
nieziyan
|
e5f1b09b76
|
Merge remote-tracking branch 'origin/station20231013' into station20231013
# Conflicts:
# jeecg-server-cloud/armd-auto-process-start/src/main/java/org/jeecg/JeecgAutoProcessApplication.java
|
2023-10-16 17:28:11 +08:00 |
|
nieziyan
|
1ac2cb0bee
|
Merge branch 'station20231013' into station
|
2023-10-16 17:26:28 +08:00 |
|
nieziyan
|
7f3c2e43cc
|
Merge remote-tracking branch 'origin/main' into station20231013
|
2023-10-16 17:24:21 +08:00 |
|
nieziyan
|
d27492d617
|
Merge branch 'station' into station20231013
|
2023-10-16 17:21:11 +08:00 |
|
qiaoqinzheng
|
3c1ee016f0
|
Merge remote-tracking branch 'origin/station' into station
|
2023-10-16 17:18:38 +08:00 |
|
qiaoqinzheng
|
bc1d9fb90a
|
GammaFileUtil遗漏writeFile方法调用问题修改
|
2023-10-16 17:18:32 +08:00 |
|
panbaolin
|
87e4d33f3b
|
fix:1.放开邮件查询条件
|
2023-10-16 17:07:50 +08:00 |
|
nieziyan
|
c2273f4c7f
|
Merge remote-tracking branch 'origin/station20231013' into station20231013
|
2023-10-16 17:02:20 +08:00 |
|
nieziyan
|
3a8b663833
|
fix：Ftp改为本地
|
2023-10-16 17:02:06 +08:00 |
|
panbaolin
|
e2b4f2f76d
|
Merge branch 'station20231013' of http://git.hivekion.com:3000/xiaoguangbin/AnalysisSystemForRadionuclide into station20231013
|
2023-10-16 16:52:25 +08:00 |
|
panbaolin
|
96c164cede
|
fix:1.修改filesource、undel目录执行文件时Sample延迟执行
|
2023-10-16 16:49:50 +08:00 |
|
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 |
|