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 |
|
panbaolin
|
d39247d991
|
fix:1.完成各能谱原始库数据存储、原始eml邮件存储、能谱文件存储、邮件日志存储
|
2023-08-18 11:10:19 +08:00 |
|
nieziyan
|
da69a39e95
|
feat：后端接口
|
2023-08-17 20:24:10 +08:00 |
|
qiaoqinzheng
|
2bc6d4352b
|
Merge remote-tracking branch 'origin/station' into station
|
2023-08-16 08:55:48 +08:00 |
|
qiaoqinzheng
|
b58fa3dceb
|
新增information实体类
|
2023-08-16 08:55:39 +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 |
|
qiaoqinzheng
|
614e0205d0
|
Merge remote-tracking branch 'origin/station' into station
|
2023-08-02 10:36:07 +08:00 |
|
qiaoqinzheng
|
1e9c2b156d
|
计算台站数据的质量
|
2023-08-02 10:36:00 +08:00 |
|
nieziyan
|
694162ed78
|
Merge remote-tracking branch 'origin/station' into station
|
2023-08-01 21:28:53 +08:00 |
|
nieziyan
|
8e9f2fc4e1
|
update：完善
|
2023-08-01 21:28:36 +08:00 |
|
qiaoqinzheng
|
23265b3046
|
根据新的参数计算新的曲线数据接口实现
|
2023-08-01 17:15:46 +08:00 |
|
qiaoqinzheng
|
24b115744a
|
截取数组多截取问题修改
|
2023-08-01 16:04:52 +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
|
aad350fe9c
|
报警模块实体类引入内容修改
|
2023-08-01 10:50:50 +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 |
|