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 |
|
panbaolin
|
b5cdc53181
|
fix:1.优化能谱处理类结构
|
2023-08-30 17:22:12 +08:00 |
|
nieziyan
|
e8a2b70334
|
Merge remote-tracking branch 'origin/station' into station
|
2023-08-30 17:19:48 +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
|
dc6ef1a3c4
|
fix：完善
|
2023-08-30 16:29:28 +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 |
|
qiaoqinzheng
|
d6f40d1025
|
Merge remote-tracking branch 'origin/station' into station
|
2023-08-28 17:14:52 +08:00 |
|
qiaoqinzheng
|
1164b9c9ea
|
台站运行管理查询有效率接口新增used返回字段内容
|
2023-08-28 17:14:36 +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 |
|
qiaoqinzheng
|
101c851b34
|
新增ComputePeakRange方法
|
2023-08-28 15:14:56 +08:00 |
|
qiaoqinzheng
|
fc757f9f3e
|
新增insertPeaks方法
新增calFitPara方法
|
2023-08-28 15:12:23 +08:00 |
|
panbaolin
|
81a0ccf569
|
fix:1.优化ftp工具结构，每个线程内只打开一次ftp，使用完毕关闭ftp
2.完成各能谱正常情况下执行步骤日志存储
|
2023-08-27 14:22:20 +08:00 |
|
nieziyan
|
2ffe64f352
|
Merge remote-tracking branch 'origin/station' into station
|
2023-08-24 17:07:36 +08:00 |
|
nieziyan
|
736210780b
|
feat：谱文件上传
|
2023-08-24 17:07:19 +08:00 |
|
orgin
|
77701a5d2b
|
feat：nacos pgsql数据库表结构
|
2023-08-23 15:09:39 +08:00 |
|
orgin
|
eb726a9061
|
Merge remote-tracking branch 'origin/station' into station
|
2023-08-23 15:06:49 +08:00 |
|
orgin
|
d0a088791f
|
feat：解决nacos 无法持久化到 pgsql的问题
|
2023-08-23 15:06:37 +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 |
|
orgin
|
9b9af8a481
|
feat：解决定时器启动时卡死问题
|
2023-08-18 17:07:59 +08:00 |
|