 liwen
|
5ac79a6af2
|
Merge remote-tracking branch 'origin/master'
|
7 months ago |
|
liwen
|
9ffcbe15ca
|
fix: 修复演练记录表、培训记录表导出内容无法换行的问题
|
7 months ago |
|
liwen
|
0113c5767f
|
fix: 修复导出时会议记录的内容无法换行的问题
|
7 months ago |
 ty
|
d166bcb1bd
|
Merge remote-tracking branch 'origin/master'
|
7 months ago |
|
ty
|
a86b43f606
|
增加：执行人姓名
|
7 months ago |
 yang_shj
|
4798f61fed
|
#水电站填报发电量统计
|
7 months ago |
|
ty
|
fc93aeb313
|
增加：告警统计列表告警时间排序
|
8 months ago |
|
ty
|
68b63bf5ab
|
增加：fdp日志
|
8 months ago |
|
yang_shj
|
faf83717a7
|
#设备参数支持double
|
8 months ago |
|
ty
|
7bd0df680d
|
fix：近三年发电量日志打印
|
8 months ago |
|
yang_shj
|
193b39d3cb
|
Merge remote-tracking branch 'origin/master'
|
8 months ago |
|
yang_shj
|
eef3fe503c
|
#两票月度统计导出
|
8 months ago |
|
liwen
|
feaae22702
|
Merge branch 'master' of http://175.6.40.68:8081/Jone/hzims-back
|
8 months ago |
|
liwen
|
a49c0e96a5
|
fix: 删除特种设备同步删除关联的检验记录
|
8 months ago |
 haungxing
|
87d7bedad3
|
Merge remote-tracking branch 'origin/master'
|
8 months ago |
|
haungxing
|
4426c3b67a
|
# 消息获取未读消息接口取消日志注解
|
8 months ago |
|
yang_shj
|
615c5bb851
|
#两票月度统计导出
|
8 months ago |
|
yang_shj
|
4e8865744b
|
Merge remote-tracking branch 'origin/master'
|
8 months ago |
|
yang_shj
|
d652d8f116
|
#告警默认配置
|
8 months ago |
|
liwen
|
c4bf76d6fa
|
update: 站点近3年发电量接口修改
|
8 months ago |
|
liwen
|
8591f43bb7
|
Merge branch 'master' of http://175.6.40.68:8081/Jone/hzims-back
Conflicts:
hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/operation/home/impl/RealTargetServiceImpl.java
|
8 months ago |
|
yang_shj
|
df660998e6
|
Merge remote-tracking branch 'origin/master'
|
8 months ago |
|
yang_shj
|
616221f964
|
#开停机告警
|
8 months ago |
|
ty
|
1ea68de3ce
|
增加：近三年发电量日志打印
|
8 months ago |
|
ty
|
560074b9fe
|
Merge remote-tracking branch 'origin/master'
|
8 months ago |
|
ty
|
bfe8e83a2b
|
缺陷记录重复，折中解决方案
|
8 months ago |
|
liwen
|
8f33a9c9af
|
Merge branch 'master' of http://175.6.40.68:8081/Jone/hzims-back
|
8 months ago |
|
haungxing
|
9af51c29eb
|
# 站点新增补充排序字段自增
|
8 months ago |
|
liwen
|
20d039a14e
|
Merge branch 'master' of http://175.6.40.68:8081/Jone/hzims-back
|
8 months ago |
|
yang_shj
|
d2765b5095
|
Merge remote-tracking branch 'origin/master'
|
8 months ago |
|
yang_shj
|
64018c538e
|
#运行月报3月数据生成
|
8 months ago |
|
liwen
|
44768be708
|
Merge branch 'master' of http://175.6.40.68:8081/Jone/hzims-back
|
8 months ago |
|
ty
|
7a23b59351
|
Merge remote-tracking branch 'origin/master'
|
8 months ago |
|
ty
|
18de968416
|
告警短信推送指定用户，微信公众号推送模板更改
|
8 months ago |
|
liwen
|
1758d9c135
|
Merge branch 'master' of http://175.6.40.68:8081/Jone/hzims-back
|
8 months ago |
|
liwen
|
f22c605c52
|
update: 站点近3年发电量接口修改
|
8 months ago |
|
yang_shj
|
0c06cfe31b
|
Merge remote-tracking branch 'origin/master'
|
8 months ago |
|
yang_shj
|
0025a49638
|
#运行月报
|
8 months ago |
|
haungxing
|
5f2aa2dd69
|
Merge remote-tracking branch 'origin/master'
|
8 months ago |
|
haungxing
|
bbddd96886
|
# 字典表数据补充
|
8 months ago |
|
ty
|
0ecef80497
|
Merge remote-tracking branch 'origin/master'
|
8 months ago |
|
ty
|
f1d86a5791
|
修正：告警处理脚本
|
8 months ago |
|
yang_shj
|
2f6ef14a65
|
#代码合并
|
8 months ago |
|
yang_shj
|
fb24ce9497
|
Merge remote-tracking branch 'origin/master'
|
8 months ago |
|
yang_shj
|
d37680eb04
|
#代码合并
|
8 months ago |
|
liwen
|
fc36c5eb79
|
fix: 特种设备管理逻辑修改
|
8 months ago |
|
yang_shj
|
7e29255efa
|
Merge remote-tracking branch 'origin/prod'
# Conflicts:
# hzims-service-api/equipment-api/src/main/java/com/hnac/hzims/emParam/entity/ParamBackupsDetailEntity.java
# hzims-service/equipment/src/main/resources/db/1.0.1.sql
# hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/mapper/operation/WindMapper.java
# hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/operation/fill/WindService.java
# hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/operation/fill/impl/WindServiceImpl.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/plate/DataService.java
# hzims-service/operational/src/main/java/com/hnac/hzims/operational/alert/controller/AbnormalAlarmController.java
# hzims-service/operational/src/main/java/com/hnac/hzims/operational/alert/service/impl/AbnormalAlarmServiceImpl.java
# hzims-service/operational/src/main/java/com/hnac/hzims/operational/alert/service/impl/AlarmHandleServiceImpl.java
# hzims-service/operational/src/main/java/com/hnac/hzims/operational/alert/service/impl/HistoryAbnormalAlarmServiceImpl.java
# hzims-service/operational/src/main/java/com/hnac/hzims/operational/data/controller/HzimsDataController.java
# hzims-service/operational/src/main/java/com/hnac/hzims/operational/data/service/HzimsDataService.java
# hzims-service/operational/src/main/java/com/hnac/hzims/operational/data/service/impl/HzimsDataServiceImpl.java
# hzims-service/operational/src/main/java/com/hnac/hzims/operational/defect/wrapper/OperDefectStatisticsWrapper.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/scheduled/MaintenanceTaskSchedule.java
# hzims-service/operational/src/main/java/com/hnac/hzims/operational/station/service/IStationService.java
# hzims-service/operational/src/main/java/com/hnac/hzims/operational/station/service/impl/RealMonitorServiceImpl.java
# hzims-service/operational/src/main/java/com/hnac/hzims/operational/station/service/impl/StationServiceImpl.java
# pom.xml
|
8 months ago |
|
yang_shj
|
81c2c110bb
|
#离线巡检&检修列表查询
|
8 months ago |
|
ty
|
5980f7a1b1
|
修正：人员分组
|
8 months ago |
|
ty
|
ab4e220d2f
|
修正：人员分组
|
8 months ago |
