Commit Graph

120 Commits

Author SHA1 Message Date
nieziyan
dfb536fbbb fix:1.补路径分隔符 2.SQL语句分号 2023-11-03 19:34:56 +08:00
nieziyan
430ada5d23 feat:清理数据和文件 2023-11-03 19:14:22 +08:00
nieziyan
f9d780379f feat:concAvg log 2023-10-28 15:23:21 +08:00
nieziyan
1579e41504 Merge remote-tracking branch 'origin/station' into station 2023-10-28 15:20:13 +08:00
nieziyan
8a53ecd1db feat:concAvg log 2023-10-28 15:19:58 +08:00
qiaoqinzheng
87fb378000 台站运行管理查看台站数据提供率及有效率接口修改为redis启动时缓存方式
台站运行管理查询台站查询台站监测数据信息修改为redis启动时缓存方式
修改台站Map缓存格式
2023-10-28 14:06:45 +08:00
qiaoqinzheng
d3e00b1660 邮箱日志生成
台站运行管理查看台站数据提供率及有效率接口修改为redis启动时缓存方式
台站运行管理查询台站查询台站监测数据信息修改为redis启动时缓存方式
beta功能增加查看Auto日志接口
2023-10-28 09:54:33 +08:00
nieziyan
eebe1d8aeb feat:发送单封邮件 2023-10-27 10:27:40 +08:00
nieziyan
8472cf96fb fix:邮件服务器邮件量 2023-10-24 17:13:49 +08:00
nieziyan
74c54c98f0 Merge remote-tracking branch 'origin/station' into station 2023-10-24 10:45:07 +08:00
nieziyan
07c7122bc0 fix:bug 2023-10-24 10:43:35 +08:00
qiaoqinzheng
8045c3fc37 修改返回提示语句中文改为英文 2023-10-23 15:24:01 +08:00
xiaoguangbin
4f040ebd4f Merge remote-tracking branch 'origin/station' into station 2023-10-23 10:49:02 +08:00
xiaoguangbin
c9cb095a9b fix: 解决gamma自动处理推送分析进度会出现userid=null的问题 2023-10-23 10:48:55 +08:00
qiaoqinzheng
21c0fa8edc 修改gamma,beta功能的提示语句替换成英文
gamma功能的导出excel失败问题修改
2023-10-23 10:34:40 +08:00
nieziyan
54d1e95474 fix:1.启用验证码 2.FTP目录创建问题 2023-10-13 11:13:47 +08:00
nieziyan
30cb94a4ce fix:1.移动核素库位置2.pom.xml文件 2023-10-12 15:58:37 +08:00
nieziyan
5a661771e3 fix:修改消息队列 2023-10-07 19:25:42 +08:00
nieziyan
d9731c97e9 feat:增加枚举 2023-09-28 11:16:05 +08:00
nieziyan
0149c0b823 update:rename 2023-09-28 10:42:21 +08:00
nieziyan
b1d989c9cf feat:Server监控
fix:修改监控项同步策略
2023-09-26 19:19:01 +08:00
qiaoqinzheng
0e4b4039e3 GammaController新增testFun测试dll分析方法
PHDFile新增userId,xmlFilePath字段
修改部分实体类内字段大小写问题
CalValuesHandler去掉多余的计算方法,新增实现analyseSpectrum方法
新增BaseCtrlStack实体类
2023-09-24 18:43:20 +08:00
orgin
9c9fbbb80e fix: gamma分析进度通过 redis 订阅发送 webSocket 消息 2023-09-22 19:19:25 +08:00
nieziyan
699a8b068b fix:报警日志绑定当前报警规则,非最新规则 2023-09-21 16:05:20 +08:00
nieziyan
3201a13cc8 fix:记录报警日志缺少RuleId 2023-09-21 14:08:15 +08:00
nieziyan
d8289d4d12 fix:Alarm 2023-09-15 10:05:31 +08:00
orgin
a06fbed52a fix: 修改 redis 初始化GardsNuclLinesLib数据 2023-09-13 16:34:28 +08:00
nieziyan
78d14289f4 feat:Beta RLR 2023-09-13 08:54:29 +08:00
nieziyan
fb4b563aee fix:NullPointException 2023-09-05 16:23:12 +08:00
nieziyan
842b544b43 fix:Sample_G_Analysis 2023-09-05 15:55:24 +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
a1c64c5f26 SpectrumPathProperties新增用户上传文件路径
修改base.vo下实体类内容
新增GammaDataBase.db文件
新增查看当前用户是否有过当前台站的排班任务方法
新增DBUtil实现读取DB文件内容
新增gammaByFile接口,实现从本地读取文件内容
2023-09-01 15:25:53 +08:00
nieziyan
d6a7df1c3a fix:Gamma 2023-09-01 10:44:53 +08:00
nieziyan
c6cf8e8570 feat:谱文件 2023-08-28 16:09:08 +08:00
nieziyan
77bea6bda4 feat:持久化监控项 2023-08-22 16:52:26 +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
nieziyan
da69a39e95 feat:后端接口 2023-08-17 20:24:10 +08:00
nieziyan
29ecd492e9 feat:预警结果保存|通知 2023-08-16 08:47:46 +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
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