xiaoguangbin/AnalysisSystemForRadionuclide
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
589 Commits 10 Branches 0 Tags 41 MiB
f6f540cef6
Commit Graph

212 Commits

Author SHA1 Message Date
xiaoguangbin
4492eb5902 fix：baseline等文件生成内容对齐优化 2023-09-26 22:34:04 +08:00
panbaolin
960b8be389 fix:1.修改B谱分析功能中存储报告路径去除文件后缀2.优化健康谱、报警谱日志功能3.添加获取邮件时可获取系统启动时间后的邮件功能逻辑 2023-09-25 19:22:49 +08:00
nieziyan
6b171b737d Merge remote-tracking branch 'origin/station' into station 2023-09-26 19:19:28 +08:00
nieziyan
b1d989c9cf feat：Server监控 
fix：修改监控项同步策略
 2023-09-26 19:19:01 +08:00
qiaoqinzheng
07e872718a GardsNuclLinesIded字段与数据库对应错误修改 
Gamma页面save To DB接口部分存储失败修改
GammaFileUtil判断是否发生改变方法还原
 2023-09-26 16:54:05 +08:00
xiaoguangbin
18d205e21b fix：gamma 自动处理 2023-09-26 11:01:53 +08:00
nieziyan
5b2ca8213b Merge remote-tracking branch 'origin/station' into station 2023-09-25 19:38:24 +08:00
nieziyan
37987f1bfa feat：Server监控 2023-09-25 19:38:07 +08:00
xiaoguangbin
fbd353ea39 fix：gamma 生成lc scac baseline工具優化 2023-09-25 19:00:37 +08:00
orgin
0ac2c77e27 fix: gamma LC SCAC Baseline 文件生成 2023-09-25 17:23:19 +08:00
qiaoqinzheng
f3406dabb4 SpecSetup修改实体类字段信息 
UserTaskUtil新增查询用户信息方法
GammaController新增configureSave接口，实现Reprocessing接口
ConfigureData修改字段名称
 2023-09-25 11:24:42 +08:00
qiaoqinzheng
0e4b4039e3 GammaController新增testFun测试dll分析方法 
PHDFile新增userId,xmlFilePath字段
修改部分实体类内字段大小写问题
CalValuesHandler去掉多余的计算方法，新增实现analyseSpectrum方法
新增BaseCtrlStack实体类
 2023-09-24 18:43:20 +08:00
nieziyan
51373c79d2 Merge remote-tracking branch 'origin/station' into station 2023-09-22 19:39:59 +08:00
nieziyan
f53f8e4dca feat：Server监控 2023-09-22 19:39:38 +08:00
orgin
9c9fbbb80e fix: gamma分析进度通过 redis 订阅发送 webSocket 消息 2023-09-22 19:19:25 +08:00
nieziyan
751c5d8cf2 Merge remote-tracking branch 'origin/station' into station 2023-09-21 20:49:45 +08:00
nieziyan
f984421fc1 feat：Server监控 2023-09-21 20:49:31 +08:00
qiaoqinzheng
6a90cfbc71 Merge remote-tracking branch 'origin/station' into station 2023-09-21 17:20:41 +08:00
qiaoqinzheng
7feca0fdef 修改beta模块saveToDB接口问题 
修改gamma模块saveToDB接口问题
修改beta模块saveToTXT,saveToExcel,saveToHtml问题
 2023-09-21 17:20:10 +08:00
nieziyan
699a8b068b fix：报警日志绑定当前报警规则,非最新规则 2023-09-21 16:05:20 +08:00
xiaoguangbin
f7e8a4ed02 fix：优化header和title生成 2023-09-21 11:20:38 +08:00
nieziyan
5eb536c21d Merge remote-tracking branch 'origin/station' into station 2023-09-20 19:20:14 +08:00
nieziyan
80f3a55812 feat：saveTo* 2023-09-20 19:19:56 +08:00
qiaoqinzheng
9bf98b819c NameStandUtil移动到公用工具类中 
修改Gamma模块下SaveToDB接口问题
 2023-09-20 19:13:44 +08:00
