ty
							
						 | 
						
							
							
							
							
								
							
								4f6e9b53de
								
							
								
							
						 | 
						
							
							
								
								修正:middle接口命名
							
							
							
							
							
						 | 
						
							1 year ago | 
						
					
				
					
						
							
							
								
								 yang_shj
							
						 | 
						
							
							
							
							
								
							
								71db733760
								
							
								
							
						 | 
						
							
							
								
								#定时任务注解修改
							
							
							
							
							
						 | 
						
							1 year ago | 
						
					
				
					
						
							
							
								
								 yang_shj
							
						 | 
						
							
							
							
							
								
							
								f5646f5ad1
								
							
								
							
						 | 
						
							
							
								
								#告警代码合并
							
							
							
							
							
						 | 
						
							1 year 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 
							
						 | 
						
							1 year ago | 
						
					
				
					
						
							
							
								
								 yang_shj
							
						 | 
						
							
							
							
							
								
							
								b4549259af
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/prod-5.1.3' into prod-5.1.3
							
							
							
							
							
						 | 
						
							1 year ago | 
						
					
				
					
						
							
							
								
								 yang_shj
							
						 | 
						
							
							
							
							
								
							
								75b4487426
								
							
								
							
						 | 
						
							
							
								
								#启动sql脚本更新
							
							
							
							
							
						 | 
						
							1 year ago | 
						
					
				
					
						
							
							
								
								 ty
							
						 | 
						
							
							
							
							
								
							
								7bcb0b2225
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/prod-5.1.3' into prod-5.1.3
							
							
							
							
							
						 | 
						
							1 year ago | 
						
					
				
					
						
							
							
								
								 ty
							
						 | 
						
							
							
							
							
								
							
								ddf00fe64a
								
							
								
							
						 | 
						
							
							
								
								修正:sql修改字段脚本去除
							
							
							
							
							
						 | 
						
							1 year ago | 
						
					
				
					
						
							
							
								
								 haungxing
							
						 | 
						
							
							
							
							
								
							
								a4120dbfda
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/prod-5.1.3' into prod-5.1.3
							
							
							
							
							
						 | 
						
							1 year ago | 
						
					
				
					
						
							
							
								
								 haungxing
							
						 | 
						
							
							
							
							
								
							
								d55be2b38a
								
							
								
							
						 | 
						
							
							
								
								fix: 完善更新脚本
							
							
							
							
							
						 | 
						
							1 year ago | 
						
					
				
					
						
							
							
								
								 ty
							
						 | 
						
							
							
							
							
								
							
								7539897b38
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/prod-5.1.3' into prod-5.1.3
							
							
							
							
							
						 | 
						
							1 year ago | 
						
					
				
					
						
							
							
								
								 ty
							
						 | 
						
							
							
							
							
								
							
								be1f26494f
								
							
								
							
						 | 
						
							
							
								
								修正:上线yml修改
							
							
							
							
							
						 | 
						
							1 year ago | 
						
					
				
					
						
							
							
								
								 yang_shj
							
						 | 
						
							
							
							
							
								
							
								611d995be2
								
							
								
							
						 | 
						
							
							
								
								#无功电量
							
							
							
							
							
						 | 
						
							1 year ago | 
						
					
				
					
						
							
							
								
								 yang_shj
							
						 | 
						
							
							
							
							
								
							
								465fd7b1f2
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/prod-5.1.3' into prod-5.1.3
							
							
							
							
							
						 | 
						
							1 year ago | 
						
					
				
					
						
							
							
								
								 yang_shj
							
						 | 
						
							
							
							
							
								
							
								8ff12798f4
								
							
								
							
						 | 
						
							
							
								
								#曲线分析
							
							
							
							
							
						 | 
						
							1 year ago | 
						
					
				
					
						
							
							
								
								 yang_shj
							
						 | 
						
							
							
							
							
								
							
								ddbc0860e7
								
							
								
							
						 | 
						
							
							
								
								#无功电量
							
							
							
							
							
						 | 
						
							1 year ago | 
						
					
				
					
						
							
							
								
								 ty
							
						 | 
						
							
							
							
							
								
							
								0c4047d482
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/prod-5.1.3' into prod-5.1.3
							
							
							
							
							
						 | 
						
							1 year ago | 
						
					
				
					
						
							
							
								
								 ty
							
						 | 
						
							
							
							
							
								
							
								359723e847
								
							
								
							
						 | 
						
							
							
								
								修正:上线脚本修改
							
							
							
							
							
						 | 
						
							1 year ago | 
						
					
				
					
						
							
							
								
								 liwen
							
						 | 
						
							
							
							
							
								
							
								2feff1fdc1
								
							
								
							
						 | 
						
							
							
								
								fix: 培训年度统计站点重复的问题
							
							
							
							
							
						 | 
						
							1 year ago | 
						
					
				
					
						
							
							
								
								 liwen
							
						 | 
						
							
							
							
							
								
							
								19ccd99448
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'prod-5.1.3' of http://175.6.40.68:8081/Jone/hzims-back into prod-5.1.3
							
							
							
							
							
						 | 
						
							1 year ago | 
						
					
				
					
						
							
							
								
								 ty
							
						 | 
						
							
							
							
							
								
							
								4368f6c53d
								
							
								
							
						 | 
						
							
							
								
								修正:平台组emqx订阅接口增加参数
							
							
							
							
							
						 | 
						
							1 year ago | 
						
					
				
					
						
							
							
								
								 haungxing
							
						 | 
						
							
							
							
							
								
							
								8b514da185
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/prod-5.1.3' into prod-5.1.3
							
							
							
							
							
						 | 
						
							1 year ago | 
						
					
				
					
						
							
							
								
								 haungxing
							
						 | 
						
							
							
							
							
								
							
								33be377b77
								
							
								
							
						 | 
						
							
							
								
								fix: 水电站运行月报告分析添加运行时长单位
							
							
							
							
							
						 | 
						
							1 year ago | 
						
					
				
					
						
							
							
								
								 haungxing
							
						 | 
						
							
							
							
							
								
							
								6ccf943d6d
								
							
								
							
						 | 
						
							
							
								
								fix: 水电站运行月报告分析添加运行时长单位
							
							
							
							
							
						 | 
						
							1 year ago | 
						
					
				
					
						
							
							
								
								 ty
							
						 | 
						
							
							
							
							
								
							
								b130f30b45
								
							
								
							
						 | 
						
							
							
								
								去掉不用得接口
							
							
							
							
							
						 | 
						
							1 year ago | 
						
					
				
					
						
							
							
								
								 ty
							
						 | 
						
							
							
							
							
								
							
								8559812d79
								
							
								
							
						 | 
						
							
							
								
								上线yaml文件整理
							
							
							
							
							
						 | 
						
							1 year ago | 
						
					
				
					
						
							
							
								
								 ty
							
						 | 
						
							
							
							
							
								
							
								8ee642713b
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/prod-5.1.3' into prod-5.1.3
							
							
							
							
							
						 | 
						
							1 year ago | 
						
					
				
					
						
							
							
								
								 ty
							
						 | 
						
							
							
							
							
								
							
								a171e5b069
								
							
								
							
						 | 
						
							
							
								
								上线yaml文件整理
							
							
							
							
							
						 | 
						
							1 year ago | 
						
					
				
					
						
							
							
								
								 haungxing
							
						 | 
						
							
							
							
							
								
							
								4b6cecbfb9
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/prod-5.1.3' into prod-5.1.3
							
							
							
							
							
						 | 
						
							1 year ago | 
						
					
				
					
						
							
							
								
								 haungxing
							
						 | 
						
							
							
							
							
								
							
								adbcf3089e
								
							
								
							
						 | 
						
							
							
								
								fix: 水电站运行月报告分析参数拼接
							
							
							
							
							
						 | 
						
							1 year ago | 
						
					
				
					
						
							
							
								
								 luyie
							
						 | 
						
							
							
							
							
								
							
								2691f22a7a
								
							
								
							
						 | 
						
							
							
								
								add:智谱大模型,优化代码结构
							
							
							
							
							
						 | 
						
							1 year ago | 
						
					
				
					
						
							
							
								
								 yang_shj
							
						 | 
						
							
							
							
							
								
							
								3bfb765ed8
								
							
								
							
						 | 
						
							
							
								
								#曲线分析
							
							
							
							
							
						 | 
						
							1 year ago | 
						
					
				
					
						
							
							
								
								 ty
							
						 | 
						
							
							
							
							
								
							
								50434ae395
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/prod-5.1.3' into prod-5.1.3
							
							
							
							
							
						 | 
						
							1 year ago | 
						
					
				
					
						
							
							
								
								 yang_shj
							
						 | 
						
							
							
							
							
								
							
								4a1ac3f8e5
								
							
								
							
						 | 
						
							
							
								
								#电量报表
							
							
							
							
							
						 | 
						
							1 year ago | 
						
					
				
					
						
							
							
								
								 liwen
							
						 | 
						
							
							
							
							
								
							
								6451a201e1
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'prod-5.1.3' of http://175.6.40.68:8081/Jone/hzims-back into prod-5.1.3
							
							
							
							
							
						 | 
						
							1 year ago | 
						
					
				
					
						
							
							
								
								 liwen
							
						 | 
						
							
							
							
							
								
							
								6467a08b9f
								
							
								
							
						 | 
						
							
							
								
								update: 安全模块附件超链接
							
							
							
							
							
						 | 
						
							1 year ago | 
						
					
				
					
						
							
							
								
								 yang_shj
							
						 | 
						
							
							
							
							
								
							
								656db1a5ee
								
							
								
							
						 | 
						
							
							
								
								#电量报表
							
							
							
							
							
						 | 
						
							1 year ago | 
						
					
				
					
						
							
							
								
								 ty
							
						 | 
						
							
							
							
							
								
							
								f4f34f150e
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/prod-5.1.3' into prod-5.1.3
							
							
							
							
							
						 | 
						
							1 year ago | 
						
					
				
					
						
							
							
								
								 yang_shj
							
						 | 
						
							
							
							
							
								
							
								d7db8acc08
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/prod-5.1.3' into prod-5.1.3
							
							
							
							
							
						 | 
						
							1 year ago | 
						
					
				
					
						
							
							
								
								 yang_shj
							
						 | 
						
							
							
							
							
								
							
								2d492f1861
								
							
								
							
						 | 
						
							
							
								
								#安全模块
							
							
							
							
							
						 | 
						
							1 year ago | 
						
					
				
					
						
							
							
								
								 ty
							
						 | 
						
							
							
							
							
								
							
								ce2b8c1ea9
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/prod-5.1.3' into prod-5.1.3
							
							
							
							
							
						 | 
						
							1 year ago | 
						
					
				
					
						
							
							
								
								 luyie
							
						 | 
						
							
							
							
							
								
							
								3f5ba82772
								
							
								
							
						 | 
						
							
							
								
								add:智谱大模型,数据库sql语句
							
							
							
							
							
						 | 
						
							1 year ago | 
						
					
				
					
						
							
							
								
								 ty
							
						 | 
						
							
							
							
							
								
							
								1c2fb673a9
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/prod-5.1.3' into prod-5.1.3
							
							
							
							
							
						 | 
						
							1 year ago | 
						
					
				
					
						
							
							
								
								 yang_shj
							
						 | 
						
							
							
							
							
								
							
								e2659d21f8
								
							
								
							
						 | 
						
							
							
								
								#安全模块
							
							
							
							
							
						 | 
						
							1 year ago | 
						
					
				
					
						
							
							
								
								 haungxing
							
						 | 
						
							
							
							
							
								
							
								7092f66b53
								
							
								
							
						 | 
						
							
							
								
								fix: 临时提交
							
							
							
							
							
						 | 
						
							1 year ago | 
						
					
				
					
						
							
							
								
								 yang_shj
							
						 | 
						
							
							
							
							
								
							
								7f5fbd9d2c
								
							
								
							
						 | 
						
							
							
								
								#曲线分析
							
							
							
							
							
						 | 
						
							1 year ago | 
						
					
				
					
						
							
							
								
								 yang_shj
							
						 | 
						
							
							
							
							
								
							
								57f4e92878
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/prod-5.1.3' into prod-5.1.3
							
							
							
							
							
						 | 
						
							1 year ago | 
						
					
				
					
						
							
							
								
								 yang_shj
							
						 | 
						
							
							
							
							
								
							
								42efcc2dec
								
							
								
							
						 | 
						
							
							
								
								#曲线分析
							
							
							
							
							
						 | 
						
							1 year ago | 
						
					
				
					
						
							
							
								
								 ty
							
						 | 
						
							
							
							
							
								
							
								c30bc7dd23
								
							
								
							
						 | 
						
							
							
								
								修改:工作流补偿
							
							
							
							
							
						 | 
						
							1 year ago | 
						
					
				
					
						
							
							
								
								 ty
							
						 | 
						
							
							
							
							
								
							
								6ccdd59d76
								
							
								
							
						 | 
						
							
							
								
								新增:补偿流程修改
							
							
							
							
							
						 | 
						
							1 year ago |