 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 |