nieziyan
f20fdb4271 Merge remote-tracking branch 'origin/station' into station 2023-09-19 20:11:25 +08:00
nieziyan
055147f72d feat：back 2023-09-19 20:11:07 +08:00
orgin
500387e88a Merge remote-tracking branch 'xiaoguangbin/station' into station 2023-09-19 08:55:11 +08:00
orgin
9e745b6d84 fix: gamma 自动处理 2023-09-19 08:55:05 +08:00
nieziyan
b4178e071a Merge remote-tracking branch 'origin/station' into station 
# Conflicts:
#	jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/service/impl/SpectrumAnalysisServiceImpl.java
 2023-09-18 20:07:52 +08:00
nieziyan
5835ef9543 feat：saveTo* 2023-09-18 19:58:08 +08:00
orgin
a794d8f357 fix: 能谱log日志生成工具 2023-09-18 19:08:11 +08:00
orgin
e2598e14ef fix: 能谱log日志生产工具 2023-09-18 17:16:24 +08:00
panbaolin
cf39240cf0 fix:1.完成重新执行undeal文件夹里PHD文件功能2.完成重新执行filesource文件夹PHD文件功能 2023-09-18 15:18:30 +08:00
orgin
79e05be0e0 Merge remote-tracking branch 'xiaoguangbin/station' into station 2023-09-18 15:16:38 +08:00
orgin
674fc6f78b fix: 能谱log日志生产工具 2023-09-18 15:16:31 +08:00
qiaoqinzheng
0cfcd0bb72 fitting参数新增qcFi了Name,tabName进行区分数据并进行保存 
新声明一个本地缓存工具betaCache
PHDFileUtil文件保存路劲多出/符移除
GammaController新增保存Energy Calibration,Resolution Calibration,Efficiency Calibration数据接口
GammaController新增导出ARR报告接口
GammaController新增导出RRR报告接口
BgDataAnlyseResultIn实体类内容修改
 2023-09-18 14:57:37 +08:00
nieziyan
023ca06a9d Merge remote-tracking branch 'origin/station' into station 2023-09-15 10:06:17 +08:00
nieziyan
d8289d4d12 fix：Alarm 2023-09-15 10:05:31 +08:00
qiaoqinzheng
78ce76d6c3 zeroTime解析问题修改 2023-09-15 10:04:51 +08:00
nieziyan
1b16ceca8f feat：format 2023-09-13 17:08:37 +08:00
nieziyan
561533c6c3 Merge remote-tracking branch 'origin/station' into station 2023-09-13 15:33:23 +08:00
nieziyan
492795c445 fix：Gamma RLR 2023-09-13 15:33:09 +08:00
qiaoqinzheng
5f7cc6be38 Merge remote-tracking branch 'origin/station' into station 2023-09-13 10:50:52 +08:00
qiaoqinzheng
b7c256a044 新增SysUserColor实体类 
GammaFileUtil部分颜色保持与用户存储颜色一致
GammaController新增主页面点击peakInformation接口
GammaController新增查询颜色配置信息接口
GammaController新增修改颜色配置信息接口
SpectrumAnalysisMapper增加新增ROIResults表数据sql
 2023-09-13 10:50:44 +08:00
panbaolin
61da5a5c50 fix:1.优化存储邮件解析日志功能2.修改原始库、分析库数据存储条件3.修改统一异常报错处理逻辑 2023-09-13 10:24:28 +08:00
nieziyan
ae2dfc2697 Merge remote-tracking branch 'origin/station' into station 2023-09-13 08:54:44 +08:00
nieziyan
78d14289f4 feat：Beta RLR 2023-09-13 08:54:29 +08:00
panbaolin
6390dc224a fix:1.完成B分析生成报告功能 2023-09-12 15:16:20 +08:00
nieziyan
7b9ce715fb fix：Bug Fix 2023-09-12 10:10:01 +08:00
nieziyan
f74a2a8358 fix：Bug Fix 2023-09-11 22:11:13 +08:00
nieziyan
21a706a263 Merge remote-tracking branch 'origin/station' into station 
# Conflicts:
#	jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/service/ISpectrumAnalysisService.java
#	jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/service/impl/SpectrumAnalysisServiceImpl.java
 2023-09-11 19:28:30 +08:00
nieziyan
46f3299f07 feat：RLR Export 2023-09-11 19:20:09 +08:00
qiaoqinzheng
881f8664da beta增加文件名称等传参 
GammaController新增initValue接口，修改查看Energy Calibration数据，修改查看Resolution Calibration数据
AnalyseData修改dbName为dbNames，新增sampleFileNames,gasFileNames,detFileNames字段
StatisticsQueryData新增detectorId字段
BgDataAnlyseResultIn新增bProcessed字段
新增RRRLogInfo实体类
GardsCalibrationPairsSpectrum,GardsCalibrationSpectrum,GardsROIChannelSpectrum新增dataType字段
getDetectorList新增返回字段detectorId
 2023-09-11 19:18:44 +08:00
