yang_shj
							
						 | 
						
							
							
							
							
								
							
								95edfd1eba
								
							
								
							
						 | 
						
							
							
								
								#通讯中断告警状态判断
							
							
							
							
							
						 | 
						
							1 year ago | 
						
					
				
					
						
							
							
								
								 haungxing
							
						 | 
						
							
							
							
							
								
							
								d220accd42
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/prod-5.1.3' into prod-5.1.3
							
							
							
							
							
							
							
							# Conflicts:
#	hzims-service/gglm-big-model/src/main/java/com/hnac/gglm/bigmodel/maintenance/controller/KnowledgeFileFragmentController.java
#	hzims-service/gglm-big-model/src/main/java/com/hnac/gglm/bigmodel/maintenance/controller/KnowledgeFileInfoController.java
#	hzims-service/gglm-big-model/src/main/java/com/hnac/gglm/bigmodel/maintenance/entity/KnowledgeFileFragment.java
#	hzims-service/gglm-big-model/src/main/java/com/hnac/gglm/bigmodel/maintenance/mapper/KnowledgeFileFragmentMapper.java
#	hzims-service/gglm-big-model/src/main/java/com/hnac/gglm/bigmodel/maintenance/service/KnowledgeFileFragmentService.java
#	hzims-service/gglm-big-model/src/main/java/com/hnac/gglm/bigmodel/maintenance/service/KnowledgeFileInfoService.java
#	hzims-service/gglm-big-model/src/main/java/com/hnac/gglm/bigmodel/maintenance/service/impl/KnowledgeFileFragmentServiceImpl.java
#	hzims-service/gglm-big-model/src/main/java/com/hnac/gglm/bigmodel/maintenance/service/impl/KnowledgeFileInfoServiceImpl.java
#	hzims-service/gglm-big-model/src/main/java/com/hnac/gglm/bigmodel/maintenance/vo/IdRequest.java 
							
						 | 
						
							1 year ago | 
						
					
				
					
						
							
							
								
								 haungxing
							
						 | 
						
							
							
							
							
								
							
								f02372a69c
								
							
								
							
						 | 
						
							
							
								
								fix: 大模型工程重命名
							
							
							
							
							
						 | 
						
							1 year ago | 
						
					
				
					
						
							
							
								
								 yang_shj
							
						 | 
						
							
							
							
							
								
							
								8ee3dccc35
								
							
								
							
						 | 
						
							
							
								
								#新版监控系统水位统计修改
							
							
							
							
							
						 | 
						
							1 year ago | 
						
					
				
					
						
							
							
								
								 yang_shj
							
						 | 
						
							
							
							
							
								
							
								c88ec91f5c
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/prod-5.1.3' into prod-5.1.3
							
							
							
							
							
						 | 
						
							1 year ago | 
						
					
				
					
						
							
							
								
								 yang_shj
							
						 | 
						
							
							
							
							
								
							
								4b2cf6eee1
								
							
								
							
						 | 
						
							
							
								
								#新版监控系统水位统计修改
							
							
							
							
							
						 | 
						
							1 year ago | 
						
					
				
					
						
							
							
								
								 luyie
							
						 | 
						
							
							
							
							
								
							
								1b78157c7d
								
							
								
							
						 | 
						
							
							
								
								add:大模型,知识库文件管理,文件分段,入库
							
							
							
							
							
						 | 
						
							1 year ago | 
						
					
				
					
						
							
							
								
								 luyie
							
						 | 
						
							
							
							
							
								
							
								a48498db9a
								
							
								
							
						 | 
						
							
							
								
								add:大模型,知识库管理,文件上传
							
							
							
							
							
						 | 
						
							1 year ago | 
						
					
				
					
						
							
							
								
								 luyie
							
						 | 
						
							
							
							
							
								
							
								1b84248500
								
							
								
							
						 | 
						
							
							
								
								add:大模型,知识库,文件管理
							
							
							
							
							
						 | 
						
							1 year ago | 
						
					
				
					
						
							
							
								
								 luyie
							
						 | 
						
							
							
							
							
								
							
								a3fafcf0a4
								
							
								
							
						 | 
						
							
							
								
								add:大模型,标注增加字段和逻辑
							
							
							
							
							
						 | 
						
							1 year ago | 
						
					
				
					
						
							
							
								
								 luyie
							
						 | 
						
							
							
							
							
								
							
								a5a1b46487
								
							
								
							
						 | 
						
							
							
								
								add:标注字段显示
							
							
							
							
							
						 | 
						
							1 year ago | 
						
					
				
					
						
							
							
								
								 luyie
							
						 | 
						
							
							
							
							
								
							
								a1a739bef7
								
							
								
							
						 | 
						
							
							
								
								add:大模型,批量标注,问题提示
							
							
							
							
							
						 | 
						
							1 year ago | 
						
					
				
					
						
							
							
								
								 luyie
							
						 | 
						
							
							
							
							
								
							
								625cc28bf3
								
							
								
							
						 | 
						
							
							
								
								add:标注功能
							
							
							
							
							
						 | 
						
							1 year ago | 
						
					
				
					
						
							
							
								
								 luyie
							
						 | 
						
							
							
							
							
								
							
								914318cd63
								
							
								
							
						 | 
						
							
							
								
								add:月分析评价接口更新,向量配置支持多id同步
							
							
							
							
							
						 | 
						
							1 year ago | 
						
					
				
					
						
							
							
								
								 luyie
							
						 | 
						
							
							
							
							
								
							
								fe5855cbab
								
							
								
							
						 | 
						
							
							
								
								add:向量配置,月报评价
							
							
							
							
							
						 | 
						
							1 year ago | 
						
					
				
					
						
							
							
								
								 yang_shj
							
						 | 
						
							
							
							
							
								
							
								20a8048156
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/prod-5.1.3' into prod-5.1.3
							
							
							
							
							
						 | 
						
							1 year ago | 
						
					
				
					
						
							
							
								
								 yang_shj
							
						 | 
						
							
							
							
							
								
							
								c36148d262
								
							
								
							
						 | 
						
							
							
								
								#视频轮播配置功能
							
							
							
							
							
						 | 
						
							1 year ago | 
						
					
				
					
						
							
							
								
								 haungxing
							
						 | 
						
							
							
							
							
								
							
								cc903588ab
								
							
								
							
						 | 
						
							
							
								
								fix: 分页查询向量库数据
							
							
							
							
							
						 | 
						
							1 year ago | 
						
					
				
					
						
							
							
								
								 haungxing
							
						 | 
						
							
							
							
							
								
							
								663bb18677
								
							
								
							
						 | 
						
							
							
								
								fix: 存入向量库数据存在ID字段引起报错问题
							
							
							
							
							
						 | 
						
							1 year ago | 
						
					
				
					
						
							
							
								
								 luyie
							
						 | 
						
							
							
							
							
								
							
								19db5e59f2
								
							
								
							
						 | 
						
							
							
								
								add:向量设置同步
							
							
							
							
							
						 | 
						
							1 year ago | 
						
					
				
					
						
							
							
								
								 yang_shj
							
						 | 
						
							
							
							
							
								
							
								0515a1edab
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/prod-5.1.3' into prod-5.1.3
							
							
							
							
							
						 | 
						
							1 year ago | 
						
					
				
					
						
							
							
								
								 yang_shj
							
						 | 
						
							
							
							
							
								
							
								e141d8335c
								
							
								
							
						 | 
						
							
							
								
								#视频轮播配置功能
							
							
							
							
							
						 | 
						
							1 year ago | 
						
					
				
					
						
							
							
								
								 haungxing
							
						 | 
						
							
							
							
							
								
							
								d3149796be
								
							
								
							
						 | 
						
							
							
								
								fix: 向量数据库取值方式修改
							
							
							
							
							
						 | 
						
							1 year ago | 
						
					
				
					
						
							
							
								
								 haungxing
							
						 | 
						
							
							
							
							
								
							
								a927c0c826
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/prod-5.1.3' into prod-5.1.3
							
							
							
							
							
							
							
							# Conflicts:
