 haungxing
|
bb7f9a7fab
|
Merge remote-tracking branch 'origin/prod-20240506' into prod-20240506
|
6 months ago |
|
haungxing
|
943c1d3b4d
|
fix：解决因用户手机号为空定时任务轮询执行导致resource服务熔断问题
|
6 months ago |
 yang_shj
|
ba58ef17a7
|
#告警处理过滤重复告警增加站点限制
|
6 months ago |
|
yang_shj
|
5061a5c556
|
Merge remote-tracking branch 'origin/prod-20240506' into prod-20240506
|
6 months ago |
|
yang_shj
|
d243dd49f9
|
#通讯中断告警内容截取修改
|
6 months ago |
 liwen
|
1ee5f94636
|
Merge remote-tracking branch 'origin/prod-20240506' into prod-20240506
|
6 months ago |
|
liwen
|
ee67e3d33f
|
fix: 解决车检记录导出格式异常的问题
|
6 months ago |
|
yang_shj
|
4dd797c552
|
Merge remote-tracking branch 'origin/prod-20240506' into prod-20240506
|
6 months ago |
|
yang_shj
|
adba838128
|
#通讯中断告警内容截取修改
|
6 months ago |
|
liwen
|
fbbe12ced1
|
update: 删除无用代码
|
6 months ago |
|
liwen
|
31e98b4a72
|
fix: 解决演练、培训、卫生月度统计数据异常的问题
|
6 months ago |
|
liwen
|
b7e4fb1027
|
fix: 解决卫生模板查询失败的问题
|
6 months ago |
|
liwen
|
af6f156048
|
update: 车检模板
|
6 months ago |
|
liwen
|
a0645f08a5
|
add: 车检记录模板
|
6 months ago |
|
yang_shj
|
5bfe349416
|
#站点管理、集中监控增加下限水位
|
6 months ago |
|
yang_shj
|
9faf4865e9
|
#站点管理、集中监控增加下限水位
|
6 months ago |
|
yang_shj
|
f645f1e98a
|
#站点管理、集中监控增加下限水位
|
6 months ago |
|
yang_shj
|
98330e808a
|
#站点管理、集中监控增加下限水位
|
6 months ago |
|
yang_shj
|
375d93a412
|
Merge remote-tracking branch 'origin/prod-20240506' into prod-20240506
|
6 months ago |
|
yang_shj
|
28668c8925
|
#用户反馈更新sql
|
6 months ago |
|
liwen
|
693132b15b
|
fix: 解决演练、培训、卫生月度统计数据异常的问题
|
6 months ago |
|
liwen
|
904bbd2eb1
|
fix: 解决卫生模板查询失败的问题
|
6 months ago |
|
liwen
|
350c494c18
|
update: 车检模板
|
6 months ago |
|
haungxing
|
4e6a3e28f4
|
fix：系统异常时格式化返回的答案
|
6 months ago |
|
haungxing
|
305b8098b1
|
fix：choose类型函数解析逻辑变更
|
6 months ago |
 ty
|
2b44d23ad1
|
修正：告警处理记录中的处理人字段
|
6 months ago |
|
haungxing
|
0c70821df3
|
add:暂存
|
6 months ago |
|
ty
|
f5014ae61c
|
修正：微信公众号告警类型枚举类更换
|
6 months ago |
|
ty
|
be9f869e46
|
修正：统计月报发电量数据，日常维护数据
|
6 months ago |
|
haungxing
|
37afd450b9
|
Merge remote-tracking branch 'origin/master'
|
6 months ago |
|
ty
|
08fc6c93bf
|
Merge remote-tracking branch 'origin/prod-20240506' into prod-20240506
|
6 months ago |
|
haungxing
|
24bc529965
|
add:暂存
|
6 months ago |
|
yang_shj
|
343984a9a7
|
#用户反馈更新sql
|
6 months ago |
|
liwen
|
dc981fd47b
|
Merge branch 'master' of http://175.6.40.68:8081/Jone/hzims-back
|
6 months ago |
|
liwen
|
0bfd2c892f
|
add: 车检记录模板
|
6 months ago |
|
yang_shj
|
191a7b07d1
|
#用户反馈
|
6 months ago |
|
yang_shj
|
2bf4711d4d
|
#用户反馈
|
6 months ago |
|
yang_shj
|
9504396e74
|
Merge remote-tracking branch 'origin/master'
# Conflicts:
# hzims-service/safeproduct/src/main/resources/db/2.0.1.sql
|
6 months ago |
|
yang_shj
|
40b225ed48
|
#用户反馈
|
6 months ago |
|
yang_shj
|
494257283a
|
Merge remote-tracking branch 'origin/prod-20240506'
# Conflicts:
# hzims-service/hzims-alarm/src/main/java/com/hnac/hzims/alarm/monitor/service/impl/AlarmSaveServiceImpl.java
# hzims-service/hzims-alarm/src/main/java/com/hnac/hzims/alarm/show/mapper/AlarmHandleMapper.xml
# hzims-service/hzims-alarm/src/main/java/com/hnac/hzims/alarm/show/service/AlarmHandleService.java
# hzims-service/hzims-alarm/src/main/java/com/hnac/hzims/alarm/source/service/impl/MessageServiceImpl.java
# hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/controller/HygieneController.java
# hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/service/IHygieneTemplateService.java
# hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/service/impl/HygienePlanServiceImpl.java
# hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/service/impl/HygieneTemplateServiceImpl.java
# hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/service/impl/TestScoreServiceImpl.java
# hzims-service/safeproduct/src/main/resources/db/2.0.1.sql
# pom.xml
|
6 months ago |
|
haungxing
|
c414f10227
|
add:历史数据查询
|
6 months ago |
|
ty
|
90c1e5b5d5
|
Merge remote-tracking branch 'origin/prod-20240506' into prod-20240506
|
6 months ago |
|
yang_shj
|
5b0cb49670
|
Merge remote-tracking branch 'origin/prod-20240506' into prod-20240506
|
6 months ago |
|
yang_shj
|
d8f6d9aa26
|
#用户反馈
|
6 months ago |
|
ty
|
4762cdefcb
|
修正：统计月报发电量小数点保留后两位
|
6 months ago |
|
ty
|
658c08d014
|
修正：统计月报发电量小数点保留后两位
|
6 months ago |
|
liwen
|
150670b0cf
|
Merge branch 'master' of http://175.6.40.68:8081/Jone/hzims-back
|
6 months ago |
|
ty
|
aee95af2b6
|
Merge remote-tracking branch 'origin/prod-20240506' into prod-20240506
|
6 months ago |
|
ty
|
c8f667a827
|
修正：告警处理记录中的处理人字段
|
6 months ago |
|
haungxing
|
e0b766cd3b
|
Merge remote-tracking branch 'origin/master'
|
6 months ago |