nieziyan
d98a4de4b1 feat：RLR Export 2023-09-09 17:23:31 +08:00
nieziyan
c9ccba3a7e fix：分页Bug 
feat：模板文件
 2023-09-08 11:32:18 +08:00
nieziyan
609852532a fix：.gitignore 2023-09-07 20:09:42 +08:00
nieziyan
72b017a650 feat：Export Excel 2023-09-07 19:04:39 +08:00
qiaoqinzheng
5cc898bf83 gammaController层增加方法注解 
实现InteractiveTool页面新增行数确定新增接口
实现InteractiveTool页面delete按钮
实现Config User Library页面save按钮
实现InteractiveTool页面增加核素信息接口
实现InteractiveTool页面删除核素信息接口
实现InteractiveTool页面查看峰对应备注信息接口
实现InteractiveTool页面add峰对应备注信息接口
实现InteractiveTool页面查看备注信息接口
实现InteractiveTool页面add备注信息接口
查看Gamma Viewer Log页面数据修改接口内容
DBUtil存放位置修改
GammaFileUtil增加InitPeakTable方法
GammaFileUtil增加CalcNuclideMDA方法
GammaFileUtil增加ReCalcMdaMdc方法
NameStandUtil方法内容修改
PHDFileUtil新增FileNameByStandardForm方法
PHDFileUtil新增GetMatchFile方法
PHDFileUtil新增GetQCPHD方法
PeakInfo实体类comments增加默认赋值
新增AcceptInfo，AnalyseBetaInfo，CommentsInfo，NuclideInfo，UserLibraryInfo实体类
修改GardsXeResultsSpectrum实体类
新增deleteNuclidesByUserName方法
 2023-09-07 16:54:40 +08:00
panbaolin
919bae79f7 fix:1.完成B分析功能数据存储功能 2023-09-07 09:32:26 +08:00
nieziyan
61f328d577 feat：ExportFile 2023-09-06 20:07:10 +08:00
nieziyan
a210b75205 feat：Sample_G_Analysis 2023-09-05 22:37:09 +08:00
nieziyan
110f986fc1 Merge remote-tracking branch 'origin/station' into station 
# Conflicts:
#	jeecg-module-auto-process/src/main/java/org/jeecg/modules/spectrum/Prepare_G_Analysis.java
#	jeecg-module-auto-process/src/main/java/org/jeecg/modules/spectrum/Sample_G_Analysis.java
 2023-09-05 15:57:13 +08:00
nieziyan
842b544b43 fix：Sample_G_Analysis 2023-09-05 15:55:24 +08:00
qiaoqinzheng
e82a59dd38 移动并修改vo实体类引入 
实现gamma模块下saveToDB
 2023-09-04 17:17:37 +08:00
qiaoqinzheng
e930c07e65 DataType增加log日志相关数据 
GammaFileUtil实现GetMiddleData方法缺失部分
新增NameStandUtil
 2023-09-01 18:46:55 +08:00
qiaoqinzheng
5844e6480e 修改实体类 2023-09-01 15:46:49 +08:00
qiaoqinzheng
0a2c847b7a 实体类修改 2023-09-01 15:32:53 +08:00
qiaoqinzheng
a1c64c5f26 SpectrumPathProperties新增用户上传文件路径 
修改base.vo下实体类内容
新增GammaDataBase.db文件
新增查看当前用户是否有过当前台站的排班任务方法
新增DBUtil实现读取DB文件内容
新增gammaByFile接口，实现从本地读取文件内容
 2023-09-01 15:25:53 +08:00
nieziyan
b50cf9325b Merge remote-tracking branch 'origin/station' into station 2023-09-01 14:41:46 +08:00
nieziyan
2989d8076f fix：vo迁移至base 2023-09-01 14:36:05 +08:00
qiaoqinzheng
c6d4eb2381 新增CalName,MiddleDataType,RoleType枚举类 
CalType枚举类新增字段TOTALEFFICIENCY_CAL
 2023-09-01 14:34:52 +08:00
