Commit Graph

Select branches

Hide Pull Requests

SelfStation

SelfStation-pgsql

SelfStation-testdll

master

mdc

mdc-merge

noFtp

noFtp-F

noFtp-seflStation

onlyDownload

sleepDownload

Mono Color

• 48fc1b30e5 Merge remote-tracking branch 'origin/SelfStation' into SelfStation nieziyan 2024-07-26 19:16:00 +0800
• 01ea4f8c63 feat：自建台站交互分析 nieziyan 2024-07-26 19:15:46 +0800
• cf369218da fix: self：1.nuclideReview弹窗多个接口;2.解决分析之后 gamma三个calibration弹窗无数据问题 xiaoguangbin 2024-07-26 10:49:18 +0800
• 0cd2e0f29c Merge remote-tracking branch 'origin/SelfStation' into SelfStation xiaoguangbin 2024-07-25 17:06:44 +0800
• c83aff08bd feat：selfStationController 增加 replotBaseLine、acceptBaseLine 接口 xiaoguangbin 2024-07-25 17:06:23 +0800
• da269b1da1 Merge remote-tracking branch 'origin/SelfStation' into SelfStation xiaoguangbin 2024-07-25 17:05:40 +0800
• 9726c51710 feat：selfStationController 增加 replotBaseLine、acceptBaseLine 接口 xiaoguangbin 2024-07-25 17:05:14 +0800
• 71411c8d4c Merge remote-tracking branch 'origin/SelfStation' into SelfStation xiaoguangbin 2024-07-25 14:35:52 +0800
• 511afb8677 Merge remote-tracking branch 'origin/SelfStation' into SelfStation xiaoguangbin 2024-07-25 14:35:13 +0800
• 50c70d7026 feat：selfStationController 增加 resetButton 接口 xiaoguangbin 2024-07-25 14:34:44 +0800
• 82ebe1009e Merge remote-tracking branch 'origin/SelfStation' into SelfStation nieziyan 2024-07-25 14:28:59 +0800
• 2e0814fa14 feat：自建台站自动处理分析结果存库 nieziyan 2024-07-25 14:28:50 +0800
• e11eee19f7 Merge remote-tracking branch 'origin/SelfStation' into SelfStation xiaoguangbin 2024-07-25 14:26:28 +0800
• 566657c339 fix：beta calibration table数据 xiaoguangbin 2024-07-25 14:24:51 +0800
• 2e08948302 fix：如何初始时获取beta calibration table数据 xiaoguangbin 2024-07-25 11:13:29 +0800
• 79063e235a Merge remote-tracking branch 'origin/SelfStation' into SelfStation xiaoguangbin 2024-07-24 17:16:24 +0800
• d64a0be200 fix：修改updateROI接口参数 xiaoguangbin 2024-07-24 17:15:56 +0800
• 9f7295673d Revert "fix：修改updateROI接口参数" xiaoguangbin 2024-07-24 17:13:16 +0800
• aa99d7214b fix：修改updateROI接口参数 xiaoguangbin 2024-07-24 17:12:44 +0800
• 73286710e0 Merge remote-tracking branch 'origin/SelfStation' into SelfStation xiaoguangbin 2024-07-24 16:47:04 +0800
• 1f94e14a70 fix：修改updateROI接口参数;2 增加/selfStation/getGammaGated接口 xiaoguangbin 2024-07-24 16:46:44 +0800
• 48a03b6d6f fix：修改updateROI接口参数;2 增加/selfStation/getGammaGated接口 xiaoguangbin 2024-07-24 16:46:30 +0800
• f4aef9bdee Merge remote-tracking branch 'origin/SelfStation' into SelfStation xiaoguangbin 2024-07-24 15:42:21 +0800
• 970d4f3027 feat：自建台站谱解析 nieziyan 2024-07-23 16:49:11 +0800
• 8869735270 Merge remote-tracking branch 'origin/SelfStation' into SelfStation xiaoguangbin 2024-07-23 09:33:30 +0800
• dee89d28b5 Merge remote-tracking branch 'origin/SelfStation' into SelfStation nieziyan 2024-07-23 09:17:06 +0800
• 1e830b0392 fix：修改updateROI接口参数 xiaoguangbin 2024-07-23 08:45:32 +0800
• 61ecc0ea5c Merge remote-tracking branch 'origin/SelfStation' into SelfStation nieziyan 2024-07-22 19:09:17 +0800
• 95116338ad feat：自建台站谱解析类 nieziyan 2024-07-22 19:09:04 +0800
• 755f36d012 Merge remote-tracking branch 'origin/SelfStation' into SelfStation xiaoguangbin 2024-07-22 18:37:39 +0800
• 0af17e0601 fix：修改updateROI接口参数 xiaoguangbin 2024-07-22 18:36:05 +0800
• 7cd16a77c2 Merge remote-tracking branch 'origin/SelfStation' into SelfStation nieziyan 2024-07-22 15:59:11 +0800
• 7daebd98b8 feat：自建台站谱解析类 nieziyan 2024-07-22 15:59:04 +0800
• 567b64a34e fix：增加mdcInfoMap-C xiaoguangbin 2024-07-22 15:56:38 +0800
• 793d767313 Merge remote-tracking branch 'origin/SelfStation' into SelfStation xiaoguangbin 2024-07-22 14:10:01 +0800
• cb74fb5a9e Merge remote-tracking branch 'origin/SelfStation' into SelfStation xiaoguangbin 2024-07-19 17:15:00 +0800
• 2a6a38c286 fix：修改新beta谱的gamma reprocessing接口 xiaoguangbin 2024-07-19 17:14:47 +0800
• 108f2db587 feat：自建台站AUX表增加GPS信息 nieziyan 2024-07-19 16:11:10 +0800
• 90ecbfe99b Merge remote-tracking branch 'origin/SelfStation' into SelfStation xiaoguangbin 2024-07-19 15:34:23 +0800
• 55b14e66b6 feat：自建台站新增viewSpectrum接口 nieziyan 2024-07-19 11:21:32 +0800
• fa79e380dd Merge remote-tracking branch 'origin/SelfStation' into SelfStation xiaoguangbin 2024-07-19 09:44:11 +0800
• f2d211b2b2 fix：beta energy calibration 中qc谱散点数据调整 xiaoguangbin 2024-07-19 09:20:32 +0800
• 5849612a3b feat：bgSpectrum数据 nieziyan 2024-07-18 19:43:26 +0800
• 3d97ffb539 fix：增加interactive弹窗内的接口 xiaoguangbin 2024-07-18 18:45:05 +0800
• b5d4b23f3c feat：自建台站增加Configure接口 nieziyan 2024-07-18 18:16:59 +0800
• 3c02c89ae5 feat：自建台站增加用户核素库配置接口 nieziyan 2024-07-18 09:06:49 +0800
• 16a1407216 fix：新beta 增加fitting接口 xiaoguangbin 2024-07-17 14:33:04 +0800
• 143e1b1092 Merge remote-tracking branch 'origin/SelfStation' into SelfStation xiaoguangbin 2024-07-17 10:32:22 +0800
• 5b94121112 fix： xiaoguangbin 2024-07-17 10:31:58 +0800
• 5c0f09c616 Merge remote-tracking branch 'origin/SelfStation' into SelfStation xiaoguangbin 2024-07-17 10:28:59 +0800
• 03d92b7889 fix：1。增加qc文件;2.增加交互分析（gamma） xiaoguangbin 2024-07-17 09:53:43 +0800
• 9bbdd5eb5d fix：FileNameByStandardForm使用ftp改为本地目录 xiaoguangbin 2024-07-17 09:49:56 +0800
• 277485ddda Merge remote-tracking branch 'origin/SelfStation' into SelfStation xiaoguangbin 2024-07-16 14:35:57 +0800
• 2e10465bfe fix：1.修改roi卡gamma数据代码，改为两个x点卡数据； 2.点击分析按钮根据卡出来的数据生成gammaPHD文件 xiaoguangbin 2024-07-16 14:34:34 +0800
• 5a8f20362a fix：from file 读取ftp功能改为直接访问ftp文件夹目录获取文件 xiaoguangbin 2024-07-16 14:30:36 +0800
• c64079e1f1 Merge remote-tracking branch 'origin/noFtp-seflStation' into SelfStation xiaoguangbin 2024-07-16 12:02:26 +0800
• f4b05e2da1 fix：修改ftp切换的目录 xiaoguangbin 2024-07-16 11:55:10 +0800
• 3f22b0edba fix：Bugs nieziyan 2024-07-08 10:03:25 +0800
• 1423b2f09d fix：增加对异常的拦截，修改map为ConcurrentHashMap sleepDownload xiaoguangbin 2024-06-27 09:58:22 +0800
• ebdf8d863a fix：增加海水系统和自建台站beta的系统类型 noFtp-seflStation xiaoguangbin 2024-06-26 15:42:08 +0800
• 80985a74d7 Merge remote-tracking branch 'refs/remotes/origin/SelfStation' into noFtp-seflStation xiaoguangbin 2024-06-26 10:43:45 +0800
• 0a560452bf Merge remote-tracking branch 'refs/remotes/origin/sleepDownload' into noFtp-seflStation xiaoguangbin 2024-06-26 10:06:41 +0800
• a2980c0289 mdc-merge xiaoguangbin 2024-06-25 16:49:20 +0800
• 9bafcef57b Merge remote-tracking branch 'refs/remotes/origin/sleepDownload' into mdc-merge xiaoguangbin 2024-06-25 16:29:36 +0800
• 0eb8df84c8 Merge remote-tracking branch 'refs/remotes/origin/noFtp' into mdc-merge xiaoguangbin 2024-06-25 16:29:25 +0800
• f6b963145f fix:增加catch中exception写入log日志 xiaoguangbin 2024-06-25 11:03:09 +0800
• 8b40646076 feat：Application异常结束退出 noFtp nieziyan 2024-06-19 16:33:55 +0800
• cf0751109d feat：添加IDC数据源控制访问 nieziyan 2024-06-18 14:52:44 +0800
• 64a98bd4ea fix：邮件接收超时时间 nieziyan 2024-06-12 15:33:23 +0800
• 939ffb1f6c feat：完善AutoProcess F状态数据解析 noFtp-F nieziyan 2024-06-07 18:25:16 +0800
• 6b16aa6a40 fix：bug nieziyan 2024-06-07 09:35:48 +0800
• f1410028fa fix：不删除saveFile下谱文件 nieziyan 2024-06-06 16:51:24 +0800
• d940f1d6e4 Merge branch 'sleepDownload' into mdc nieziyan 2024-06-06 15:53:54 +0800
• 897f469ea9 fix：增加谱文件处理状态判断 onlyDownload nieziyan 2024-06-06 15:42:06 +0800
• 41245f0546 feat：自动处理分析失败谱可以加载其基础数据 nieziyan 2024-06-06 10:30:42 +0800
• 55b68da597 fix master orgin 2024-06-05 15:15:29 +0800
• 99cd4bbbfe Merge branch 'mdc' orgin 2024-06-05 10:40:51 +0800
• 3d5080c1d8 fix：AutoProcess多线程问题 nieziyan 2024-06-05 09:42:20 +0800
• d5dce1c3fc feat：探测器报警信息 nieziyan 2024-06-04 09:52:58 +0800
• e83c1d6199 feat：探测器报警信息 nieziyan 2024-06-04 09:47:58 +0800
• 97f4aae3ab fix：自动处理debug nieziyan 2024-06-04 09:23:21 +0800
• 11681f12db 连接超时之后不中断线程 orgin 2024-05-31 09:15:57 +0800
• 9151233f11 连接超时之后不中断线程 orgin 2024-05-30 16:48:46 +0800
• ff2f73eb41 fix：优化 nieziyan 2024-05-15 09:13:54 +0800
• 4bb2518d36 feat：获取探测器Id nieziyan 2024-05-13 16:25:44 +0800
• 86968e383b fix：删除多余文件 nieziyan 2024-05-13 14:58:41 +0800
• c5ffa77954 自动处理模块模块同步代码 qiaoqinzheng 2024-05-13 14:15:05 +0800
• 9fffd2436c 自动处理模块模块同步代码 qiaoqinzheng 2024-05-13 14:14:01 +0800
• 7b5e167eb2 自动处理模块下载邮件代码修改 qiaoqinzheng 2024-05-13 14:10:59 +0800
• 2407b65a06 自动处理模块下载邮件代码修改 qiaoqinzheng 2024-05-13 14:09:42 +0800
• cbe8ef9bb0 fix：SQL逻辑判断符 nieziyan 2024-05-13 09:27:23 +0800
• 6c5a0bf546 人工交互模块BetaDataFile实体类增加detectorId字段用于报警使用 qiaoqinzheng 2024-05-13 09:24:25 +0800
• f309792c0d fix：纠正库名 nieziyan 2024-05-11 16:02:33 +0800
• 09a23b371b feat：修改分析结果报警[核素首次发现|出现两种及以上] nieziyan 2024-05-11 15:39:05 +0800
• caf47a58d5 人工交互模块增加判断如果不是正常谱提示异常信息内容 qiaoqinzheng 2024-05-10 16:12:26 +0800
• 72dbf2ba80 自动处理程序修改逻辑 qiaoqinzheng 2024-05-09 09:34:21 +0800
• 95a150122c feat：修改分析结果报警条件逻辑 nieziyan 2024-05-08 15:37:52 +0800
• 035e842240 feat：自动处理邮箱邮件监控报警逻辑 nieziyan 2024-05-06 18:11:29 +0800
• ebf8958f60 feat：自动处理邮箱邮件监控时间单位 nieziyan 2024-05-06 09:50:46 +0800
• 600c5235ec 自建台站分支同步代码 qiaoqinzheng 2024-04-30 11:51:54 +0800