From 29dbb82ed5d96ade6baddde05ec8536e298bb595 Mon Sep 17 00:00:00 2001
From: zhangzengfei <zhangzengfei@smartai.com>
Date: 星期二, 21 五月 2024 23:43:47 +0800
Subject: [PATCH] 添加osd设置功能
---
service/subscribe.go | 32 ++++++++++++++++++++------------
1 files changed, 20 insertions(+), 12 deletions(-)
diff --git a/service/subscribe.go b/service/subscribe.go
index 574cb8e..0a6ce89 100644
--- a/service/subscribe.go
+++ b/service/subscribe.go
@@ -3,6 +3,7 @@
import (
"context"
"encoding/json"
+ "gat1400Exchange/config"
"strings"
"sync"
"time"
@@ -52,12 +53,12 @@
}
}
-func InitSubscribeTask() error {
+func InitSubscribeTask() {
var s models.Subscribe
- subList, err := s.FindAll()
+ subList, err := s.FindByFromId(config.ClientConf.ServerId)
if err != nil {
- logger.Error("Find account by channel error:%v", err)
- return err
+ logger.Error("Find subscribe error, server id %s, %v", config.ClientConf.ServerId, err)
+ return
}
for idx, _ := range subList {
@@ -68,17 +69,16 @@
CreateTask(&subList[idx])
}
- return nil
+ return
}
-func AddFaceCapture(face *vo.FaceObject) {
+func AddFaceNotification(face *vo.FaceObject) {
TaskProcMap.Range(func(key, value interface{}) bool {
value.(TaskProcInfo).task.AddFace(face)
return true
})
- logger.Debug("娣诲姞浜鸿劯.")
- //TaskWaitGroup.Wait()
+ logger.Debug("Add Face Notification.")
}
func StopSubscribeTask() {
@@ -187,13 +187,21 @@
}
var notification = vo.FaceNotification{
- NotificationID: triggerTime + snowflake.GenerateIdStr(),
- SubscribeID: task.conf.Id,
- Title: task.conf.Ext.Title,
- TriggerTime: triggerTime,
+ NotificationID: triggerTime + snowflake.GenerateIdStr(),
+ SubscribeID: task.conf.Id,
+ Title: task.conf.Ext.Title,
+ TriggerTime: triggerTime,
+ ExecuteOperation: 1,
}
var ids []string
for idx, _ := range task.faceList {
+ // 鎸夋捣搴风ず渚嬪～鍏呬慨鏀瑰瓧娈�
+ task.faceList[idx].ShotTime = task.faceList[idx].FaceAppearTime
+ task.faceList[idx].EntryTime = triggerTime
+ for i, _ := range task.faceList[idx].SubImageList.SubImageInfoObject {
+ task.faceList[idx].SubImageList.SubImageInfoObject[i].EventSort = 2
+ }
+
ids = append(ids, task.faceList[idx].FaceID)
notification.FaceObjectList.FaceObject = append(notification.FaceObjectList.FaceObject, *task.faceList[idx])
}
--
Gitblit v1.8.0