nieziyan
bcc56847aa Merge remote-tracking branch 'origin/station' into station 2023-09-01 10:45:14 +08:00
nieziyan
d6a7df1c3a fix：Gamma 2023-09-01 10:44:53 +08:00
qiaoqinzheng
30d8b5d13d 新增XeNuclideName枚举类 2023-08-31 15:29:50 +08:00
qiaoqinzheng
5852d2f686 新增CalType枚举类 2023-08-31 14:34:46 +08:00
qiaoqinzheng
fd04d6bc2d 新增fittingType枚举类 2023-08-30 19:03:42 +08:00
panbaolin
37b1eecd7d fix:1.移动枚举位置，提供多个模块公用 2023-08-30 18:57:44 +08:00
panbaolin
26f16fc210 Merge branch 'station' of http://git.hivekion.com:3000/xiaoguangbin/AnalysisSystemForRadionuclide into station 2023-08-30 17:18:22 +08:00
panbaolin
81b4ebb878 fix:1.添加分析库service 2023-08-30 17:13:27 +08:00
nieziyan
c2f303b5fb Merge remote-tracking branch 'origin/station' into station 2023-08-29 09:13:03 +08:00
nieziyan
68d113f0ab feat：谱文件排序 2023-08-29 09:12:45 +08:00
panbaolin
376be83157 Merge branch 'station' of http://git.hivekion.com:3000/xiaoguangbin/AnalysisSystemForRadionuclide into station 2023-08-28 16:45:42 +08:00
panbaolin
b44497f968 fix:1.优化代码中文件路径、换行符等代码换成常量及系统API提高可移植性 2023-08-28 16:45:21 +08:00
nieziyan
ebf03f6949 Merge remote-tracking branch 'origin/station' into station 2023-08-28 16:09:36 +08:00
nieziyan
c6cf8e8570 feat：谱文件 2023-08-28 16:09:08 +08:00
panbaolin
81a0ccf569 fix:1.优化ftp工具结构，每个线程内只打开一次ftp，使用完毕关闭ftp 
2.完成各能谱正常情况下执行步骤日志存储
 2023-08-27 14:22:20 +08:00
nieziyan
736210780b feat：谱文件上传 2023-08-24 17:07:19 +08:00
nieziyan
24910d27f4 Merge remote-tracking branch 'origin/station' into station 2023-08-22 16:53:38 +08:00
nieziyan
77bea6bda4 feat：持久化监控项 2023-08-22 16:52:26 +08:00
qiaoqinzheng
b0925663ab 自动处理相关配置信息增加日志路径 
新增公用实体类GardsNuclLinesLib
新增实体类LocalCache缓存信息到本地jvm
新增实体类分别处理对应数据
实现查询InteractiveTool，ZeroTime，Korsum，KorSumInput，energyCalibration，resolutionCalibration，EfficiencyCalibration，NuclideLibrary，configUserLibrary，viewComment，peakInformation，viewARR，viewRRR，radionuclideActivity，Spectrum，sampleInformation，viewQCResult，viewRLR，viewAutomaticAnalysisLog，viewGammaviewerLog接口
 2023-08-21 16:46:29 +08:00
nieziyan
72a8d901ea Merge remote-tracking branch 'origin/station' into station 2023-08-18 17:10:54 +08:00
nieziyan
2a8ccef920 feat：完善 2023-08-18 17:10:34 +08:00
panbaolin
d39247d991 fix:1.完成各能谱原始库数据存储、原始eml邮件存储、能谱文件存储、邮件日志存储 2023-08-18 11:10:19 +08:00
nieziyan
da69a39e95 feat：后端接口 2023-08-17 20:24:10 +08:00
nieziyan
5fd4e44a6c Merge remote-tracking branch 'origin/station' into station 2023-08-16 08:48:09 +08:00
nieziyan
29ecd492e9 feat：预警结果保存|通知 2023-08-16 08:47:46 +08:00
qiaoqinzheng
cef2f3d410 Merge remote-tracking branch 'origin/station' into station 2023-08-14 14:34:21 +08:00
qiaoqinzheng
0b7a03f283 该峰处的探测效率不确定度字段名称修改 
关闭流修改
 2023-08-14 14:34:09 +08:00
nieziyan
cdfdbc374a Merge remote-tracking branch 'origin/station' into station 2023-08-11 18:37:48 +08:00
nieziyan
321e0e19bd feat：分析结果预警 2023-08-11 18:37:07 +08:00