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

98 Commits

Author SHA1 Message Date
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