From ecee2cffe7f3b4a66895f3752b143704db4c198e Mon Sep 17 00:00:00 2001
From: zhangzengfei <zhangzengfei@smartai.com>
Date: 星期三, 22 五月 2024 01:52:43 +0800
Subject: [PATCH] 完善上报逻辑
---
controller/subscribeCtl.go | 17 ++++++++++++-----
1 files changed, 12 insertions(+), 5 deletions(-)
diff --git a/controller/subscribeCtl.go b/controller/subscribeCtl.go
index 6ffc199..3e470e2 100644
--- a/controller/subscribeCtl.go
+++ b/controller/subscribeCtl.go
@@ -15,14 +15,16 @@
type SubscribeController struct {
Repository repository.SubscribeRepository
- Srv repository.CaptureRepository
+ Capture repository.CaptureRepository
+ Ape repository.ApeRepository
}
// 鏋勯�犲嚱鏁�
func NewSubscribeController() SubscribeController {
svr := repository.NewSubscribeRepository()
svr1 := repository.NewCaptureRepository()
- controller := SubscribeController{svr, svr1}
+ svr2 := repository.NewApeRepository()
+ controller := SubscribeController{svr, svr1, svr2}
return controller
}
@@ -105,7 +107,7 @@
c.JSON(http.StatusOK, gin.H{"ResponseStatusListObject": rsp})
}
-func (s SubscribeController) Notifications(c *gin.Context) {
+func (s SubscribeController) VIIDNotifications(c *gin.Context) {
var rsp vo.ResponseStatusList
var req vo.RequestSubscribeNotificationBind
if err := c.BindJSON(&req); err != nil {
@@ -125,8 +127,13 @@
})
// 杞彂
- if config.ForwardConf.SyncServer != "" {
- go s.Srv.FaceForward(msg.FaceObjectList.FaceObject)
+ if config.ForwardConf.SyncServer != "" && len(msg.FaceObjectList.FaceObject) > 0 {
+ go s.Capture.FaceForward(msg.FaceObjectList.FaceObject)
+ }
+
+ if len(msg.DeviceList.APEObject) > 0 {
+ fromId := c.GetHeader("User-Identify")
+ go s.Ape.HandleNotification(fromId, msg.DeviceList.APEObject)
}
}
--
Gitblit v1.8.0