 haungxing
|
b13d713d2f
|
Merge remote-tracking branch 'origin/prod-5.1.3' into prod-5.1.3
|
3 months ago |
|
haungxing
|
4ff263e6d0
|
fix: 集中监控属性配置主页面分组查询逻辑修改
|
3 months ago |
 ty
|
8fd290ba32
|
修正：工作流补偿bug修改
|
3 months ago |
|
ty
|
1cc4943cb3
|
Merge remote-tracking branch 'origin/prod-5.1.3' into prod-5.1.3
|
3 months ago |
|
ty
|
ef12ddda8c
|
修正：统计月报增加%
|
3 months ago |
|
haungxing
|
420da8b6fb
|
fix: 告警处理记录时间筛选条件查询格式化
|
3 months ago |
|
ty
|
114dd2d775
|
修正：统计月报生成逻辑
|
3 months ago |
 yang_shj
|
5c261de870
|
#告警查询参数修改
|
3 months ago |
|
yang_shj
|
1b4dc39c86
|
#电量报表增加合计
|
3 months ago |
|
yang_shj
|
87c4a62501
|
Merge remote-tracking branch 'origin/prod-5.1.3' into prod-5.1.3
|
3 months ago |
|
yang_shj
|
d1ec707976
|
#视频、实时画面配置功能
|
3 months ago |
 luyie
|
6f0ed22b1e
|
Merge branch 'prod-5.1.3' of http://175.6.40.68:8081/Jone/hzims-back into prod-5.1.3
|
3 months ago |
|
luyie
|
73ad522d4b
|
add:智谱分析按站点截图分析，优化识别类型匹配过程
|
3 months ago |
|
yang_shj
|
aa5a25c691
|
#开停机记录
|
3 months ago |
|
yang_shj
|
c43f0321ea
|
#定时任务
|
3 months ago |
|
luyie
|
616d2d368b
|
add:按station id进行视频截图并进行分析，返回结果
|
3 months ago |
 liwen
|
d6ee55d840
|
fix: 考试记录考试名称和单位查询报错问题
|
3 months ago |
|
luyie
|
1990cfcbbb
|
add:智谱大模型相关sql语句更新位置
|
3 months ago |
|
yang_shj
|
0f7d2bc24b
|
Merge remote-tracking branch 'origin/prod-5.1.3' into prod-5.1.3
|
3 months ago |
|
yang_shj
|
d38c0f74f2
|
#定时任务服务名修改
|
3 months ago |
|
ty
|
cbd3483851
|
新增：巡检-巡检路线字段
|
3 months ago |
|
ty
|
a03bcf2b63
|
Merge remote-tracking branch 'origin/prod-5.1.3' into prod-5.1.3
|
3 months ago |
|
ty
|
a39e8ccd5f
|
新增：巡检-巡检路线字段
|
3 months ago |
|
yang_shj
|
2635aa82f5
|
Merge remote-tracking branch 'origin/prod-5.1.3' into prod-5.1.3
|
3 months ago |
|
yang_shj
|
1a999e9ce9
|
#定时任务注解修改
|
3 months ago |
|
ty
|
41e8db6dcb
|
Merge remote-tracking branch 'origin/prod-5.1.3' into prod-5.1.3
|
3 months ago |
|
ty
|
4f6e9b53de
|
修正:middle接口命名
|
3 months ago |
|
yang_shj
|
71db733760
|
#定时任务注解修改
|
3 months ago |
|
yang_shj
|
f5646f5ad1
|
#告警代码合并
|
3 months ago |
|
yang_shj
|
c3060f73ac
|
Merge remote-tracking branch 'origin/prod-20240506' into prod-5.1.3
# Conflicts:
# hzims-service-api/hzims-operational-api/src/main/java/com/hnac/hzims/operational/duty/constant/DutyRecProcessConstant.java
# hzims-service/hzims-alarm/src/main/java/com/hnac/hzims/alarm/mqtt/DroolsMqttConsumer.java
# hzims-service/hzims-alarm/src/main/java/com/hnac/hzims/alarm/mqtt/MqttConfigHzims.java
# hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/operation/home/impl/RealTargetServiceImpl.java
# hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/operation/monitor/impl/MonitorServiceImpl.java
# pom.xml
|
3 months ago |
|
yang_shj
|
b4549259af
|
Merge remote-tracking branch 'origin/prod-5.1.3' into prod-5.1.3
|
3 months ago |
|
yang_shj
|
75b4487426
|
#启动sql脚本更新
|
3 months ago |
|
ty
|
7bcb0b2225
|
Merge remote-tracking branch 'origin/prod-5.1.3' into prod-5.1.3
|
3 months ago |
|
ty
|
ddf00fe64a
|
修正:sql修改字段脚本去除
|
3 months ago |
|
haungxing
|
a4120dbfda
|
Merge remote-tracking branch 'origin/prod-5.1.3' into prod-5.1.3
|
3 months ago |
|
haungxing
|
d55be2b38a
|
fix: 完善更新脚本
|
3 months ago |
|
ty
|
7539897b38
|
Merge remote-tracking branch 'origin/prod-5.1.3' into prod-5.1.3
|
3 months ago |
|
ty
|
be1f26494f
|
修正:上线yml修改
|
3 months ago |
|
yang_shj
|
611d995be2
|
#无功电量
|
3 months ago |
|
yang_shj
|
465fd7b1f2
|
Merge remote-tracking branch 'origin/prod-5.1.3' into prod-5.1.3
|
3 months ago |
|
yang_shj
|
8ff12798f4
|
#曲线分析
|
3 months ago |
|
yang_shj
|
ddbc0860e7
|
#无功电量
|
3 months ago |
|
ty
|
0c4047d482
|
Merge remote-tracking branch 'origin/prod-5.1.3' into prod-5.1.3
|
3 months ago |
|
ty
|
359723e847
|
修正:上线脚本修改
|
3 months ago |
|
liwen
|
2feff1fdc1
|
fix: 培训年度统计站点重复的问题
|
3 months ago |
|
liwen
|
19ccd99448
|
Merge branch 'prod-5.1.3' of http://175.6.40.68:8081/Jone/hzims-back into prod-5.1.3
|
3 months ago |
|
ty
|
4368f6c53d
|
修正:平台组emqx订阅接口增加参数
|
3 months ago |
|
haungxing
|
8b514da185
|
Merge remote-tracking branch 'origin/prod-5.1.3' into prod-5.1.3
|
3 months ago |
|
haungxing
|
33be377b77
|
fix: 水电站运行月报告分析添加运行时长单位
|
3 months ago |
|
haungxing
|
6ccf943d6d
|
fix: 水电站运行月报告分析添加运行时长单位
|
3 months ago |
