xiaohuo
|
5b1c29e8d4
|
Merge branch 'dev' of https://gitea.wangzhiwen.top/0214/ALOps_sys1 into dev
|
8 months ago |
Wangxin
|
27b9c5c1fc
|
【web】 预览修改
|
8 months ago |
xiaohuo
|
1f9b8f81fb
|
Merge branch 'dev' of https://gitea.wangzhiwen.top/0214/ALOps_sys1 into dev
|
8 months ago |
xiaohuo
|
83632d6285
|
11.14上传图片修改
|
8 months ago |
Wangxin
|
c51056d981
|
【web】 调整图片宽度
|
8 months ago |
xiaohuo
|
0ab4b2ee7a
|
Merge branch 'dev' of https://gitea.wangzhiwen.top/0214/ALOps_sys1 into dev
|
8 months ago |
Wangxin
|
7c1edbc1b3
|
【web】 上传问题
|
8 months ago |
Wangxin
|
63403d1ce2
|
【web】 增加设备状态
|
8 months ago |
xiaohuo
|
a56363ae2a
|
Merge branch 'dev' of https://gitea.wangzhiwen.top/0214/ALOps_sys1 into dev
|
8 months ago |
Wangxin
|
d036f6de7f
|
【web】 预览现在功能实现
|
8 months ago |
xiaohuo
|
959a5ee9a0
|
Merge branch 'dev' of https://gitea.wangzhiwen.top/0214/ALOps_sys1 into dev
|
8 months ago |
Wangxin
|
f095eb13ad
|
【web】 预计年限调整
|
8 months ago |
Wangxin
|
7d33ce933d
|
【web】 去掉设备编号
|
8 months ago |
Wangxin
|
24581b3c2d
|
【web】风险等级优化
|
8 months ago |
xiaohuo
|
ed8f876488
|
Merge branch 'dev' of https://gitea.wangzhiwen.top/0214/ALOps_sys1 into dev
|
8 months ago |
Wangxin
|
b80d47b4d5
|
【web】 退出登录逻辑修改
|
8 months ago |
Wangxin
|
dd896139a0
|
【web】 form 样式修改
|
8 months ago |
Wangxin
|
e84604582e
|
【web】 在输入年限数据时做一下校如果不是整数则提示输入整数。
|
8 months ago |
Wangxin
|
87d27225dc
|
【web】 ai对话修改
|
8 months ago |
xiaohuo
|
4f466e4391
|
Merge branch 'dev' of https://gitea.wangzhiwen.top/0214/ALOps_sys1 into dev
|
8 months ago |
xiaohuo
|
91b37cfe52
|
11.11下载文件
|
8 months ago |
Wangxin
|
3ed3fcc8d8
|
【web】 登录失效跳转失败
|
8 months ago |
Wangxin
|
1cec03283e
|
【web】 在设备档案点击设备名称,跳转到该设备监测界面
|
8 months ago |
Wangxin
|
083f8e4ea2
|
【web】 时间格式修改
|
8 months ago |
Wangxin
|
300524ab75
|
【web】 最小间隔
|
8 months ago |
Wangxin
|
4cb2d148a5
|
【web】 供应商重置
|
8 months ago |
xiaohuo
|
631872ec47
|
Merge branch 'dev' of https://gitea.wangzhiwen.top/0214/ALOps_sys1 into dev
|
8 months ago |
xiaohuo
|
33d3f19c4c
|
11.11交
|
8 months ago |
lzh1232
|
d25c6e6a58
|
Merge branch 'dev' of https://gitea.wangzhiwen.top/0214/ALOps_sys1 into dev
|
8 months ago |
lzh1232
|
08f00c2825
|
11.11 顺序排列
|
8 months ago |
xiaohuo
|
df48131704
|
Merge branch 'dev' of https://gitea.wangzhiwen.top/0214/ALOps_sys1 into dev
|
8 months ago |
Wangxin
|
140ede9177
|
【web】 修改详情显示逻辑
|
8 months ago |
Wangxin
|
480b5f1a8f
|
【web】 ai助手调整
|
8 months ago |
xiaohuo
|
059bc608ad
|
Merge branch 'dev' of https://gitea.wangzhiwen.top/0214/ALOps_sys1 into dev
|
8 months ago |
xiaohuo
|
1160bc51de
|
11.10ai改
|
8 months ago |
Wangxin
|
198868bc3d
|
【web】 文案修改
|
8 months ago |
Wangxin
|
044a767ed7
|
【web】 修改权限文件
|
8 months ago |
lzh1232
|
12fb40a5cc
|
11.10 修改注释
|
8 months ago |
lzh1232
|
e096d8e458
|
Merge branch 'dev' of https://gitea.wangzhiwen.top/0214/ALOps_sys1 into dev
# Conflicts:
# ALOps_sys_backend/alops-admin/src/main/java/com/alops/web/controller/exceptionController/AlertMessageController.java
|
8 months ago |
lzh1232
|
8c245845d1
|
11.10 添加注释
|
8 months ago |
xiaohuo
|
9a4ba243d7
|
11.10采集规则改变
|
8 months ago |
xiaohuo
|
4aedf1dc27
|
11.10采集规则+日志
|
8 months ago |
xiaohuo
|
e676262542
|
Merge branch 'dev' of https://gitea.wangzhiwen.top/0214/ALOps_sys1 into dev
|
8 months ago |
xiaohuo
|
7a101cbb3b
|
11.9AI异常+预警信息权限标识
|
8 months ago |
Wangxin
|
dbb777c87e
|
【web】 修改一分钟消失弹窗
|
8 months ago |
Wangxin
|
2b80afb299
|
【web】 前端权限匹配
|
8 months ago |
xiaohuo
|
4f9904398a
|
Merge branch 'dev' of https://gitea.wangzhiwen.top/0214/ALOps_sys1 into dev
|
8 months ago |
Wangxin
|
1f5e8cc85b
|
【web】 ai提问api修改
|
8 months ago |
Wangxin
|
fbef639ab4
|
【web】标题修改
|
8 months ago |
xiaohuo
|
f918bcf1a5
|
Merge branch 'dev' of https://gitea.wangzhiwen.top/0214/ALOps_sys1 into dev
|
8 months ago |
xiaohuo
|
7358f60df7
|
11.9预警信息+预警评估修改
|
8 months ago |
Wangxin
|
d00e998586
|
【web】 title添加
|
8 months ago |
lzh1232
|
f7a65a2f28
|
11.9 楼层统计
|
8 months ago |
xiaohuo
|
88ffead7ba
|
11.9预警信息的查询修改
|
8 months ago |
Wangxin
|
f23fd9975b
|
【web】 预警信息增加编辑功能
|
8 months ago |
xiaohuo
|
1403426e9f
|
Merge branch 'dev' of https://gitea.wangzhiwen.top/0214/ALOps_sys1 into dev
|
8 months ago |
Wangxin
|
6b43af9840
|
【web】 样式修改
|
8 months ago |
Wangxin
|
04b683549b
|
【web】 智能助手接口
|
8 months ago |
Wangxin
|
e81fa37a1c
|
【web】 logo替换
|
8 months ago |
Wangxin
|
b9db8cb5cf
|
【web】 站内信列表修改
|
8 months ago |
Wangxin
|
f87b2dc553
|
【web】 预警信息 修改
|
8 months ago |
Wangxin
|
387952c9c5
|
【web】 信息采集修改
|
8 months ago |
xiaohuo
|
d4a3472c41
|
Merge branch 'dev' of https://gitea.wangzhiwen.top/0214/ALOps_sys1 into dev
|
8 months ago |
xiaohuo
|
8a69645044
|
11.8预警信息修改
|
8 months ago |
lzh1232
|
7796455523
|
11.8 预警总数int改为string
|
8 months ago |
Wangxin
|
f8eff9d921
|
【web】 首页设备名称修改
|
8 months ago |
Wangxin
|
2edfb21502
|
【web】 权限逻辑修改
|
8 months ago |
Wangxin
|
bcac46fb43
|
【web】 弹窗时间
|
8 months ago |
Wangxin
|
ff14ed67a0
|
【web】 历史切换bug
|
8 months ago |
Wangxin
|
9a1ec73a6a
|
【web】 修改设备详情
|
8 months ago |
Wangxin
|
7aa876bb63
|
Merge branch 'dev' of https://gitea.wangzhiwen.top/0214/ALOps_sys1 into dev
|
8 months ago |
lzh1232
|
8493f9f2ee
|
11.7 预警信息的类型改为string
|
8 months ago |
lzh1232
|
2962b41310
|
Merge branch 'dev' of https://gitea.wangzhiwen.top/0214/ALOps_sys1 into dev
|
8 months ago |
lzh1232
|
ada6243ea4
|
11.7 监控详细界面的数据展示更改
|
8 months ago |
xiaohuo
|
59946ef73f
|
Merge branch 'dev' of https://gitea.wangzhiwen.top/0214/ALOps_sys1 into dev
|
8 months ago |
xiaohuo
|
ed3cd10ca7
|
11.7信息修改
|
8 months ago |
Wangxin
|
c1fb6367b0
|
【web】 上传修改
|
8 months ago |
lzh1232
|
9c18db32cc
|
Merge branch 'dev' of https://gitea.wangzhiwen.top/0214/ALOps_sys1 into dev
|
8 months ago |
lzh1232
|
2960fb87d7
|
11.6 监控详细界面的数据展示
|
8 months ago |
Wangxin
|
be33bd1416
|
【web】 触发条件修改
|
8 months ago |
Wangxin
|
50d5e5e022
|
【web】 添加veneer模块
|
8 months ago |
Wangxin
|
ddc716eabd
|
【web】 站内信弹窗改一分钟
|
8 months ago |
Wangxin
|
f1d706c759
|
【web】 修改空状态判定
|
8 months ago |
Wangxin
|
9039f8db87
|
【web】 添加站内信功能
|
8 months ago |
xiaohuo
|
3756a61f9e
|
11.6站内信list修改
|
8 months ago |
xiaohuo
|
ba849694f1
|
11.6添加外部中断钩子
|
8 months ago |
xiaohuo
|
e52a5cd73b
|
11.6 采集改错
|
8 months ago |
Wangxin
|
d7ee5ad79f
|
【web】 预警规则,触发条件修改
|
8 months ago |
Wangxin
|
20c7d638c2
|
【web】 设备状态监控
|
8 months ago |
Wangxin
|
41a4f12573
|
【web】 设备信息采集 不允许选择当前之前的时间
|
8 months ago |
Wangxin
|
2cc75b47ac
|
【web】 首页设备类型修改
|
8 months ago |
Wangxin
|
af29ef98b7
|
【web】 设备版本去掉
|
8 months ago |
Wangxin
|
d2cd61ed3c
|
【web】 设备类型修改
|
8 months ago |
xiaohuo
|
f0d66ce892
|
11.3采集规则发送消息的完善
|
8 months ago |
xiaohuo
|
f01dfb2f37
|
Merge branch 'dev' of https://gitea.wangzhiwen.top/0214/ALOps_sys1 into dev
|
8 months ago |
xiaohuo
|
aa89a9dbfb
|
11.2采集规则修改,预警+采集的容错性
|
8 months ago |
Wangxin
|
8872c08aa5
|
【web】 增加退出登录功能
|
8 months ago |
Wangxin
|
aa9c1ea612
|
【web】 预警信息 增加删除
|
8 months ago |
Wangxin
|
a33951bc42
|
【web】 首页设备状态改为健康度
|
8 months ago |
Wangxin
|
5124226565
|
【web】 首页UI调整完成
|
8 months ago |
Wangxin
|
68ca7e555c
|
【web】 首页UI调整
|
8 months ago |
lzh1232
|
3099fce75b
|
11.1 新增vlan修改接口
|
8 months ago |
lzh1232
|
2d59fbf751
|
Merge branch 'dev' of https://gitea.wangzhiwen.top/0214/ALOps_sys1 into dev
|
8 months ago |
lzh1232
|
c20f2f0056
|
11.1 接口信息的采集时间显示问题
|
8 months ago |
lzh1232
|
a2c8083877
|
11.1 安装日期精确到天
|
8 months ago |
xiaohuo
|
e1ae9244ae
|
Merge branch 'dev' of https://gitea.wangzhiwen.top/0214/ALOps_sys1 into dev
|
8 months ago |
xiaohuo
|
6fa2119b13
|
11.1设备档案的品牌型号
|
8 months ago |
lzh1232
|
a561494b84
|
11.1 新增品牌型号字段
|
8 months ago |
xiaohuo
|
d5722f787f
|
11.1品牌型号添加
|
8 months ago |
xiaohuo
|
839f9af17f
|
Merge branch 'dev' of https://gitea.wangzhiwen.top/0214/ALOps_sys1 into dev
|
8 months ago |
xiaohuo
|
36a83036d6
|
10.31预警信息的时间格式修改
|
8 months ago |
Wangxin
|
bc89828f10
|
【web】 首页接口对接基本完成
|
8 months ago |
xiaohuo
|
71e198a1c4
|
Merge branch 'dev' of https://gitea.wangzhiwen.top/0214/ALOps_sys1 into dev
|
8 months ago |
xiaohuo
|
2a9ac317a4
|
10.31设备档案查询修改,设备类型创建日期修改
|
8 months ago |
Wangxin
|
fcd437e0a0
|
【web】 首页设备状态监控
|
8 months ago |
Wangxin
|
1da2ecdbe8
|
【web】 正常逻辑修改
|
8 months ago |
xiaohuo
|
a26e383f74
|
Merge branch 'dev' of https://gitea.wangzhiwen.top/0214/ALOps_sys1 into dev
|
8 months ago |
xiaohuo
|
aea8929bf1
|
10.29聊天url修正
|
8 months ago |
Wangxin
|
e6d5b85785
|
【web】 完成站内信功能
|
8 months ago |
Wangxin
|
e066bca3db
|
【web】 增加站内信
|
8 months ago |
YYD-YY
|
5d69726a64
|
Merge branch 'dev' of https://gitea.wangzhiwen.top/0214/ALOps_sys1 into dev
# Conflicts:
# ALOps_sys_backend/alops-system/pom.xml
|
8 months ago |
YYD-YY
|
5663d36d70
|
10.28 新增层数统计、修改首页接口信息
|
8 months ago |
xiaohuo
|
7aa07df754
|
10.28websocket模块修改
|
8 months ago |
xiaohuo
|
0950044a88
|
10.27首页预警信息修改,增加预警信息修改
|
8 months ago |
xiaohuo
|
7f516a6e9b
|
10.27增加设备楼层信息
|
8 months ago |
xiaohuo
|
73c643ab5b
|
Merge branch 'dev' of https://gitea.wangzhiwen.top/0214/ALOps_sys1 into dev
|
9 months ago |
xiaohuo
|
b781ebfcec
|
10.24站内信
|
9 months ago |
Wangxin
|
05fed99163
|
【web】 首页样式调整
|
9 months ago |
xiaohuo
|
58cbb0d94f
|
Merge branch 'dev' of https://gitea.wangzhiwen.top/0214/ALOps_sys1 into dev
|
9 months ago |
xiaohuo
|
f20ae2997c
|
10.21预警模版后端生成
|
9 months ago |
Wangxin
|
4030b204a7
|
【web】 设备运行数据UI调整
|
9 months ago |
Wangxin
|
506f6632a6
|
【web】 预警规则-触发条件修改
|
9 months ago |
Wangxin
|
1d7e39fd14
|
【web】 设备状态详情 UI修改
|
9 months ago |
Wangxin
|
2ed865fe46
|
【web】 接口对接
|
9 months ago |
YYD-YY
|
0c1f14058d
|
Merge branch 'dev' of https://gitea.wangzhiwen.top/0214/ALOps_sys1 into dev
|
9 months ago |
YYD-YY
|
222984fbae
|
10.16 设备检测界面图片字段
|
9 months ago |
Wangxin
|
0a1201bf09
|
Merge branch 'dev' of https://gitea.wangzhiwen.top/0214/ALOps_sys1 into dev
|
9 months ago |
YYD-YY
|
07efe8e04b
|
Merge branch 'dev' of https://gitea.wangzhiwen.top/0214/ALOps_sys1 into dev
|
9 months ago |
YYD-YY
|
2387f668f8
|
10.15 修改查询last数据
|
9 months ago |
Wangxin
|
821c2ccb46
|
【web】 设备评估预测 接口对接
|
9 months ago |
Wangxin
|
7423e111d8
|
【web】 预警信息字段调整
|
9 months ago |
Wangxin
|
574f44c417
|
【web】 ai问答接口对接
|
9 months ago |
YYD-YY
|
08c57cf67d
|
Merge branch 'dev' of https://gitea.wangzhiwen.top/0214/ALOps_sys1 into dev
|
9 months ago |
YYD-YY
|
f02d7400df
|
10.13
|
9 months ago |
Wangxin
|
9dfe27a026
|
【web】 异常预警对接
|
9 months ago |
xiaohuo
|
55d93dfe66
|
10.12设备档案排序和修改
|
9 months ago |
xiaohuo
|
0d8f6f3992
|
10.11chat子模块修改
|
9 months ago |
xiaohuo
|
cc1804b26a
|
10.11maven版本修改
|
9 months ago |
Newek
|
e3fe8b2b1c
|
Merge remote-tracking branch 'origin/dev' into dev
|
9 months ago |
Newek
|
d22de0b5d9
|
Merge remote-tracking branch 'origin/dev' into dev
|
9 months ago |
Newek
|
3870d1c5f2
|
Merge remote-tracking branch 'origin/dev' into dev
|
9 months ago |
0214
|
342fe3af5a
|
上传新的alops_sys.sql文件
|
9 months ago |
xiaohuo
|
707a703e89
|
Merge branch 'dev' of https://gitea.wangzhiwen.top/0214/ALOps_sys1 into dev
|
9 months ago |
xiaohuo
|
c5903d61c7
|
10.6设备采集规则修改
|
9 months ago |
YYD-YY
|
534a160702
|
Merge branch 'dev' of https://gitea.wangzhiwen.top/0214/ALOps_sys1 into dev
# Conflicts:
# ALOps_sys_backend/alops-system/src/main/java/com/alops/system/domain/EquBase.java
|
9 months ago |
YYD-YY
|
a118b94933
|
10.10修正字段
|
9 months ago |
xiaohuo
|
62be1abd27
|
10.10设备档案改变增删改查
|
9 months ago |
xiaohuo
|
d4106e0e7b
|
Merge branch 'dev' of https://gitea.wangzhiwen.top/0214/ALOps_sys1 into dev
|
9 months ago |
xiaohuo
|
48a4e5b644
|
10.8厂商名称修改
|
9 months ago |
YYD-YY
|
a52793b058
|
10.7修正分页查询,小修正2
|
9 months ago |
YYD-YY
|
3d4098d4c7
|
10.7修正分页查询,小修正2
|
9 months ago |
YYD-YY
|
a5f9cdc5ad
|
10.7修正分页查询,小修正
|
9 months ago |
YYD-YY
|
e876808ff7
|
Merge branch 'dev' of https://gitea.wangzhiwen.top/0214/ALOps_sys1 into dev
|
9 months ago |
YYD-YY
|
ca3ae05b60
|
10.7修正分页查询
|
9 months ago |
Wangxin
|
ace6039895
|
【web】 首页预警接口对接
|
9 months ago |
YYD-YY
|
934195fb9e
|
Merge branch 'dev' of https://gitea.wangzhiwen.top/0214/ALOps_sys1 into dev
|
9 months ago |
Wangxin
|
a548944f67
|
【web】 首页UI调整
|
9 months ago |
xiaohuo
|
0cf75ce555
|
10.7预警规则list修改
|
9 months ago |
YYD-YY
|
0dedb8b8e3
|
Merge branch 'dev' of https://gitea.wangzhiwen.top/0214/ALOps_sys1 into dev
# Conflicts:
# ALOps_sys_backend/alops-system/src/main/java/com/alops/system/service/impl/AlertMessageServiceImpl.java
|
9 months ago |
YYD-YY
|
87e378b54b
|
10.6修正返回类型list,以及输出两个数组
|
9 months ago |
xiaohuo
|
637c9d346f
|
10.6Alertmessage
|
9 months ago |
xiaohuo
|
9e8dd02e8d
|
Merge branch 'dev' of https://gitea.wangzhiwen.top/0214/ALOps_sys1 into dev
Conflicts:
ALOps_sys_backend/alops-system/src/main/resources/mapper/system/AlertMessageMapper.xml
|
9 months ago |
xiaohuo
|
81bb3317d9
|
10.6预警信息修改和首页2部分
|
9 months ago |
YYD-YY
|
5cd5dfb78f
|
10.6修正预警信息2
|
9 months ago |
YYD-YY
|
34c8421e1d
|
Merge branch 'dev' of https://gitea.wangzhiwen.top/0214/ALOps_sys1 into dev
|
9 months ago |
YYD-YY
|
d38d142a36
|
10.6修正预警信息
|
9 months ago |
YYD-YY
|
676768eb78
|
10.6修改首页统计接口
|
9 months ago |
Wangxin
|
b3c5172929
|
【web】 首页样式修改
|
9 months ago |
Wangxin
|
65a48d4e3a
|
【web】 预警信息 接口对接
|
9 months ago |
xiaohuo
|
3b489cdbe1
|
Merge branch 'dev' of https://gitea.wangzhiwen.top/0214/ALOps_sys1 into dev
|
9 months ago |
xiaohuo
|
8a3b2ed3d7
|
10.5相同格式提交
|
9 months ago |
Wangxin
|
ff33642d41
|
【web】 设备接口对接
|
9 months ago |
YYD-YY
|
4c2b9bdb58
|
Merge branch 'dev' of https://gitea.wangzhiwen.top/0214/ALOps_sys1 into dev
|
9 months ago |
YYD-YY
|
9182a5aad4
|
10.5修改模糊查询以及共应商接口
|
9 months ago |
xiaohuo
|
8521b64945
|
10.5设备档案查询改get
|
9 months ago |
YYD-YY
|
6a6c4c5095
|
Merge branch 'dev' of https://gitea.wangzhiwen.top/0214/ALOps_sys1 into dev
|
9 months ago |
YYD-YY
|
30f726c6d7
|
10.5修改版
|
9 months ago |
Wangxin
|
e051cd04cc
|
【web】 厂商设备接口对接
|
9 months ago |
xiaohuo
|
d138851e5e
|
Merge branch 'dev' of https://gitea.wangzhiwen.top/0214/ALOps_sys1 into dev
|
9 months ago |
xiaohuo
|
b1fbd4be92
|
10.4设备查询页面
|
9 months ago |
Wangxin
|
b3bd8b1aa6
|
【web】 接口对接
|
9 months ago |
YYD-YY
|
10caac0f17
|
10.3修改最终版版
|
9 months ago |
YYD-YY
|
de8ba8304b
|
Merge branch 'dev' of https://gitea.wangzhiwen.top/0214/ALOps_sys1 into dev
# Conflicts:
# ALOps_sys_backend/alops-admin/src/main/resources/application-druid.yml
# ALOps_sys_backend/alops-system/src/main/java/com/alops/system/domain/EquBase.java
# ALOps_sys_backend/alops-system/src/main/resources/mapper/system/EquBaseMapper.xml
|
9 months ago |
YYD-YY
|
572aae133d
|
10.3修改版
|
9 months ago |
YYD-YY
|
18002d9429
|
10.3修改版
|
9 months ago |
xiaohuo
|
61d5e8c45f
|
Merge branch 'dev' of https://gitea.wangzhiwen.top/0214/ALOps_sys1 into dev
|
9 months ago |
xiaohuo
|
4f01b21cdc
|
10.2新建设备编号,设备主键自动生成
|
9 months ago |
Wangxin
|
e60d1d8f3b
|
【web】 设备类型管理 接口对接完成
|
9 months ago |
0214
|
d2d8003351
|
上传新的alops_sys.sql文件
|
10 months ago |
0214
|
92d0e01d36
|
删除 'ALOps_sys_sql/aiops_sys.sql'
|
10 months ago |
YYD-YY
|
d43336d279
|
9.24最终版
|
10 months ago |
YYD-YY
|
70d39c97d5
|
Merge branch 'dev' of https://gitea.wangzhiwen.top/0214/ALOps_sys1 into dev
# Conflicts:
# ALOps_sys_backend/alops-admin/src/main/java/com/alops/web/controller/exceptionController/DictAlarmParamController.java
|
10 months ago |
YYD-YY
|
7aed688195
|
9.24更新最新版
|
10 months ago |
xiaohuo
|
b75a774f1c
|
Merge branch 'dev' of https://gitea.wangzhiwen.top/0214/ALOps_sys1 into dev
|
10 months ago |
xiaohuo
|
0d20d40c01
|
前端字典详情页面(补交)
|
10 months ago |
xiaohuo
|
2b4199d5f1
|
前端字典详情页面(补交)
|
10 months ago |
xiaohuo
|
fa13c0255a
|
新页面
|
10 months ago |
YYD-YY
|
f38f389443
|
Merge branch 'dev' of https://gitea.wangzhiwen.top/0214/ALOps_sys1 into dev
# Conflicts:
# ALOps_sys_backend/alops-admin/src/main/java/com/alops/web/controller/equManagement/EquBaseController.java
# ALOps_sys_backend/alops-admin/src/main/java/com/alops/web/controller/equManagement/EquSupplierController.java
# ALOps_sys_backend/alops-admin/src/main/java/com/alops/web/controller/exceptionController/AlertMessageController.java
# ALOps_sys_backend/alops-system/pom.xml
# ALOps_sys_backend/alops-system/src/main/java/com/alops/system/domain/EquBase.java
# ALOps_sys_backend/alops-system/src/main/java/com/alops/system/domain/EquSupplier.java
# ALOps_sys_backend/alops-system/src/main/java/com/alops/system/domain/EquVlan.java
# ALOps_sys_backend/alops-system/src/main/java/com/alops/system/domain/dto/EquBaseQueryDto.java
# ALOps_sys_backend/alops-system/src/main/java/com/alops/system/mapper/AlertMessageMapper.java
# ALOps_sys_backend/alops-system/src/main/java/com/alops/system/mapper/EquBaseMapper.java
# ALOps_sys_backend/alops-system/src/main/java/com/alops/system/mapper/EquSupplierMapper.java
# ALOps_sys_backend/alops-system/src/main/java/com/alops/system/service/IAlertMessageService.java
# ALOps_sys_backend/alops-system/src/main/java/com/alops/system/service/IEquBaseService.java
# ALOps_sys_backend/alops-system/src/main/java/com/alops/system/service/IEquSupplierService.java
# ALOps_sys_backend/alops-system/src/main/java/com/alops/system/service/impl/AlertMessageServiceImpl.java
# ALOps_sys_backend/alops-system/src/main/java/com/alops/system/service/impl/EquBaseServiceImpl.java
# ALOps_sys_backend/alops-system/src/main/java/com/alops/system/service/impl/EquSupplierServiceImpl.java
# ALOps_sys_backend/alops-system/src/main/java/com/alops/system/service/impl/EquTypeServiceImpl.java
# ALOps_sys_backend/alops-system/src/main/resources/mapper/system/AlertMessageMapper.xml
# ALOps_sys_backend/alops-system/src/main/resources/mapper/system/EquBaseMapper.xml
# ALOps_sys_backend/alops-system/src/main/resources/mapper/system/EquSupplierMapper.xml
|
10 months ago |
YYD-YY
|
2a4a93f442
|
9.24更新变动
|
10 months ago |
YYD-YY
|
46cc70ac25
|
9.24更新首页、设备类型、厂商、单台、多台设备信息接口
|
10 months ago |
Wangxin
|
705a2f6ddf
|
【web】 供应商管理
|
10 months ago |
Wangxin
|
283450270b
|
【web】 首页处理
|
10 months ago |
xiaohuo
|
d99eb9b6c8
|
Merge branch 'dev' of https://gitea.wangzhiwen.top/0214/ALOps_sys1 into dev
|
10 months ago |
xiaohuo
|
7d84e735e2
|
Revert "前端修改,用于访问本地后端,不推送远程使用"
This reverts commit 4299c13122.
|
10 months ago |
xiaohuo
|
6e7cbe2585
|
Merge branch 'dev' of https://gitea.wangzhiwen.top/0214/ALOps_sys1 into dev
|
10 months ago |
xiaohuo
|
4299c13122
|
前端修改,用于访问本地后端,不推送远程使用
|
10 months ago |
xiaohuo
|
618b2d1dae
|
删除旧的预警规则和故障信息
|
10 months ago |
xiaohuo
|
cfc19c4f05
|
异常预警管控+设备档案+设备信息采集
|
10 months ago |
Wangxin
|
852d952d77
|
【web】 问答
|
10 months ago |
0214
|
514204c07c
|
9.8数据库数据sql语句
|
10 months ago |
0214
|
a401f034c2
|
删除alops_sys.sql文件
|
10 months ago |
xiaohuo
|
3df5541559
|
snmp协议采集+预警规则增加+执行预警规则+数据库所有实体
|
10 months ago |
xiaohuo
|
2ee4007bd1
|
Revert "snmp协议采集+预警规则增加+执行预警规则+数据库所有实体"
This reverts commit a3ea4d900c.
|
10 months ago |
xiaohuo
|
173f94abd5
|
Merge branch 'dev' of https://gitea.wangzhiwen.top/0214/ALOps_sys1 into dev
|
10 months ago |
xiaohuo
|
a3ea4d900c
|
snmp协议采集+预警规则增加+执行预警规则+数据库所有实体
|
10 months ago |
Wangxin
|
c8d7950a4e
|
【web】 设备状态监控接口
|
10 months ago |
Wangxin
|
065b9c6802
|
【web】 设备厂商 接口
|
11 months ago |
Wangxin
|
1ead73eef6
|
【web】 设备类型 接口
|
11 months ago |
Wangxin
|
538ca1d9cb
|
【web】 设备档案 接口
|
11 months ago |
Wangxin
|
1456a811d7
|
【web】 设备信息详情
|
11 months ago |
0214
|
d5e9657bd3
|
上传新的alops_sys.sql文件
|
11 months ago |
0214
|
2c341831b2
|
删除旧alops_sql文件
|
11 months ago |
xiaohuo
|
250c3f39eb
|
初始简单增删改查
|
11 months ago |
Wangxin
|
3a62d2d7a2
|
【web】 设备运行状态列表添加
|
11 months ago |
Wangxin
|
191cc47c66
|
【web】 设备管理 字段调整
|
11 months ago |
Wangxin
|
cf839e886e
|
【web】 智能问答与设备监测目录添加
|
11 months ago |
Wangxin
|
2981d5053e
|
【web】 设备管理页面添加、权限配置
|
11 months ago |
xiaohuo
|
2868c9dc32
|
添加依赖
|
12 months ago |