From 7799d5acb4a25526625b3e99c2f7fd71d1be39ff Mon Sep 17 00:00:00 2001
From: qixiaoning <jony.kee@outlook.com>
Date: 星期二, 26 八月 2025 08:47:58 +0800
Subject: [PATCH] mqtt引入
---
camera-service/controllers/camera.go | 25 +++++++++++++++++++++++++
1 files changed, 25 insertions(+), 0 deletions(-)
diff --git a/camera-service/controllers/camera.go b/camera-service/controllers/camera.go
index 4cb9ce3..51aa2cd 100644
--- a/camera-service/controllers/camera.go
+++ b/camera-service/controllers/camera.go
@@ -1023,6 +1023,7 @@
pageSize := info.PageSize
idsStr := info.Ids
TaskIds := info.TaskIds
+ TaskName := info.TaskName
videoIdStr := info.VideoIds
Warning := info.Warning
@@ -1066,6 +1067,19 @@
//鏍规嵁浠诲姟鏌ヨ
if len(TaskIds) > 0 {
filter += fmt.Sprintf(" and array_contains(task_id, %d)", TaskIds[0])
+ }
+
+ //鏍规嵁浠诲姟鍚嶇О
+ if len(TaskName) > 0 {
+ quotedNames := make([]string, len(TaskName))
+ for i, name := range TaskName {
+ quotedNames[i] = "'" + name + "'" // 姣忎釜鍏冪礌鍔犲崟寮曞彿
+ }
+ filter += fmt.Sprintf(" and %s in [%s]", "task_name", strings.Join(quotedNames, ","))
+ } else {
+ if Warning > 0 {
+ return &bhomeclient.Reply{Success: true, Msg: "鑾峰彇鎴愬姛", Data: nil}
+ }
}
//鏄惁棰勮
@@ -1197,3 +1211,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