xiaoguangbin
|
c83aff08bd
|
feat：selfStationController 增加 replotBaseLine、acceptBaseLine 接口
|
2024-07-25 17:06:23 +08:00 |
|
xiaoguangbin
|
9726c51710
|
feat：selfStationController 增加 replotBaseLine、acceptBaseLine 接口
|
2024-07-25 17:05:14 +08:00 |
|
xiaoguangbin
|
50c70d7026
|
feat：selfStationController 增加 resetButton 接口
|
2024-07-25 14:34:44 +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
|
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
|
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 |
|
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 |
|
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
|
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
|
55b14e66b6
|
feat：自建台站新增viewSpectrum接口
|
2024-07-19 11:21:32 +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
|
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 |
|
nieziyan
|
3f22b0edba
|
fix：Bugs
|
2024-07-08 10:03:25 +08:00 |
|
xiaoguangbin
|
80985a74d7
|
Merge remote-tracking branch 'refs/remotes/origin/SelfStation' into noFtp-seflStation
# Conflicts:
# jeecg-boot-base-core/src/main/java/org/jeecg/common/constant/DictConstant.java
# jeecg-boot-base-core/src/main/java/org/jeecg/common/email/EmailServiceManager.java
# jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/controller/CalculateConcController.java
# jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/redisStream/AnalysisConsumer.java
# jeecg-module-auto-process/src/main/java/org/jeecg/modules/AutoProcessManager.java
# jeecg-module-auto-process/src/main/java/org/jeecg/modules/EmailParsingActuator.java
# jeecg-module-auto-process/src/main/java/org/jeecg/modules/spectrum/AbstractSpectrumHandler.java
# jeecg-module-auto-process/src/main/java/org/jeecg/modules/spectrum/SpectrumParsingActuator.java
# jeecg-module-beta-gamma-analyser/src/main/java/org/jeecg/common/util/GammaFileUtil.java
# jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/service/impl/GammaServiceImpl.java
# jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/service/impl/SpectrumAnalysisServiceImpl.java
# jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/service/impl/SpectrumFileServiceImpl.java
# jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/controller/LoginController.java
# jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/impl/GardsSampleDataServiceImpl.java
|
2024-06-26 10:43:45 +08:00 |
|
qiaoqinzheng
|
6c5a0bf546
|
人工交互模块BetaDataFile实体类增加detectorId字段用于报警使用
|
2024-05-13 09:24:25 +08:00 |
|
qiaoqinzheng
|
caf47a58d5
|
人工交互模块增加判断如果不是正常谱提示异常信息内容
|
2024-05-10 16:12:26 +08:00 |
|
qiaoqinzheng
|
3a1567f853
|
自建台站分支初始化数据返回值关键字改为void
|
2024-04-26 11:25:27 +08:00 |
|
qiaoqinzheng
|
a025eb5098
|
人工交互模块Beta部分分析失败后将核素数据列表清空
|
2024-04-12 15:34:00 +08:00 |
|
qiaoqinzheng
|
ea3cc4ea0e
|
人工交互模块Gamma部分增加核素方法增加判断核素存在不重复添加核素信息
人工交互模块Beta部分重新分析全部谱信息，赋值位置修改
|
2024-04-12 11:50:02 +08:00 |
|
qiaoqinzheng
|
9f9466b529
|
人工交互模块Gamma部分增加核素方法增加判断核素存在不重复添加核素信息
人工交互模块Beta部分重新分析全部谱信息，赋值位置修改
|
2024-04-12 10:50:23 +08:00 |
|
qiaoqinzheng
|
3343412516
|
人工交互模块Gamma部分新增加逻辑，增加峰操作使用缓存的核素信息
|
2024-04-11 16:51:26 +08:00 |
|
qiaoqinzheng
|
2a99fabe53
|
人工交互模块Beta保存数据到数据库时，处理数据核素名称匹配时大小写问题修改
|
2024-04-11 11:03:22 +08:00 |
|
qiaoqinzheng
|
83017ee877
|
人工交互分析beta部分初始化数据时数据库查询的属于因为缓存已经存在的情况导致数据被重置，存储数据库时下标越界问题修改
|
2024-03-22 09:24:55 +08:00 |
|
qiaoqinzheng
|
bde5eed237
|
同步mdc分支代码
|
2024-03-21 10:28:04 +08:00 |
|
qiaoqinzheng
|
c9ee863667
|
操作本地文件夹分支人工交互模块，文件夹的前缀路径读取不再使用FTP的路径
|
2024-03-20 14:02:54 +08:00 |
|
qiaoqinzheng
|
46eba27ace
|
人工交互分析模块Beta保存代码输出语句移除
|
2024-03-19 17:16:45 +08:00 |
|
qiaoqinzheng
|
924cddb1f2
|
人工交互分析模块Beta保存数据代码优化，存储前的分析操作移除，根据分析结果数据存储数据
|
2024-03-19 17:00:16 +08:00 |
|
qiaoqinzheng
|
0c5eadbb2c
|
人工交互分析模块保存数据到数据库上传日志文件时，获取文件名称错误问题修改
|
2024-03-15 16:51:49 +08:00 |
|
qiaoqinzheng
|
765ea99ad8
|
人工交互分析模块Beta在分析失败的情况下不进行存储，提示正确需要分析文件
|
2024-03-15 16:00:36 +08:00 |
|
qiaoqinzheng
|
0654872c3b
|
人工交互分析模块Beta在分析失败的情况下不进行存储，提示正确需要分析文件
|
2024-03-15 15:54:47 +08:00 |
|
qiaoqinzheng
|
953dd61988
|
人工交互模块Beta部分分析算法，失败的情况下BProcessd,savedAnalysisResult参数修改为false并传递给前端
|
2024-03-15 11:47:50 +08:00 |
|