xiaoguangbin/AnalysisSystemForRadionuclide
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
772 Commits 10 Branches 0 Tags 40 MiB
9f8d730a6f
Commit Graph

272 Commits

Author SHA1 Message Date
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
qiaoqinzheng
ff969e71a4 Merge remote-tracking branch 'origin/station' into station 2023-08-10 08:47:47 +08:00
qiaoqinzheng
08d2602c69 实现公式计算新的曲线接口 
新增获取gamma对应count数据接口
新增gamma页面查询DB接口返回折线图接口
实现configure按钮接口
 2023-08-10 08:47:39 +08:00
nieziyan
ba319f5246 Merge remote-tracking branch 'origin/station' into station 2023-08-04 16:03:29 +08:00
nieziyan
f4167456b7 feat：分析结果预警 2023-08-04 16:03:03 +08:00
orgin
cf0888d172 feat：增加 系统管理-核素默认配置分页查询接口 2023-08-04 15:59:08 +08:00
nieziyan
8e9f2fc4e1 update：完善 2023-08-01 21:28:36 +08:00
panbaolin
6314f037e4 fix:1.删除邮件管理器@Compoint注解，添加能谱解析状态枚举 2023-08-01 15:11:52 +08:00
nieziyan
996c487908 feat：合并 2023-08-01 11:56:48 +08:00
nieziyan
e4fa2ada44 Merge remote-tracking branch 'origin/station' into station 2023-08-01 11:29:50 +08:00
qiaoqinzheng
e01beceacf 报警模块工具类冲突导致问题修改 2023-08-01 11:29:30 +08:00
nieziyan
4636d5038c Merge remote-tracking branch 'origin/station' into station 
# Conflicts:
#	jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/service/impl/SysDatabaseServiceImpl.java
#	jeecg-module-web-statistics/src/main/java/org/jeecg/modules/controller/WebStatisticsController.java
#	jeecg-module-web-statistics/src/main/java/org/jeecg/modules/mapper/GardsMetDataMapper.java
#	jeecg-module-web-statistics/src/main/java/org/jeecg/modules/mapper/GardsSampleDataWebMapper.java
#	jeecg-module-web-statistics/src/main/java/org/jeecg/modules/mapper/GardsSohDataMapper.java
#	jeecg-module-web-statistics/src/main/java/org/jeecg/modules/service/IGardsMetDataService.java
#	jeecg-module-web-statistics/src/main/java/org/jeecg/modules/service/IGardsSampleDataWebService.java
#	jeecg-module-web-statistics/src/main/java/org/jeecg/modules/service/IGardsSohDataService.java
#	jeecg-module-web-statistics/src/main/java/org/jeecg/modules/service/impl/AutoServiceImpl.java
#	jeecg-module-web-statistics/src/main/java/org/jeecg/modules/service/impl/GardsMetDataServiceImpl.java
#	jeecg-module-web-statistics/src/main/java/org/jeecg/modules/service/impl/GardsSampleDataWebServiceImpl.java
#	jeecg-module-web-statistics/src/main/java/org/jeecg/modules/service/impl/GardsSohDataServiceImpl.java
#	jeecg-module-web-statistics/src/main/java/org/jeecg/modules/service/impl/ReviewedServiceImpl.java
 2023-08-01 11:17:04 +08:00
nieziyan
e390fda254 feat：合并 2023-08-01 10:57:33 +08:00
qiaoqinzheng
566e11aaf3 报警模块实体类引入修改 
redis缓存工具类移动
 2023-08-01 10:48:22 +08:00
qiaoqinzheng
8194e89326 实体类内容修改 2023-08-01 10:42:52 +08:00
qiaoqinzheng
2d8b68e25a web-statistics模块下实体类移动到base-core下 2023-08-01 08:58:52 +08:00
nieziyan
3c1b3f2c80 Merge remote-tracking branch 'origin/station' into station 
# Conflicts:
#	jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/service/impl/SysDatabaseServiceImpl.java
#	jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/controller/SysDictController.java
#	jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/mapper/SysDictMapper.java
#	jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/ISysDictService.java
#	jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysDictServiceImpl.java
 2023-07-31 20:30:22 +08:00
