panlei
2019-10-10 f490b28775ad05e29fb89444fe78316eda67f492
人脸加目标信息
2个文件已修改
25 ■■■■■ 已修改文件
go.sum 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
insertdata/insertDataToEs.go 23 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
go.sum
@@ -167,8 +167,10 @@
golang.org/x/tools v0.0.0-20190114222345-bf090417da8b/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
golang.org/x/tools v0.0.0-20190311212946-11955173bddd/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs=
google.golang.org/appengine v1.1.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9YwlJXL52JkM=
google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8 h1:Nw54tB0rB7hY/N0NQvRW8DG4Yk3Q6T9cu9RcFQDu1tc=
google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc=
google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c=
google.golang.org/grpc v1.21.0 h1:G+97AoqBnmZIT91cLG/EkCoK9NSelj64P8bOHHNmGn0=
google.golang.org/grpc v1.21.0/go.mod h1:oYelfM1adQP15Ek0mdvEgi9Df8B9CZIaU1084ijfRaM=
gopkg.in/alecthomas/kingpin.v2 v2.2.6/go.mod h1:FMv+mEhP44yOT+4EoQTLFTRgOQ1FBLkstjWtayDeSgw=
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
insertdata/insertDataToEs.go
@@ -2,12 +2,12 @@
import (
    "basic.com/valib/logger.git"
    "ruleprocess/structure"
    "encoding/base64"
    "encoding/json"
    "errors"
    "net"
    "ruleprocess/cache"
    "ruleprocess/structure"
    "strconv"
    "time"
@@ -68,8 +68,24 @@
    IsCollect       int                    `json:"isCollect"`
    IsDelete        int                    `json:"isDelete"`
    BaseInfo        []*structure.BaseInfo `json:"baseInfo"`
    TargetInfo      Target
}
type Target struct {
    TargetId       string `json:"targetId"`
    TargetScore    float64 `json:"targetScore"`
    TargetLocation Points
}
type Points struct {
    TopLeft  Point `json:"topLeft"`
    BottomRight Point `json:"bottomRight"`
}
type Point struct {
    Lat float64 `json:"lat"`
    Lon float64 `json:"lon"`
}
//  yolo行为的数据结构
type Personaction struct {
    Id              string      `json:"id"`
@@ -229,6 +245,10 @@
                if linkId != "" {
                    linksId = linkId
                }
                var target = new(Target)
                target.TargetId = strconv.FormatUint(face.Id, 10)
                target.TargetScore = face.Score
                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}}
                //logger.Info("人脸的id:",strconv.FormatUint(face.Id, 10))
                //logger.Info("人脸的分值:",face.Score)
                pervideo := PerVideoPicture{
@@ -263,6 +283,7 @@
                    0,
                    0,
                    face.Liker,
                    *target,
                }
                requstbody, err := json.Marshal(pervideo)