xiaoguangbin
|
511afb8677
|
Merge remote-tracking branch 'origin/SelfStation' into SelfStation
|
2024-07-25 14:35:13 +08:00 |
|
xiaoguangbin
|
50c70d7026
|
feat：selfStationController 增加 resetButton 接口
|
2024-07-25 14:34:44 +08:00 |
|
nieziyan
|
82ebe1009e
|
Merge remote-tracking branch 'origin/SelfStation' into SelfStation
|
2024-07-25 14:28:59 +08:00 |
|
nieziyan
|
2e0814fa14
|
feat：自建台站自动处理分析结果存库
|
2024-07-25 14:28:50 +08:00 |
|
xiaoguangbin
|
e11eee19f7
|
Merge remote-tracking branch 'origin/SelfStation' into SelfStation
|
2024-07-25 14:26:28 +08:00 |
|
xiaoguangbin
|
566657c339
|
fix：beta calibration table数据
|
2024-07-25 14:24:51 +08:00 |
|
xiaoguangbin
|
2e08948302
|
fix：如何初始时获取beta calibration table数据
|
2024-07-25 11:13:29 +08:00 |
|
xiaoguangbin
|
79063e235a
|
Merge remote-tracking branch 'origin/SelfStation' into SelfStation
|
2024-07-24 17:16:24 +08:00 |
|
xiaoguangbin
|
d64a0be200
|
fix：修改updateROI接口参数
|
2024-07-24 17:15:56 +08:00 |
|
xiaoguangbin
|
9f7295673d
|
Revert "fix：修改updateROI接口参数"
This reverts commit aa99d7214b.
|
2024-07-24 17:13:16 +08:00 |
|
xiaoguangbin
|
aa99d7214b
|
fix：修改updateROI接口参数
|
2024-07-24 17:12:44 +08:00 |
|
xiaoguangbin
|
73286710e0
|
Merge remote-tracking branch 'origin/SelfStation' into SelfStation
|
2024-07-24 16:47:04 +08:00 |
|
xiaoguangbin
|
1f94e14a70
|
fix：修改updateROI接口参数;2 增加/selfStation/getGammaGated接口
|
2024-07-24 16:46:44 +08:00 |
|
xiaoguangbin
|
48a03b6d6f
|
fix：修改updateROI接口参数;2 增加/selfStation/getGammaGated接口
|
2024-07-24 16:46:30 +08:00 |
|
xiaoguangbin
|
f4aef9bdee
|
Merge remote-tracking branch 'origin/SelfStation' into SelfStation
|
2024-07-24 15:42:21 +08:00 |
|
nieziyan
|
970d4f3027
|
feat：自建台站谱解析
|
2024-07-23 16:49:11 +08:00 |
|
xiaoguangbin
|
8869735270
|
Merge remote-tracking branch 'origin/SelfStation' into SelfStation
|
2024-07-23 09:33:30 +08:00 |
|
nieziyan
|
dee89d28b5
|
Merge remote-tracking branch 'origin/SelfStation' into SelfStation
|
2024-07-23 09:17:06 +08:00 |
|
xiaoguangbin
|
1e830b0392
|
fix：修改updateROI接口参数
|
2024-07-23 08:45:32 +08:00 |
|
nieziyan
|
61ecc0ea5c
|
Merge remote-tracking branch 'origin/SelfStation' into SelfStation
|
2024-07-22 19:09:17 +08:00 |
|
nieziyan
|
95116338ad
|
feat：自建台站谱解析类
|
2024-07-22 19:09:04 +08:00 |
|
xiaoguangbin
|
755f36d012
|
Merge remote-tracking branch 'origin/SelfStation' into SelfStation
|
2024-07-22 18:37:39 +08:00 |
|
xiaoguangbin
|
0af17e0601
|
fix：修改updateROI接口参数
|
2024-07-22 18:36:05 +08:00 |
|
nieziyan
|
7cd16a77c2
|
Merge remote-tracking branch 'origin/SelfStation' into SelfStation
|
2024-07-22 15:59:11 +08:00 |
|
nieziyan
|
7daebd98b8
|
feat：自建台站谱解析类
|
2024-07-22 15:59:04 +08:00 |
|
xiaoguangbin
|
567b64a34e
|
fix：增加mdcInfoMap-C
|
2024-07-22 15:56:38 +08:00 |
|
xiaoguangbin
|
793d767313
|
Merge remote-tracking branch 'origin/SelfStation' into SelfStation
|
2024-07-22 14:10:01 +08:00 |
|
xiaoguangbin
|
cb74fb5a9e
|
Merge remote-tracking branch 'origin/SelfStation' into SelfStation
|
2024-07-19 17:15:00 +08:00 |
|
xiaoguangbin
|
2a6a38c286
|
fix：修改新beta谱的gamma reprocessing接口
|
2024-07-19 17:14:47 +08:00 |
|
nieziyan
|
108f2db587
|
feat：自建台站AUX表增加GPS信息
|
2024-07-19 16:11:10 +08:00 |
|
xiaoguangbin
|
90ecbfe99b
|
Merge remote-tracking branch 'origin/SelfStation' into SelfStation
|
2024-07-19 15:34:23 +08:00 |
|
nieziyan
|
55b14e66b6
|
feat：自建台站新增viewSpectrum接口
|
2024-07-19 11:21:32 +08:00 |
|
xiaoguangbin
|
fa79e380dd
|
Merge remote-tracking branch 'origin/SelfStation' into SelfStation
|
2024-07-19 09:44:11 +08:00 |
|
xiaoguangbin
|
f2d211b2b2
|
fix：beta energy calibration 中qc谱散点数据调整
|
2024-07-19 09:20:32 +08:00 |
|
nieziyan
|
5849612a3b
|
feat：bgSpectrum数据
|
2024-07-18 19:43:26 +08:00 |
|
xiaoguangbin
|
3d97ffb539
|
fix：增加interactive弹窗内的接口
|
2024-07-18 18:45:05 +08:00 |
|
nieziyan
|
b5d4b23f3c
|
feat：自建台站增加Configure接口
|
2024-07-18 18:16:59 +08:00 |
|
nieziyan
|
3c02c89ae5
|
feat：自建台站增加用户核素库配置接口
|
2024-07-18 09:06:49 +08:00 |
|
xiaoguangbin
|
16a1407216
|
fix：新beta 增加fitting接口
|
2024-07-17 14:33:04 +08:00 |
|
xiaoguangbin
|
143e1b1092
|
Merge remote-tracking branch 'origin/SelfStation' into SelfStation
|
2024-07-17 10:32:22 +08:00 |
|
xiaoguangbin
|
5b94121112
|
fix：
|
2024-07-17 10:31:58 +08:00 |
|
xiaoguangbin
|
5c0f09c616
|
Merge remote-tracking branch 'origin/SelfStation' into SelfStation
|
2024-07-17 10:28:59 +08:00 |
|
xiaoguangbin
|
03d92b7889
|
fix：1。增加qc文件;2.增加交互分析（gamma）
|
2024-07-17 09:53:43 +08:00 |
|
xiaoguangbin
|
9bbdd5eb5d
|
fix：FileNameByStandardForm使用ftp改为本地目录
|
2024-07-17 09:49:56 +08:00 |
|
xiaoguangbin
|
277485ddda
|
Merge remote-tracking branch 'origin/SelfStation' into SelfStation
# Conflicts:
# jeecg-boot-base-core/src/main/java/org/jeecg/common/email/EmailServiceManager.java
|
2024-07-16 14:35:57 +08:00 |
|
xiaoguangbin
|
2e10465bfe
|
fix：1.修改roi卡gamma数据代码，改为两个x点卡数据；
2.点击分析按钮根据卡出来的数据生成gammaPHD文件
|
2024-07-16 14:34:34 +08:00 |
|
xiaoguangbin
|
5a8f20362a
|
fix：from file 读取ftp功能改为直接访问ftp文件夹目录获取文件
|
2024-07-16 14:30:36 +08:00 |
|
xiaoguangbin
|
c64079e1f1
|
Merge remote-tracking branch 'origin/noFtp-seflStation' into SelfStation
# Conflicts:
# jeecg-boot-base-core/src/main/java/org/jeecg/common/email/EmailServiceManager.java
|
2024-07-16 12:02:26 +08:00 |
|
xiaoguangbin
|
f4b05e2da1
|
fix：修改ftp切换的目录
|
2024-07-16 11:55:10 +08:00 |
|
nieziyan
|
3f22b0edba
|
fix：Bugs
|
2024-07-08 10:03:25 +08:00 |
|