xiaoguangbin/AnalysisSystemForRadionuclide
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
1,315 Commits 11 Branches 0 Tags 56 MiB
9a403638f6
Commit Graph

1315 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
xiaoguangbin
ebdf8d863a fix：增加海水系统和自建台站beta的系统类型 2024-06-26 15:42:08 +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
xiaoguangbin
0a560452bf Merge remote-tracking branch 'refs/remotes/origin/sleepDownload' into noFtp-seflStation 
# Conflicts:
#	jeecg-boot-base-core/src/main/java/org/jeecg/common/email/EmailServiceManager.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
 2024-06-26 10:06:41 +08:00
xiaoguangbin
f6b963145f fix:增加catch中exception写入log日志 2024-06-25 11:03:09 +08:00
nieziyan
8b40646076 feat：Application异常结束退出 2024-06-19 16:33:55 +08:00
nieziyan
cf0751109d feat：添加IDC数据源控制访问 2024-06-18 14:52:44 +08:00
nieziyan
64a98bd4ea fix：邮件接收超时时间 2024-06-12 15:33:23 +08:00
nieziyan
f1410028fa fix：不删除saveFile下谱文件 2024-06-06 16:51:24 +08:00
nieziyan
897f469ea9 fix：增加谱文件处理状态判断 2024-06-06 15:42:06 +08:00
nieziyan
3d5080c1d8 fix：AutoProcess多线程问题 2024-06-05 09:42:20 +08:00
nieziyan
d5dce1c3fc feat：探测器报警信息 2024-06-04 09:52:58 +08:00
nieziyan
e83c1d6199 feat：探测器报警信息 2024-06-04 09:47:58 +08:00
nieziyan
97f4aae3ab fix：自动处理debug 2024-06-04 09:23:21 +08:00
orgin
11681f12db 连接超时之后不中断线程 2024-05-31 09:15:57 +08:00
orgin
9151233f11 连接超时之后不中断线程 2024-05-30 16:48:46 +08:00
nieziyan
86968e383b fix：删除多余文件 2024-05-13 14:58:41 +08:00
qiaoqinzheng
9fffd2436c 自动处理模块模块同步代码 2024-05-13 14:14:01 +08:00
qiaoqinzheng
2407b65a06 自动处理模块下载邮件代码修改 2024-05-13 14:09:42 +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
72dbf2ba80 自动处理程序修改逻辑 2024-05-09 09:34:21 +08:00
qiaoqinzheng
600c5235ec 自建台站分支同步代码 2024-04-30 11:51:54 +08:00
qiaoqinzheng
23bf9ee271 onlyDownload后续代码放开 2024-04-30 08:56:52 +08:00
qiaoqinzheng
f58d629bd7 onlyDownload后续代码放开 2024-04-29 18:29:23 +08:00
qiaoqinzheng
1e0d499b7a 自动处理程序线程已停止需要移除emailMap中保存的邮箱内容 2024-04-29 18:24:15 +08:00
qiaoqinzheng
3a1567f853 自建台站分支初始化数据返回值关键字改为void 2024-04-26 11:25:27 +08:00
qiaoqinzheng
f94b6ca9fa onlyDownload修改邮箱处理程序频繁增加线程问题 
onlyDownload修改文件下载部分长期堵塞问题
 2024-04-26 10:33:21 +08:00
qiaoqinzheng
f62158a721 onlyDownload修改邮箱处理程序频繁增加线程问题 
onlyDownload修改文件下载部分长期堵塞问题
 2024-04-26 10:31:59 +08:00
nieziyan
18b495d1d0 Merge remote-tracking branch 'origin/noFtp' into noFtp 2024-04-25 15:05:45 +08:00
qiaoqinzheng
7da8eeb921 onlyDownload放开后续代码 2024-04-25 14:26:00 +08:00
qiaoqinzheng
df16ed12a8 上传测试代码到新的分支onlyDownload，测试下载邮件问题 2024-04-24 16:45:49 +08:00