---

panlei

2019-12-16 aa7c8d325fb831d32934e5ad20f95965475292ac

---

 algorithm/middleware/middleware.go

@@ -478,6 +478,7 @@
        area := structure.AreaMap{}
        for _, sdkData := range args.Sdkdata {
            for _, areaMap := range sdkData.AreaMapList {
                logger.Info("sdkId和区域id碰撞：",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("第二次sdkId和区域id碰撞：",areaMap.SdkId,rule2.SdkId,"---",areaMap.AreaId,rule2.PolygonId)
                    // 拿到包含符之前的数据，遍历装配
                    for _,arg := range areaMap.FilterData {
                        mergeArg(arg,area)

 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 {