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 |
|
qiaoqinzheng
|
8cc7d138f2
|
各模块实体类增加字段说明
台站运行管理新增根据探测器id及时间查询样品数据方法
台站运行管理新增根据台站id，探测器id及时间查询状态数据方法
台站运行管理新增根据台站id及时间查询气象数据方法
实现台站运行管理查询台站下各探测器查询探测器对应的样品数据，状态数据，气象数据历史记录信息接口
|
2023-06-16 16:35:46 +08:00 |
|
nieziyan
|
f0d2d5f108
|
fix：pom文件修改
|
2023-06-16 10:06:50 +08:00 |
|
nieziyan
|
2620315fbd
|
Merge remote-tracking branch 'origin/station' into station
# Conflicts:
# jeecg-module-abnormal-alarm/pom.xml
# jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/controller/AlarmLogController.java
|
2023-06-16 09:43:22 +08:00 |
|
nieziyan
|
406fefc5c7
|
feat：ararm信息查询
|
2023-06-16 09:35:20 +08:00 |
|
qiaoqinzheng
|
a29efbca0c
|
邮箱配置实体类，邮箱日志实体类移动到base-core模块
|
2023-06-16 08:58:39 +08:00 |
|
qiaoqinzheng
|
6daca4ca17
|
服务器配置管理接口增加相关注解
邮箱配置管理接口增加相关注解
数据库配置管理接口增加相关注解
报警规则管理接口增加相关注解
报警日志管理接口增加相关注解
报警联系人组管理接口增加相关注解
系统启动类增加controller层，报警联系人组声明接口使用feignClient调用
台站运行管理核设施经纬度信息历史数据错误，经纬度交换字段推送
|
2023-06-15 14:02:04 +08:00 |
|
qiaoqinzheng
|
1f54fa41a7
|
邮箱管理增加查询历史报警信息接口
数据库管理增加查询历史报警信息接口
|
2023-06-14 15:47:49 +08:00 |
|
qiaoqinzheng
|
a9682bf4dc
|
服务器配置管理查询历史报警信息
|
2023-06-14 15:05:16 +08:00 |
|
qiaoqinzheng
|
e594618d50
|
实体类增加日期格式转换注解
|
2023-06-14 14:11:38 +08:00 |
|
qiaoqinzheng
|
805e34dd4d
|
联系人组获取用户信息方式修改
规则管理无法存入json内容修改
用户查询接口修改返回结果
|
2023-06-14 13:58:25 +08:00 |
|
qiaoqinzheng
|
e29aa15a26
|
服务器配置实体类对应数据库字段内容修改
|
2023-06-14 10:48:52 +08:00 |
|
qiaoqinzheng
|
650abef1a4
|
分页查询联系人组返回内容增加用户人数信息
|
2023-06-14 10:33:02 +08:00 |
|
qiaoqinzheng
|
5e815059b8
|
移除报警联系人单独操作的相关文件
新增用户，用户关联权限，权限等相关实体类，以及查询用户及用户关联权限方法
联系人组查询返回用户相关信息
|
2023-06-14 10:31:43 +08:00 |
|
qiaoqinzheng
|
5669c49696
|
报警联系人组传递参数修改
|
2023-06-14 09:21:24 +08:00 |
|
qiaoqinzheng
|
00f5c57887
|
增加异常报警模块内容
新增服务器配置管理相关接口
新增邮箱配置管理相关接口
新增数据库配置管理相关接口
新增报警规则相关接口
新增报警日志相关接口
新增报警联系人组相关接口
|
2023-06-14 09:20:34 +08:00 |
|