Commit Graph

65 Commits

Author SHA1 Message Date
nieziyan
37987f1bfa feat:Server监控 2023-09-25 19:38:07 +08:00
nieziyan
f53f8e4dca feat:Server监控 2023-09-22 19:39:38 +08:00
nieziyan
f984421fc1 feat:Server监控 2023-09-21 20:49:31 +08:00
nieziyan
699a8b068b fix:报警日志绑定当前报警规则,非最新规则 2023-09-21 16:05:20 +08:00
nieziyan
d8289d4d12 fix:Alarm 2023-09-15 10:05:31 +08:00
nieziyan
78d14289f4 feat:Beta RLR 2023-09-13 08:54:29 +08:00
nieziyan
c9ccba3a7e fix:分页Bug
feat:模板文件
2023-09-08 11:32:18 +08:00
nieziyan
842b544b43 fix:Sample_G_Analysis 2023-09-05 15:55:24 +08:00
nieziyan
2989d8076f fix:vo迁移至base 2023-09-01 14:36:05 +08:00
nieziyan
d6a7df1c3a fix:Gamma 2023-09-01 10:44:53 +08:00
nieziyan
dc6ef1a3c4 fix:完善 2023-08-30 16:29:28 +08:00
nieziyan
c6cf8e8570 feat:谱文件 2023-08-28 16:09:08 +08:00
nieziyan
736210780b feat:谱文件上传 2023-08-24 17:07:19 +08:00
nieziyan
77bea6bda4 feat:持久化监控项 2023-08-22 16:52:26 +08:00
nieziyan
2a8ccef920 feat:完善 2023-08-18 17:10:34 +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
321e0e19bd feat:分析结果预警 2023-08-11 18:37:07 +08:00
nieziyan
f4167456b7 feat:分析结果预警 2023-08-04 16:03:03 +08:00
nieziyan
8e9f2fc4e1 update:完善 2023-08-01 21:28:36 +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
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
6607b34729 abnormal-alarm模块下实体类移动 2023-07-31 16:44:32 +08:00
nieziyan
afd110d2b4 feat:新功能 2023-07-28 19:31:26 +08:00
nieziyan
1d3e2253aa Merge remote-tracking branch 'origin/station' into station 2023-07-24 09:47:59 +08:00
nieziyan
d08a34895b feat:alarm 2023-07-24 09:47:40 +08:00
qiaoqinzheng
4a87591bb3 报警联系人组分页查询切换分页不生效问题修改 2023-07-24 09:01:16 +08:00
qiaoqinzheng
4b113079ca 新增删除报警人联系人组下单独联系人接口 2023-07-21 10:53:47 +08:00
qiaoqinzheng
42c9bf9bea 查看联系人组详情接口修改 2023-07-21 10:41:12 +08:00
qiaoqinzheng
2d28a7d005 新增修改 2023-07-21 10:17:09 +08:00
nieziyan
82783edbcc feat:系统预警 2023-07-20 10:26:55 +08:00
nieziyan
a704571b04 feat:导出功能完善 2023-07-19 08:50:49 +08:00
nieziyan
fd1dbf84f7 系统监控预警 2023-07-10 16:42:14 +08:00
nieziyan
e8d369c46c fix:Date冲突 2023-06-21 14:48:47 +08:00
qiaoqinzheng
abf5911ff4 Merge remote-tracking branch 'origin/station' into station 2023-06-20 15:28:38 +08:00
qiaoqinzheng
bdf01355eb 所有date日期修改为LocalDate或LocalDateTime 2023-06-20 15:28:32 +08:00
nieziyan
18433010ac update 2023-06-20 15:19:06 +08:00
nieziyan
ab96c858fc Merge remote-tracking branch 'origin/station' into station
# Conflicts:
#	jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/SysEmailLog.java
2023-06-20 15:15:14 +08:00
nieziyan
619981daef feat:邮件日志接口 2023-06-20 15:12:05 +08:00
qiaoqinzheng
68db2b25de 调用feign接口传递参数为null问题修改
报警相关未修改方法名称修改
xml文件中sql书写内容修改
2023-06-20 14:51:03 +08:00
nieziyan
c5bd0f05ce Merge remote-tracking branch 'origin/station' into station 2023-06-16 20:13:19 +08:00
nieziyan
fa2366b8aa fix:依赖补全
update:接口测试修改
2023-06-16 20:12:38 +08:00