 ty
|
3733e27475
|
Merge remote-tracking branch 'origin/prod'
# Conflicts:
# hzims-service/operational/src/main/java/com/hnac/hzims/operational/main/service/IAreaMonthReportService.java
# hzims-service/operational/src/main/java/com/hnac/hzims/operational/main/service/impl/HydropowerServiceImpl.java
# hzims-service/operational/src/main/java/com/hnac/hzims/operational/maintenance/service/impl/OperMaintenanceTaskServiceImpl.java
# hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/workTicket/service/impl/OfflineTicketServiceImpl.java
|
11 months ago |
 yang_shj
|
80ae73770c
|
Merge remote-tracking branch 'origin/master'
|
11 months ago |
|
yang_shj
|
1736f9b491
|
#开关机告警
|
11 months ago |
|
yang_shj
|
e393ae6f33
|
Merge remote-tracking branch 'origin/prod' into prod
|
11 months ago |
|
yang_shj
|
6d9f4697b3
|
#单位属性去重
|
11 months ago |
|
ty
|
76da44caf7
|
交接班接口弃用
|
11 months ago |
 haungxing
|
23b32bc96b
|
Merge remote-tracking branch 'origin/master'
|
11 months ago |
|
haungxing
|
cad0af0c31
|
# 参数下发剔除掉非参数的属性
# 上次报文时间格式化
|
11 months ago |
|
ty
|
c1c1e6bf0f
|
middle消费日志保存修正
|
12 months ago |
|
yang_shj
|
353f04009e
|
#日志限制
|
12 months ago |
 liwen
|
b5e2bf7ec8
|
add: 演练模块新增状态更改定时任务&导出功能
|
12 months ago |
|
ty
|
9b3a3c7f63
|
交接班死锁bug提交
|
12 months ago |
|
liwen
|
acc979538f
|
update: 修改新增、修改演练逻辑
|
12 months ago |
|
yang_shj
|
7f43f7af3f
|
Merge remote-tracking branch 'origin/master'
|
12 months ago |
|
yang_shj
|
dd0896c875
|
#光伏实体类修改
|
12 months ago |
|
liwen
|
911bdf17e0
|
add: 新增演练记录功能
|
12 months ago |
|
ty
|
c5fa431f46
|
视频流配置新增接口
|
12 months ago |
|
yang_shj
|
920654e673
|
Merge remote-tracking branch 'origin/master'
|
12 months ago |
|
yang_shj
|
3261a28de5
|
#集中监控realId实时图列数据接口修改
|
12 months ago |
|
ty
|
61abf20fee
|
修正日常维护筛选bug
|
12 months ago |
|
ty
|
1b0c0ebcc2
|
新增视频流配置表单
|
12 months ago |
|
yang_shj
|
6539903e23
|
#集中监控关联历史数据查询
|
12 months ago |
|
ty
|
4da1e70480
|
日常维护工作流bug处理
|
12 months ago |
|
yang_shj
|
abbf215229
|
#AI告警
|
12 months ago |
|
yang_shj
|
4a9e4985e9
|
#AI告警
|
12 months ago |
|
yang_shj
|
8873248220
|
#水位柱状颜色设置
|
12 months ago |
|
haungxing
|
0f593b5445
|
Merge remote-tracking branch 'origin/master'
|
12 months ago |
|
haungxing
|
a38db83a11
|
# 日常维护任务逻辑代码改写
|
12 months ago |
|
yang_shj
|
32c224043d
|
Merge remote-tracking branch 'origin/master'
|
12 months ago |
|
yang_shj
|
5fd7091cd6
|
#水位柱状颜色设置
|
12 months ago |
|
haungxing
|
e734d38896
|
Merge remote-tracking branch 'origin/master'
|
12 months ago |
|
haungxing
|
2f98d7aeaa
|
# HZ100C参数下发添加描述、保留小数位字段
|
12 months ago |
|
yang_shj
|
3eb4a81042
|
Merge remote-tracking branch 'origin/prod' into prod
|
12 months ago |
|
yang_shj
|
08eb420319
|
#风电修改
|
12 months ago |
tyty
|
d6af8db187
|
修改水电站运行月报导出精度
|
12 months ago |
|
tyty
|
6df568b439
|
修改水电站运行月报导出
|
12 months ago |
|
tyty
|
6efdf34196
|
修改水电站运行月报导出
|
12 months ago |
|
yang_shj
|
383993d98b
|
#日常维护任务增加计划Id过滤
|
12 months ago |
|
yang_shj
|
e6d941b972
|
#去除不需要引用
|
12 months ago |
|
yang_shj
|
9d139cf89f
|
#告警数据来源统计修改
|
12 months ago |
|
yang_shj
|
4f0a24e4f1
|
#集中监控铃铛设置
|
12 months ago |
|
yang_shj
|
5add3d24a1
|
Merge remote-tracking branch 'origin/master'
|
12 months ago |
|
yang_shj
|
0b48150dbf
|
#定时任务修改
|
12 months ago |
|
haungxing
|
e486101d1b
|
# 海康视频转换为flv格式
|
12 months ago |
|
haungxing
|
d6e33314df
|
Merge remote-tracking branch 'origin/master'
|
12 months ago |
|
haungxing
|
586bde7001
|
# 第一种工作票预览
|
12 months ago |
|
tyty
|
424f828f47
|
新增海康视频转换为flv格式的接口
|
12 months ago |
|
tyty
|
328254e256
|
值班日志版本
|
12 months ago |
|
tyty
|
753f815a29
|
日常维护任务生成代码提交，版本回退5.0.2
|
12 months ago |
|
haungxing
|
64859eae37
|
Merge remote-tracking branch 'origin/master'
|
12 months ago |