#	hzims-service-api/inspect-api/src/main/java/com/hnac/hzinfo/inspect/ai/feign/IImageAnalysisClient.java
#	hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/ai/feign/ImageAnalysisClient.java 
							
						 | 
						
							1 year ago | 
						
					
				
					
						
							
							
								
								 haungxing
							
						 | 
						
							
							
							
							
								
							
								ae8fd586a2
								
							
								
							
						 | 
						
							
							
								
								fix: 视频巡检功能
							
							
							
							
							
						 | 
						
							1 year ago | 
						
					
				
					
						
							
							
								
								 luyie
							
						 | 
						
							
							
							
							
								
							
								fbe40b20b4
								
							
								
							
						 | 
						
							
							
								
								add:获取分析结果,feign修改参数类型
							
							
							
							
							
						 | 
						
							1 year ago | 
						
					
				
					
						
							
							
								
								 haungxing
							
						 | 
						
							
							
							
							
								
							
								3987b43b6e
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/prod-5.1.3' into prod-5.1.3
							
							
							
							
							
						 | 
						
							1 year ago | 
						
					
				
					
						
							
							
								
								 haungxing
							
						 | 
						
							
							
							
							
								
							
								453a6f886b
								
							
								
							
						 | 
						
							
							
								
								fix: 巡检模块启动失败问题解决
							
							
							
							
							
						 | 
						
							1 year ago | 
						
					
				
					
						
							
							
								
								 yang_shj
							
						 | 
						
							
							
							
							
								
							
								f13e3023db
								
							
								
							
						 | 
						
							
							
								
								#设备计划发电量feign接口get参数超长
							
							
							
							
							
						 | 
						
							1 year ago | 
						
					
				
					
						
							
							
								
								 yang_shj
							
						 | 
						
							
							
							
							
								
							
								d1a0613fbc
								
							
								
							
						 | 
						
							
							
								
								#设备计划发电量feign接口get参数超长
							
							
							
							
							
						 | 
						
							1 year ago | 
						
					
				
					
						
							
							
								
								 yang_shj
							
						 | 
						
							
							
							
							
								
							
								2e1e18f367
								
							
								
							
						 | 
						
							
							
								
								#实时数据feign接口
							
							
							
							
							
						 | 
						
							1 year ago | 
						
					
				
					
						
							
							
								
								 yang_shj
							
						 | 
						
							
							
							
							
								
							
								5c3d5c5627
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/prod-5.1.3' into prod-5.1.3
							
							
							
							
							
						 | 
						
							1 year ago | 
						
					
				
					
						
							
							
								
								 yang_shj
							
						 | 
						
							
							
							
							
								
							
								1e8c585539
								
							
								
							
						 | 
						
							
							
								
								#设备feign接口增加注解
							
							
							
							
							
						 | 
						
							1 year ago | 
						
					
				
					
						
							
							
								
								 haungxing
							
						 | 
						
							
							
							
							
								
							
								2a023593a7
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/prod-5.1.3' into prod-5.1.3
							
							
							
							
							
						 | 
						
							1 year ago | 
						
					
				
					
						
							
							
								
								 haungxing
							
						 | 
						
							
							
							
							
								
							
								94fd6ace14
								
							
								
							
						 | 
						
							
							
								
								fix: 向量数据库操作api
							
							
							
							
							
						 | 
						
							1 year ago | 
						
					
				
					
						
							
							
								
								 luyie
							
						 | 
						
							
							
							
							
								
							
								3b1aac4f84
								
							
								
							
						 | 
						
							
							
								
								add:大模型,参数配置,增加模糊查询
							
							
							
							
							
						 | 
						
							1 year ago | 
						
					
				
					
						
							
							
								
								 luyie
							
						 | 
						
							
							
							
							
								
							
								9589a86906
								
							
								
							
						 | 
						
							
							
								
								add:大模型,向量配置,开放接口鉴权,兼容hzinfo-auth和blade-auth
							
							
							
							
							
						 | 
						
							1 year ago | 
						
					
				
					
						
							
							
								
								 haungxing
							
						 | 
						
							
							
							
							
								
							
								3c559c4293
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/prod-5.1.3' into prod-5.1.3
							
							
							
							
							
						 | 
						
							1 year ago | 
						
					
				
					
						
							
							
								
								 haungxing
							
						 | 
						
							
							
							
							
								
							
								6d8e7a9ffe
								
							
								
							
						 | 
						
							
							
								
								fix: 修复线上bug
							
							
							
							
							
						 | 
						
							1 year ago | 
						
					
				
					
						
							
							
								
								 yang_shj
							
						 | 
						
							
							
							
							
								
							
								2dacb0ac0b
								
							
								
							
						 | 
						
							
							
								
								#巡检列表查询mapper修改
							
							
							
							
							
						 | 
						
							1 year ago | 
						
					
				
					
						
							
							
								
								 yang_shj
							
						 | 
						
							
							
							
							
								
							
								91f752e40b
								
							
								
							
						 | 
						
							
							
								
								#培训管理修改
							
							
							
							
							
						 | 
						
							1 year ago | 
						
					
				
					
						
							
							
								
								 liwen
							
						 | 
						
							
							
							
							
								
							
								deaf61a2a8
								
							
								
							
						 | 
						
							
							
								
								fix: 入库单详情报错问题
							
							
							
							
							
						 | 
						
							1 year ago | 
						
					
				
					
						
							
							
								
								 haungxing
							
						 | 
						
							
							
							
							
								
							
								bfd34e9206
								
							
								
							
						 | 
						
							
							
								
								fix: 检修记录查询报错问题解决
							
							
							
							
							
						 | 
						
							1 year ago | 
						
					
				
					
						
							
							
								
								 haungxing
							
						 | 
						
							
							
							
							
								
							
								5f85e7b417
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/prod-5.1.3' into prod-5.1.3
							
							
							
							
							
						 | 
						
							1 year ago | 
						
					
				
					
						
							
							
								
								 haungxing
							
						 | 
						
							
							
							
							
								
							
								30ba276721
								
							
								
							
						 | 
						
							
							
								
								fix: 工具退回bug解决
							
							
							
							
							
						 | 
						
							1 year ago | 
						
					
				
					
						
							
							
								
								 yang_shj
							
						 | 
						
							
							
							
							
								
							
								a6165e1226
								
							
								
							
						 | 
						
							
							
								
								#水位数据&水电站生产运行月报时间格式化修改
							
							
							
							
							
						 | 
						
							1 year ago | 
						
					
				
					
						
							
							
								
								 liwen
							
						 | 
						
							
							
							
							
								
							
								84c22df3b1
								
							
								
							
						 | 
						
							
							
								
								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
							
						 | 
						
							
							
							
							
								
							
								7f2e5180a3
								
							
								
							
						 | 
						
							
							
								
								fix: 演练年度统计数据重复问题
							
							
							
							
							
						 | 
						
							1 year ago | 
						
					
				
					
						
							
							
								
								 yang_shj
							
						 | 
						
							
							
							
							
								
							
								8a4dd04d41
								
							
								
							
						 | 
						
							
							
								
								#水位数据&水电站生产运行月报时间格式化修改
							
							
							
							
							
						 | 
						
							1 year ago | 
						
					
				
					
						
							
							
								
								 ty
							
						 | 
						
							
							
							
							
								
							
								4dd210c780
								
							
								
							
						 | 
						
							
							
								
								修正:统计月报模板
							
							
							
							
							
						 | 
						
							1 year ago |