From 52830a58e2907f83e8f891728b8ba3080ca59fb1 Mon Sep 17 00:00:00 2001
From: zhangzengfei <zhangzengfei@smartai.com>
Date: 星期三, 05 六月 2024 17:40:28 +0800
Subject: [PATCH] 修改切图的判断条件
---
service/notification.go | 41 +++++++++++++++++++++++++++++++++++++++--
1 files changed, 39 insertions(+), 2 deletions(-)
diff --git a/service/notification.go b/service/notification.go
index 1605025..32b67a1 100644
--- a/service/notification.go
+++ b/service/notification.go
@@ -115,7 +115,44 @@
task.mutex.Unlock()
var req vo.RequestSubscribeNotification
- req.SubscribeNotificationListObject.SubscribeNotificationObject[0] = notification
+ req.SubscribeNotificationListObject.SubscribeNotificationObject = append(req.SubscribeNotificationListObject.SubscribeNotificationObject, notification)
+
+ return &req
+}
+
+func (task *NotificationTask) packPersonNotificationMsg() *vo.RequestSubscribeNotification {
+ triggerTime := time.Now().Format("20060102150405")
+ if len(task.faceList) == 0 {
+ return nil
+ }
+
+ var notification = vo.PersonNotification{
+ NotificationID: triggerTime + snowflake.GenerateIdStr(),
+ SubscribeID: task.conf.Id,
+ Title: task.conf.Ext.Title,
+ TriggerTime: triggerTime,
+ ExecuteOperation: 1,
+ }
+
+ var ids []string
+ for idx, _ := range task.personList {
+ // 鎸夋捣搴风ず渚嬪～鍏呬慨鏀瑰瓧娈�
+ for i, _ := range task.personList[idx].SubImageList.SubImageInfoObject {
+ task.personList[idx].SubImageList.SubImageInfoObject[i].EventSort = 2
+ }
+
+ ids = append(ids, task.personList[idx].PersonID)
+ notification.PersonObjectList.PersonObject = append(notification.PersonObjectList.PersonObject, *task.personList[idx])
+ }
+
+ notification.InfoIDs = strings.Join(ids, ";")
+
+ task.mutex.Lock()
+ task.personList = []*vo.PersonObject{}
+ task.mutex.Unlock()
+
+ var req vo.RequestSubscribeNotification
+ req.SubscribeNotificationListObject.SubscribeNotificationObject = append(req.SubscribeNotificationListObject.SubscribeNotificationObject, notification)
return &req
}
@@ -154,7 +191,7 @@
notification.InfoIDs = strings.Join(ids, ";")
var req vo.RequestSubscribeNotification
- req.SubscribeNotificationListObject.SubscribeNotificationObject[0] = notification
+ req.SubscribeNotificationListObject.SubscribeNotificationObject = append(req.SubscribeNotificationListObject.SubscribeNotificationObject, notification)
return &req
}
--
Gitblit v1.8.0