---

panlei

2019-11-20 7c952ec032baaeda70bfb9483cf7e7bf93d92811

---

 insertdata/insertDataToEs.go

@@ -189,9 +189,7 @@
                        target.TargetId = face.Id
                        target.TargetScore = face.Score
                        target.TargetType = face.Type
                        logger.Info("人脸的特征值是：",face.Feature)
                        target.Feature = base64.StdEncoding.EncodeToString(face.Feature)
                        logger.Info("base64版本：",target.Feature)
                        target.PicSmUrl = resp["fileUrl"].(string)
                        target.TargetLocation = Points{TopLeft: Point{face.Location.X, face.Location.Y}, BottomRight: Point{face.Location.X + face.Location.Width, face.Location.Y + face.Location.Height}}
                        var targetInfos []Target
@@ -363,6 +361,7 @@
                            var target1 = new(Target)
                            target1.TargetId = target.Id
                            target1.TargetScore = target.Score
                            target1.TargetType = target.Type
                            target1.TargetLocation = Points{TopLeft: Point{target.Location.X, target.Location.Y}, BottomRight: Point{target.Location.X + target.Location.Width, target.Location.Y + target.Location.Height}}
                            targetInfos = append(targetInfos, *target1)
                        }
@@ -563,6 +562,7 @@
                        var target1 = new(Target)
                        target1.TargetId = target.Id
                        target1.TargetScore = target.Score
                        target1.TargetType = target.Type
                        target1.TargetLocation = Points{TopLeft: Point{target.Location.X, target.Location.Y}, BottomRight: Point{target.Location.X + target.Location.Width, target.Location.Y + target.Location.Height}}
                        targetInfos = append(targetInfos, *target1)
                    }

 labelFilter/readyDataForLabel.go

@@ -28,7 +28,7 @@
            }
        }
    }
    if flag1{
    if flag1{ // 有可推送的数据
        logger.Info("---------------标签过滤器赋值")
        label.CameraId = result.Cid
        camera, err := cache.GetCameraById(result.Cid)
@@ -54,6 +54,4 @@
        }
        logger.Info("------------标签过滤器赋值完毕")
    }
}

// 从缓存中查出所有的规则数据
}

 ruleserver/ruleToformula.go

@@ -274,7 +274,6 @@
            }
        }
    }
    //logger.Println("-----------------------------------------------听说你是空的？",faces)
    return faces
}

@@ -283,7 +282,6 @@
    if len(am.FilterData) > 0 {
        locations = am.FilterData
    }
    //logger.Println("-----------------------------------------------听说你是空的？",faces)
    return locations
}
func putTargetsToResult(am *structure.AreaMap) []*structure.Arg {
@@ -291,7 +289,6 @@
    if len(am.AlarmObj) > 0 {
        locations = am.AlarmObj
    }
    //logger.Println("-----------------------------------------------听说你是空的？",faces)
    return locations
}
// 联动任务的处理

 ruleserver/server.go

@@ -51,7 +51,6 @@
func publishMessage(msg *protomsg.VideotapeInfo) {
    sendBytes,err := proto.Marshal(msg)
    if err ==nil{
        logger.Debug("看看这个疑似空指针的东西",discoveryServer)
        discoveryServer.PublishMsg(string(sendBytes))
    }
}