nieziyan
d8e13a803c feat：功能完善 2023-07-31 20:19:54 +08:00
qiaoqinzheng
1667b43218 台站运行管理模块下实体类移动到base-core下 2023-07-31 17:22:47 +08:00
qiaoqinzheng
016cca95f0 系统类下实体类移动到base-core下 2023-07-31 17:11:52 +08:00
qiaoqinzheng
ed146db779 新增人工交互实体类 2023-07-31 16:47:14 +08:00
qiaoqinzheng
6607b34729 abnormal-alarm模块下实体类移动 2023-07-31 16:44:32 +08:00
nieziyan
fb320c6888 Merge remote-tracking branch 'origin/station' into station 
# Conflicts:
#	jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysUserServiceImpl.java
 2023-07-28 19:33:36 +08:00
nieziyan
afd110d2b4 feat：新功能 2023-07-28 19:31:26 +08:00
qiaoqinzheng
c1a9a43f91 Merge remote-tracking branch 'origin/station' into station 2023-07-24 10:51:05 +08:00
qiaoqinzheng
09902eaec3 FTPUtil新增获取ftp登录用户名，ftp登录密码，ftp字符集方法 
PHDFileUtil实现查询按钮灯颜色方法，读取行数据方法，修改获取数据方法
新增UserTaskUtil工具类判断当前用户是否有排班任务权限操作当前台站信息
实现删除折线图缓存数据接口，查看comment数据接口，新增comment接口，查看ARR报告接口，查看RRR报告接口，查看Spectrum数据接口，查看SampleInformation数据接口，查看QC Result数据接口，查看RLR数据接口
新增部分实体类
修改探测器相关文件名称解决重名冲突问题
ReadLineUtil切换文件路径方式修改
新增查询用户排班任务接口
 2023-07-24 10:50:57 +08:00
nieziyan
1d3e2253aa Merge remote-tracking branch 'origin/station' into station 2023-07-24 09:47:59 +08:00
nieziyan
d08a34895b feat：alarm 2023-07-24 09:47:40 +08:00
qiaoqinzheng
45f4df3ab6 properties配置文件移动到base-core公用包下 2023-07-24 09:02:51 +08:00
nieziyan
82783edbcc feat：系统预警 2023-07-20 10:26:55 +08:00
nieziyan
a704571b04 feat：导出功能完善 2023-07-19 08:50:49 +08:00
nieziyan
8928607514 Merge remote-tracking branch 'origin/station' into station 2023-07-12 17:02:00 +08:00
nieziyan
cc8830a749 文件查看 2023-07-12 17:01:36 +08:00
qiaoqinzheng
c73825b92d 日期转换json增加时区相关注解 2023-07-12 15:44:40 +08:00
qiaoqinzheng
0b286a9af2 spectrum-analysis模块实现查询折线图相关接口 2023-07-11 15:36:02 +08:00
qiaoqinzheng
6003bc8cf8 用户管理模块增加根据用户名查询用户信息 
字典管理模块增加根据名称查询对应台站数据接口
web-statistics模块新增根据名称查询对应台站数据调用feign客户端
web-statistics模块新增报警状态数据实体类
web-statistics模块新增报警状态数据mapper
web-statistics模块新增分页查询报警状态数据信息接口
状态数据实体类开始时间，操作时间，结束时间列增加时区
 2023-07-10 16:51:15 +08:00
nieziyan
a340345cd8 Merge remote-tracking branch 'origin/station' into station 
# Conflicts:
#	jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/controller/SysUserController.java
 2023-07-10 16:45:31 +08:00
