From eac932eb827c93e2e998ac1210c3f5e548af0dbf Mon Sep 17 00:00:00 2001
From: qixiaoning <jony.kee@outlook.com>
Date: 星期四, 28 八月 2025 09:10:14 +0800
Subject: [PATCH] 推送回显地址bug,实时监控接口摄像机名称直接取video_point_name,
---
camera-service/controllers/camera.go | 8 +++++---
chanmanage-service/models/camera.go | 1 -
push-service/service/eventPushService.go | 6 ++++--
camera-common/models/Record.go | 5 +++++
4 files changed, 14 insertions(+), 6 deletions(-)
diff --git a/camera-common/models/Record.go b/camera-common/models/Record.go
index 6c8012c..0e238e9 100644
--- a/camera-common/models/Record.go
+++ b/camera-common/models/Record.go
@@ -250,6 +250,11 @@
if len(VideoPointIdColumn) > 0 {
record.VideoPointId = VideoPointIdColumn[i]
}
+ case "video_point_name":
+ VideoPointColumn := field.(*entity.ColumnVarChar).Data()
+ if len(VideoPointColumn) > 0 {
+ record.CameraName = VideoPointColumn[i]
+ }
case "detect_id":
DetectIdColumn := field.(*entity.ColumnInt64Array).Data()
if len(DetectIdColumn) > 0 {
diff --git a/camera-service/controllers/camera.go b/camera-service/controllers/camera.go
index 51aa2cd..306b06d 100644
--- a/camera-service/controllers/camera.go
+++ b/camera-service/controllers/camera.go
@@ -1139,6 +1139,8 @@
Content: v.CameraName,
PicDate: v.PicDate,
LikeDate: v.LikeDate,
+ VideoName: v.CameraName,
+ CameraAddr: v.CameraName,
}
//浠诲姟鍚嶇О
@@ -1146,9 +1148,9 @@
temp.TaskNames = items
//瑙嗛鍐呭
- items4, _ := models.GetVideoById(v.VideoPointId)
- temp.VideoName = items4.Name
- temp.CameraAddr = items4.Addr
+ // items4, _ := models.GetVideoById(v.VideoPointId)
+ // temp.VideoName = items4.Name
+ // temp.CameraAddr = items4.Addr
//妫�鏌ュ唴瀹�
items2, _ := models.GetCheckByIds(v.DetectId)
diff --git a/chanmanage-service/models/camera.go b/chanmanage-service/models/camera.go
index cf6ea4e..09f9a1d 100644
--- a/chanmanage-service/models/camera.go
+++ b/chanmanage-service/models/camera.go
@@ -35,7 +35,6 @@
FROM mal_warning_rule a
LEFT JOIN mal_task_rule_link b ON a.rule_id = b.rule_id
WHERE task_id>0
- group BY a.rule_id
`
if err := db2.Raw(sqlStr).Scan(&items).Error; err != nil {
fmt.Println(err.Error())
diff --git a/push-service/service/eventPushService.go b/push-service/service/eventPushService.go
index fa16fe4..2b01a84 100644
--- a/push-service/service/eventPushService.go
+++ b/push-service/service/eventPushService.go
@@ -276,8 +276,10 @@
})
} else if pushServer.Type == models.PUSH_URL_TYPE {
resultVo.Urls = append(resultVo.Urls, vo.EventUrlVo{
- Enable: pushServer.Enable,
- Url: pushServer.Url,
+ Enable: pushServer.Enable,
+ Url: pushServer.Url,
+ ServerIp: pushServer.ServerIp,
+ Port: pushServer.Port,
})
}
}
--
Gitblit v1.8.0