From aa7c8d325fb831d32934e5ad20f95965475292ac Mon Sep 17 00:00:00 2001
From: panlei <2799247126@qq.com>
Date: 星期一, 16 十二月 2019 14:38:34 +0800
Subject: [PATCH] ---
---
algorithm/middleware/middleware.go | 2 ++
algorithm/personTrack/personTrack.go | 3 ++-
2 files changed, 4 insertions(+), 1 deletions(-)
diff --git a/algorithm/middleware/middleware.go b/algorithm/middleware/middleware.go
index 507f864..e1a3c2c 100644
--- a/algorithm/middleware/middleware.go
+++ b/algorithm/middleware/middleware.go
@@ -478,6 +478,7 @@
area := structure.AreaMap{}
for _, sdkData := range args.Sdkdata {
for _, areaMap := range sdkData.AreaMapList {
+ logger.Info("sdkId鍜屽尯鍩焛d纰版挒锛�",areaMap.SdkId,rule2.SdkId,"---",areaMap.AreaId,rule2.PolygonId)
if areaMap.SdkId == rule2.SdkId && areaMap.AreaId == rule2.PolygonId {
area = *areaMap
goto second
@@ -487,6 +488,7 @@
second: for _, sdkData := range args.Sdkdata {
for _, areaMap := range sdkData.AreaMapList {
if areaMap.SdkId == rule1.SdkId && areaMap.AreaId == rule1.PolygonId {
+ logger.Info("绗簩娆dkId鍜屽尯鍩焛d纰版挒锛�",areaMap.SdkId,rule2.SdkId,"---",areaMap.AreaId,rule2.PolygonId)
// 鎷垮埌鍖呭惈绗︿箣鍓嶇殑鏁版嵁锛岄亶鍘嗚閰�
for _,arg := range areaMap.FilterData {
mergeArg(arg,area)
diff --git a/algorithm/personTrack/personTrack.go b/algorithm/personTrack/personTrack.go
index f42406f..1c7510e 100644
--- a/algorithm/personTrack/personTrack.go
+++ b/algorithm/personTrack/personTrack.go
@@ -1,6 +1,7 @@
package main
import (
+ "encoding/base64"
"encoding/json"
"errors"
uuid "github.com/satori/go.uuid"
@@ -99,7 +100,7 @@
trackArg["threshold"] = compareThreshold
trackArg["cameraId"] = am.CameraId
trackArg["bodyFeature"] = arg.BodyFeature
- trackArg["faceFeature"] = arg.AttachArg.Feature
+ trackArg["faceFeature"] = base64.StdEncoding.EncodeToString(arg.AttachArg.Feature)
logger.Info("璇锋眰寮犲椋炴瘮瀵规暟鎹弬鏁帮細",trackArg)
b,err := json.Marshal(trackArg)
if err != nil {
--
Gitblit v1.8.0