From 5abbb114d703b40d2a42e9e3eecdadcb6d341dcf Mon Sep 17 00:00:00 2001
From: zhangzengfei <zhangzengfei@smartai.com>
Date: 星期一, 29 四月 2024 03:51:11 +0800
Subject: [PATCH] 修复keepalive地址
---
controller/captureCtl.go | 23 +++++++++++++++++------
1 files changed, 17 insertions(+), 6 deletions(-)
diff --git a/controller/captureCtl.go b/controller/captureCtl.go
index 6be11e0..ef00027 100644
--- a/controller/captureCtl.go
+++ b/controller/captureCtl.go
@@ -1,6 +1,8 @@
package controller
import (
+ "gat1400Exchange/config"
+ "gat1400Exchange/service"
"net/http"
"time"
@@ -31,19 +33,28 @@
return
}
- var faceId string
- if len(req.FaceListObject.FaceObject) > 0 {
- faceId = req.FaceListObject.FaceObject[0].FaceID
+ if len(req.FaceListObject.FaceObject) == 0 {
+ c.AbortWithStatus(http.StatusBadRequest)
+ return
}
- logger.Debug("鎺ユ敹鍒颁汉鑴告暟鎹�, faceId:%s", faceId)
- a.Repository.FaceForward(req.FaceListObject.FaceObject)
+ // 濡傛灉寮�鍚簡涓嬬骇, 韬唤搴旇鏄秷鎭唬鐞�, 涓嶅啀杞彂鍒版湇鍔″櫒
+ face := req.FaceListObject.FaceObject[0]
+ if config.ClientConf.Enable && config.ServeConf.Role == "agent" {
+ a.Repository.MsgForward(&req)
+ } else {
+ logger.Debug("Receive new message, Id:%s Ip:%s faceId:%s, LeftTopX:%d, appearTime:%s", c.RemoteIP(), face.DeviceID, face.FaceID, face.LeftTopX, face.FaceAppearTime)
+ a.Repository.FaceForward(req.FaceListObject.FaceObject)
+ }
+
+ // 璁惧淇濇椿
+ service.KeepDeviceAlive(face.DeviceID)
rspMsg := vo.ResponseStatus{
RequestURL: c.FullPath(),
StatusCode: vo.StatusSuccess,
StatusString: vo.StatusString[vo.StatusSuccess],
- Id: faceId,
+ Id: face.FaceID,
LocalTime: time.Now().Format("20060102150405"),
}
--
Gitblit v1.8.0