nieziyan
fd1dbf84f7 系统监控预警 2023-07-10 16:42:14 +08:00
qiaoqinzheng
7478db42c8 oracle相关实体类中TableName注解表名前增加实例名称 2023-07-07 14:48:31 +08:00
qiaoqinzheng
f506e0ab28 新增字段calibReports 2023-07-04 17:24:48 +08:00
qiaoqinzheng
41987c9d60 Merge remote-tracking branch 'origin/station' into station 2023-07-04 17:06:06 +08:00
qiaoqinzheng
cc9fc9e88a 修改web-statistics模块读取PHD文件方法，根据头部信息读取不同的内容 
增加SampleFileHeader枚举匹配对应的文件头部信息
新增HistogramData实体类存储对应的横纵竖数据
 2023-07-04 17:05:59 +08:00
panbaolin
8c22ffd5c6 fix:1.提交原始库相应实体2.提交邮件能谱处理结构 2023-07-04 14:34:52 +08:00
orgin
fc4e994500 fix：解决ftp连接成功之后无法获取文件列表问题 2023-07-04 14:19:42 +08:00
panbaolin
1c99371fd2 fix:1.提交邮件日志实体 2023-06-21 11:18:58 +08:00
panbaolin
72f564b155 fix:1.提交自动处理程序工程 2023-06-21 11:16:50 +08:00
qiaoqinzheng
abf5911ff4 Merge remote-tracking branch 'origin/station' into station 2023-06-20 15:28:38 +08:00
qiaoqinzheng
bdf01355eb 所有date日期修改为LocalDate或LocalDateTime 2023-06-20 15:28:32 +08:00
nieziyan
ab96c858fc Merge remote-tracking branch 'origin/station' into station 
# Conflicts:
#	jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/SysEmailLog.java
 2023-06-20 15:15:14 +08:00
nieziyan
619981daef feat：邮件日志接口 2023-06-20 15:12:05 +08:00
panbaolin
306e5e65dd fix:1.提交邮件常量、ftp工具类、邮件实体、邮件日志实体 2023-06-19 19:55:50 +08:00
qiaoqinzheng
bf6b784e78 公用模块下气体数据实体类，状态数据实体类，样品数据实体类增加字段注解 
移除系统模块下的样品数据实体类
 2023-06-16 16:46:41 +08:00
panbaolin
c618e6957f fix:1.编写ftp检查目录、删除文件、写入文件功能2.修改邮箱数据表字段 2023-06-16 10:16:04 +08:00
qiaoqinzheng
a29efbca0c 邮箱配置实体类，邮箱日志实体类移动到base-core模块 2023-06-16 08:58:39 +08:00
qiaoqinzheng
7a055994f3 气象数据实体类，状态数据实体类，样品基础数据实体类移到公用模块下 
台站运行管理查询树形结构接口内容修改
日志管理增加查询文件夹树形结构后关闭ftp连接
日志管理增加查询文件内容信息后关闭ftp连接
日志管理下载文件接口修改，下载后管理流以及ftp连接
增加静态名称工具类
system模块修改缓存信息方法
system模块新增根据台站id查询探测器信息方法
 2023-06-16 08:49:30 +08:00
qiaoqinzheng
e43fec651b 日志管理关闭ftp连接 
下载文件代码修改
 2023-06-15 14:27:08 +08:00
qiaoqinzheng
b6c3f270f8 ftp工具类修改位置 2023-06-08 11:05:07 +08:00
qiaoqinzheng
f45fee5d62 台站运行管理页面查询台站及核设施信息接口 
台站运行管理查询关注台站信息接口
台站运行新增关注台站信息
台站运行移除关注台站信息
 2023-05-26 14:54:12 +08:00
qiaoqinzheng
b2a04b0574 feat：排班任务导入接口修改，排班任务导出接口修改，排班任务导出导入模板接口修改 2023-05-23 11:48:39 +08:00
qiaoqinzheng
f614cf391b feat：排版任务信息查询接口，排版任务信息新增接口 2023-05-16 14:46:53 +08:00
qiaoqinzheng
2ed5ac5527 feat：新增自建台站相关接口，修改台站信息相关接口返回值 2023-05-11 15:08:59 +08:00
qiaoqinzheng
1fb3afb5d5 feat：台站相关代码 2023-05-10 08:35:31 +08:00
orgin
48c4a8b57f first commit 2023-05-06 15:51:29 +08:00