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 |   19 ++++++++++++++++---
 1 files changed, 16 insertions(+), 3 deletions(-)

diff --git a/camera-service/controllers/camera.go b/camera-service/controllers/camera.go
index fe88085..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)
@@ -1211,3 +1213,14 @@
 	return &bhomeclient.Reply{Success: true, Msg: "鑾峰彇鎴愬姛", Data: tasks}
 
 }
+
+// 鑾峰彇鎵�鏈�
+func (cc CameraController) GetAllTasks(h *bhomeclient.WrapperHandler, c *bhomeclient.Request) *bhomeclient.Reply {
+	//缁戝畾json鍜岀粨鏋勪綋
+
+	var tasks []models.TaskAggregate
+	tasks, _ = models.GetAllTask()
+
+	return &bhomeclient.Reply{Success: true, Msg: "鑾峰彇鎴愬姛", Data: tasks}
+
+}

--
Gitblit v1.8.0