liwen
							
						 | 
						
							
							
							
							
								
							
								fa20be632e
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/prod-5.1.3' into prod-5.1.3
							
							
							
							
							
						 | 
						
							1 year ago | 
						
					
				
					
						
							
							
								
								 liwen
							
						 | 
						
							
							
							
							
								
							
								03837d1e53
								
							
								
							
						 | 
						
							
							
								
								fix: 作业区域管理删除报异常
							
							
							
							
							
						 | 
						
							1 year ago | 
						
					
				
					
						
							
							
								
								 yang_shj
							
						 | 
						
							
							
							
							
								
							
								e054fc2800
								
							
								
							
						 | 
						
							
							
								
								#检修计划查询区间
							
							
							
							
							
						 | 
						
							1 year ago | 
						
					
				
					
						
							
							
								
								 yang_shj
							
						 | 
						
							
							
							
							
								
							
								ef5b95d046
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/prod-5.1.3' into prod-5.1.3
							
							
							
							
							
						 | 
						
							1 year ago | 
						
					
				
					
						
							
							
								
								 yang_shj
							
						 | 
						
							
							
							
							
								
							
								948b6a5db5
								
							
								
							
						 | 
						
							
							
								
								#检修计划查询区间
							
							
							
							
							
						 | 
						
							1 year ago | 
						
					
				
					
						
							
							
								
								 luyie
							
						 | 
						
							
							
							
							
								
							
								dca3b894c2
								
							
								
							
						 | 
						
							
							
								
								add:大模型向量参数配置
							
							
							
							
							
						 | 
						
							1 year ago | 
						
					
				
					
						
							
							
								
								 haungxing
							
						 | 
						
							
							
							
							
								
							
								b13d713d2f
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/prod-5.1.3' into prod-5.1.3
							
							
							
							
							
						 | 
						
							1 year ago | 
						
					
				
					
						
							
							
								
								 haungxing
							
						 | 
						
							
							
							
							
								
							
								4ff263e6d0
								
							
								
							
						 | 
						
							
							
								
								fix: 集中监控属性配置主页面分组查询逻辑修改
							
							
							
							
							
						 | 
						
							1 year ago | 
						
					
				
					
						
							
							
								
								 ty
							
						 | 
						
							
							
							
							
								
							
								8fd290ba32
								
							
								
							
						 | 
						
							
							
								
								修正:工作流补偿bug修改
							
							
							
							
							
						 | 
						
							1 year ago | 
						
					
				
					
						
							
							
								
								 ty
							
						 | 
						
							
							
							
							
								
							
								1cc4943cb3
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/prod-5.1.3' into prod-5.1.3
							
							
							
							
							
						 | 
						
							1 year ago | 
						
					
				
					
						
							
							
								
								 ty
							
						 | 
						
							
							
							
							
								
							
								ef12ddda8c
								
							
								
							
						 | 
						
							
							
								
								修正:统计月报增加%
							
							
							
							
							
						 | 
						
							1 year ago | 
						
					
				
					
						
							
							
								
								 haungxing
							
						 | 
						
							
							
							
							
								
							
								420da8b6fb
								
							
								
							
						 | 
						
							
							
								
								fix: 告警处理记录时间筛选条件查询格式化
							
							
							
							
							
						 | 
						
							1 year ago | 
						
					
				
					
						
							
							
								
								 ty
							
						 | 
						
							
							
							
							
								
							
								114dd2d775
								
							
								
							
						 | 
						
							
							
								
								修正:统计月报生成逻辑
							
							
							
							
							
						 | 
						
							1 year ago | 
						
					
				
					
						
							
							
								
								 yang_shj
							
						 | 
						
							
							
							
							
								
							
								5c261de870
								
							
								
							
						 | 
						
							
							
								
								#告警查询参数修改
							
							
							
							
							
						 | 
						
							1 year ago | 
						
					
				
					
						
							
							
								
								 yang_shj
							
						 | 
						
							
							
							
							
								
							
								1b4dc39c86
								
							
								
							
						 | 
						
							
							
								
								#电量报表增加合计
							
							
							
							
							
						 | 
						
							1 year ago | 
						
					
				
					
						
							
							
								
								 yang_shj
							
						 | 
						
							
							
							
							
								
							
								87c4a62501
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/prod-5.1.3' into prod-5.1.3
							
							
							
							
							
						 | 
						
							1 year ago | 
						
					
				
					
						
							
							
								
								 yang_shj
							
						 | 
						
							
							
							
							
								
							
								d1ec707976
								
							
								
							
						 | 
						
							
							
								
								#视频、实时画面配置功能
							
							
							
							
							
						 | 
						
							1 year ago | 
						
					
				
					
						
							
							
								
								 luyie
							
						 | 
						
							
							
							
							
								
							
								6f0ed22b1e
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'prod-5.1.3' of http://175.6.40.68:8081/Jone/hzims-back into prod-5.1.3
							
							
							
							
							
						 | 
						
							1 year ago | 
						
					
				
					
						
							
							
								
								 luyie
							
						 | 
						
							
							
							
							
								
							
								73ad522d4b
								
							
								
							
						 | 
						
							
							
								
								add:智谱分析按站点截图分析,优化识别类型匹配过程
							
							
							
							
							
						 | 
						
							1 year ago | 
						
					
				
					
						
							
							
								
								 yang_shj
							
						 | 
						
							
							
							
							
								
							
								aa5a25c691
								
							
								
							
						 | 
						
							
							
								
								#开停机记录
							
							
							
							
							
						 | 
						
							1 year ago | 
						
					
				
					
						
							
							
								
								 yang_shj
							
						 | 
						
							
							
							
							
								
							
								c43f0321ea
								
							
								
							
						 | 
						
							
							
								
								#定时任务
							
							
							
							
							
						 | 
						
							1 year ago | 
						
					
				
					
						
							
							
								
								 luyie
							
						 | 
						
							
							
							
							
								
							
								616d2d368b
								
							
								
							
						 | 
						
							
							
								
								add:按station id进行视频截图并进行分析,返回结果
							
							
							
							
							
						 | 
						
							1 year ago | 
						
					
				
					
						
							
							
								
								 liwen
							
						 | 
						
							
							
							
							
								
							
								d6ee55d840
								
							
								
							
						 | 
						
							
							
								
								fix: 考试记录考试名称和单位查询报错问题
							
							
							
							
							
						 | 
						
							1 year ago | 
						
					
				
					
						
							
							
								
								 luyie
							
						 | 
						
							
							
							
							
								
							
								1990cfcbbb
								
							
								
							
						 | 
						
							
							
								
								add:智谱大模型相关sql语句更新位置
							
							
							
							
							
						 | 
						
							1 year ago | 
						
					
				
					
						
							
							
								
								 yang_shj
							
						 | 
						
							
							
							
							
								
							
								0f7d2bc24b
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/prod-5.1.3' into prod-5.1.3
							
							
							
							
							
						 | 
						
							1 year ago | 
						
					
				
					
						
							
							
								
								 yang_shj
							
						 | 
						
							
							
							
							
								
							
								d38c0f74f2
								
							
								
							
						 | 
						
							
							
								
								#定时任务服务名修改
							
							
							
							
							
						 | 
						
							1 year ago | 
						
					
				
					
						
							
							
								
								 ty
							
						 | 
						
							
							
							
							
								
							
								cbd3483851
								
							
								
							
						 | 
						
							
							
								
								新增:巡检-巡检路线字段
							
							
							
							
							
						 | 
						
							1 year ago | 
						
					
				
					
						
							
							
								
								 ty
							
						 | 
						
							
							
							
							
								
							
								a03bcf2b63
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/prod-5.1.3' into prod-5.1.3
							
							
							
							
							
						 | 
						
							1 year ago | 
						
					
				
					
						
							
							
								
								 ty
							
						 | 
						
							
							
							
							
								
							
								a39e8ccd5f
								
							
								
							
						 | 
						
							
							
								
								新增:巡检-巡检路线字段
							
							
							
							
							
						 | 
						
							1 year ago | 
						
					
				
					
						
							
							
								
								 yang_shj
							
						 | 
						
							
							
							
							
								
							
								2635aa82f5
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/prod-5.1.3' into prod-5.1.3
							
							
							
							
							
						 | 
						
							1 year ago | 
						
					
				
					
						
							
							
								
								 yang_shj
							
						 | 
						
							
							
							
							
								
							
								1a999e9ce9
								
							
								
							
						 | 
						
							
							
								
								#定时任务注解修改
							
							
							
							
							
						 | 
						
							1 year ago | 
						
					
				
					
						
							
							
								
								 ty
							
						 | 
						
							
							
							
							
								
							
								41e8db6dcb
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/prod-5.1.3' into prod-5.1.3
							
							
							
							
							
						 | 
						
							1 year ago | 
						
					
				
					
						
							
							
								
								 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 |