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

830 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
nieziyan
136920dfeb fix：Code Merge 2023-09-11 19:46:08 +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
qiaoqinzheng
868f0b7a93 Merge remote-tracking branch 'origin/station' into station 2023-09-07 15:03:40 +08:00
qiaoqinzheng
d1dcb4b5cc logMange树形结构问题修改 2023-09-07 15:03:31 +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
fb4b563aee fix：NullPointException 2023-09-05 16:23:12 +08:00
nieziyan
d78267f219 fix：合并冲突 2023-09-05 16:00:27 +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
d8ec995ecf Merge remote-tracking branch 'origin/station' into station 2023-09-04 17:17:45 +08:00
qiaoqinzheng
e82a59dd38 移动并修改vo实体类引入 
实现gamma模块下saveToDB
 2023-09-04 17:17:37 +08:00
xiaoguangbin
ad740f6aae fix：更换数据库插件 解决无法nacos无法打包问题 2023-09-04 15:49:49 +08:00
qiaoqinzheng
1a56e3e664 NameStandUtil增加Component注解 2023-09-04 10:50:15 +08:00
nieziyan
521f45a799 Merge remote-tracking branch 'origin/station' into station 2023-09-04 09:29:46 +08:00
nieziyan
ba02a0567f fix：Sample_G_Analysis 2023-09-04 09:29:28 +08:00
qiaoqinzheng
49b0e7791f baseLine,Lc,Scac路径赋值 2023-09-04 09:28:25 +08:00
nieziyan
866cc35790 Merge remote-tracking branch 'origin/station' into station 2023-09-01 18:56:01 +08:00
nieziyan
0b61778dc3 fix：Sample_G_Analysis 2023-09-01 18:55:37 +08:00
qiaoqinzheng
e930c07e65 DataType增加log日志相关数据 
GammaFileUtil实现GetMiddleData方法缺失部分
新增NameStandUtil
 2023-09-01 18:46:55 +08:00
nieziyan
ee174a95bb Merge remote-tracking branch 'origin/station' into station 2023-09-01 18:05:24 +08:00
nieziyan
73dc624d51 fix：Sample_G_Analysis 2023-09-01 18:05:01 +08:00
qiaoqinzheng
a1dc41ff44 查询关注台站信息列表增加根据用户id过滤条件 2023-09-01 17:10:30 +08:00
qiaoqinzheng
7edab0412f GammaFileUtil下GetMiddleData方法遗漏字段增加 
SpectrumAnalysisServiceImpl下ViewRRR接口增加日期格式化
 2023-09-01 15:57:18 +08:00
nieziyan
807c8270ee Merge remote-tracking branch 'origin/station' into station 2023-09-01 15:48:41 +08:00
nieziyan
7a17501078 fix： 2023-09-01 15:47:29 +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
f4a5f7a1b9 fix：移除无用import 2023-09-01 14:41:02 +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
f70cc10b55 新增Gamma模块存储数据库实体类 2023-09-01 10:12:37 +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
26ec3e3f19 fix:1.添加能谱文件未找到自定义异常 2023-08-30 18:58:46 +08:00
panbaolin
37b1eecd7d fix:1.移动枚举位置，提供多个模块公用 2023-08-30 18:57:44 +08:00
panbaolin
585d51afe9 Merge branch 'station' of http://git.hivekion.com:3000/xiaoguangbin/AnalysisSystemForRadionuclide into station 2023-08-30 17:23:01 +08:00