panlei
2019-11-18 d0c072e7e8714a9503e256f505ac7d5d157e9832
es数据
1个文件已修改
108 ■■■■ 已修改文件
insertdata/insertDataToEs.go 108 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
insertdata/insertDataToEs.go
@@ -56,10 +56,10 @@
    AnalyServerName string                `json:"analyServerName"`
    AnalyServerIp   string                `json:"analyServerIp"`
    ClusterId       string                `json:"clusterId"`
    IsAlarm         int                   `json:"isAlarm"`
    IsAckAlarm      int                   `json:"isAckAlarm"`
    IsCollect       int                   `json:"isCollect"`
    IsDelete        int                   `json:"isDelete"`
    IsAlarm         bool                  `json:"isAlarm"`
    IsAckAlarm      bool                  `json:"isAckAlarm"`
    IsCollect       bool                  `json:"isCollect"`
    IsDelete        bool                  `json:"isDelete"`
    BaseInfo        []*structure.BaseInfo `json:"baseInfo"`
    TargetInfo      []Target              `json:"targetInfo"`
    LinkTag         string                `json:"linkTag"`
@@ -86,10 +86,10 @@
    AnalyServerName string                `json:"analyServerName"`
    AnalyServerIp   string                `json:"analyServerIp"`
    ClusterId       string                `json:"clusterId"`
    IsAlarm         int                   `json:"isAlarm"`
    IsAckAlarm      int                   `json:"isAckAlarm"`
    IsCollect       int                   `json:"isCollect"`
    IsDelete        int                   `json:"isDelete"`
    IsAlarm         bool                  `json:"isAlarm"`
    IsAckAlarm      bool                  `json:"isAckAlarm"`
    IsCollect       bool                  `json:"isCollect"`
    IsDelete        bool                  `json:"isDelete"`
    BaseInfo        []*structure.BaseInfo `json:"baseInfo"`
    TargetInfo      []Target              `json:"targetInfo"`
}
@@ -98,7 +98,7 @@
    TargetId       string  `json:"targetId"`
    TargetScore    float64 `json:"targetScore"`
    FaceFeature    string  `json:"faceFeature"`
    PicSmUrl       string  `json:"picSmUrl"`
    PicSmUrl       string  `json:"picSmUrl"`
    TargetLocation Points  `json:"targetLocation"`
}
@@ -175,7 +175,7 @@
func InsertFace(msg structure.ResultMsg) {
    if (msg.RuleResult["face"] != nil && len(msg.RuleResult["face"].([]structure.Result)) > 0) || (msg.RuleResult["plate"] != nil && len(msg.RuleResult["plate"].([]structure.Result)) > 0) {
        for key, results := range msg.RuleResult {
            if  key == "face" || key == "plate" {
            if key == "face" || key == "plate" {
                logger.Info("往ES插人脸数据(或车牌数据)")
                faces := []*ObjAndRules{}
                faces = PutFace(faces, results.([]structure.Result))
@@ -208,10 +208,10 @@
                            bigPhotoUrl := make(map[string]interface{})
                            bigPhotoUrl, err = util.DrawPolygonOnImageForFace(msg.Cid, i, msg.RuleResult["face"].([]structure.Result), weedfsUrl)
                            logger.Debug("========大图路径:", bigPhotoUrl)
                            imgMaxUrl = append(imgMaxUrl,bigPhotoUrl["fileUrl"].(string))
                            imgMaxUrl = append(imgMaxUrl, bigPhotoUrl["fileUrl"].(string))
                            picTime = i.Timestamp
                        }
                        lable,lableAttach := Feature2Jsonstr(*face)
                        lable, lableAttach := Feature2Jsonstr(*face)
                        var target = new(Target)
                        target.TargetId = face.Id
                        target.TargetScore = face.Score
@@ -240,10 +240,10 @@
                            msg.Push.ServerName,
                            msg.Push.LocalIp,
                            "",
                            1,
                            0,
                            0,
                            0,
                            true,
                            false,
                            false,
                            false,
                            face.Liker,
                            targetInfos,
                            "",
@@ -400,7 +400,7 @@
            if len(linkTagInfos) > 0 {
                linkTag = "联动任务"
            }
            isAlarm := 0
            isAlarm := false
            resp := make(map[string]interface{})
            // 解压缩并上传图片
            bdata, err := util.UnCompress(msg.Data)
@@ -410,7 +410,7 @@
            i := protomsg.Image{}
            err = proto.Unmarshal(bdata, &i)
            if len(alarmRules) > 0 {
                isAlarm = 1
                isAlarm = true
                //resp, err = util.PostFormBufferData(weedfsUrl, i, uuid.NewV4().String())
                resp, err = util.DrawPolygonOnImageForYolo(msg.Cid, i, msg.RuleResult["yolo"].([]structure.Result), weedfsUrl)
                if err != nil {
@@ -420,7 +420,7 @@
                    logger.Info("上传的图片信息:", resp)
                }
            } else {
                isAlarm = 0
                isAlarm = false
                // 不是报警数据不存
                return
            }
@@ -431,7 +431,7 @@
                    msg.Push.PushId,
                    msg.Cid,
                    msg.Push.Cam.Addr,
                    msg.Push.Cam.Name ,
                    msg.Push.Cam.Name,
                    time.Now().Format("2006-01-02 15:04:05"),
                    url,
                    msg.Tasklab.Taskid,
@@ -448,9 +448,9 @@
                    msg.Push.LocalIp,
                    "",
                    isAlarm,
                    0,
                    0,
                    0,
                    false,
                    false,
                    false,
                    nil,
                    targetInfos,
                    linkTag,
@@ -539,7 +539,7 @@
                if len(linkTagInfos) > 0 {
                    linkTag = "联动任务"
                }
                isAlarm := 0
                isAlarm := false
                resp := make(map[string]interface{})
                // 解压缩并上传本帧数据图片
                bdata1, err := util.UnCompress(msg.Data)
@@ -549,7 +549,7 @@
                i := protomsg.Image{}
                err = proto.Unmarshal(bdata1, &i)
                if len(alarmRules) > 0 {
                    isAlarm = 1
                    isAlarm = true
                    //resp, err = util.PostFormBufferData(weedfsUrl, i, uuid.NewV4().String())
                    resp, err = util.DrawPolygonOnImageForYolo(msg.Cid, i, msg.RuleResult["target"].([]structure.Result), weedfsUrl)
                    if err != nil {
@@ -559,7 +559,7 @@
                        logger.Info("上传的图片信息:", resp)
                    }
                } else {
                    isAlarm = 0
                    isAlarm = false
                    // 不是报警数据不存
                    return
                }
@@ -609,9 +609,9 @@
                        msg.Push.LocalIp,
                        "",
                        isAlarm,
                        0,
                        0,
                        0,
                        false,
                        false,
                        false,
                        nil,
                        nil,
                        linkTag,
@@ -751,30 +751,30 @@
    return race
}
func Feature2Jsonstr(obj ObjAndRules) (string,string) {
func Feature2Jsonstr(obj ObjAndRules) (string, string) {
    var lable string
    var lableAttach string
    switch obj.Type {
        case "face":
            sex := ""
            if obj.ThftRes.Gender == 1 {
                sex = "男"
            } else {
                sex = "女"
            }
            race := getRaceString(obj.ThftRes.Race)
            ageDescription := getDescription(obj.ThftRes.Age)
            lable = sex+"/"+ageDescription+"/"+race+"/"
            lableAttach = strconv.Itoa(int(obj.ThftRes.Age))+"岁"+"/"+"微笑值:"+strconv.Itoa(int(obj.ThftRes.Smile))+"/"+"颜值:"+strconv.Itoa(int(obj.ThftRes.Beauty))
    case "face":
        sex := ""
        if obj.ThftRes.Gender == 1 {
            sex = "男"
        } else {
            sex = "女"
        }
        race := getRaceString(obj.ThftRes.Race)
        ageDescription := getDescription(obj.ThftRes.Age)
        lable = sex + "/" + ageDescription + "/" + race + "/"
        lableAttach = strconv.Itoa(int(obj.ThftRes.Age)) + "岁" + "/" + "微笑值:" + strconv.Itoa(int(obj.ThftRes.Smile)) + "/" + "颜值:" + strconv.Itoa(int(obj.ThftRes.Beauty))
        case "plate":
           // 车牌运动方向,0 unknown, 1 left, 2 right, 3 up, 4 down
            lable = obj.Car.License+"/"+cache.GetDic("nColor"+strconv.Itoa(int(obj.Car.NColor)))+"车牌"+"/"+
                cache.GetDic("nCarColor"+strconv.Itoa(int(obj.Car.NCarColor)))+"车辆"+"/"+ cache.GetDic("nCarLogo"+strconv.Itoa(int(obj.Car.NCarLogo)))+"/"+cache.GetDic("nCarLogo"+strconv.Itoa(int(obj.Car.NCarType)))
            lableAttach = cache.GetDic("nDirection"+strconv.Itoa(int(obj.Car.NDirection)))+"/"+"车牌置信度:"+strconv.Itoa(int(obj.Car.NConfidence))+"/"+
                "车牌亮度:"+strconv.Itoa(int(obj.Car.NBright))+"/"+"车的亮度:"+strconv.Itoa(int(obj.Car.NCarBright))+"/"+"识别时间:"+strconv.Itoa(int(obj.Car.NTime))
    case "plate":
        // 车牌运动方向,0 unknown, 1 left, 2 right, 3 up, 4 down
        lable = obj.Car.License + "/" + cache.GetDic("nColor"+strconv.Itoa(int(obj.Car.NColor))) + "车牌" + "/" +
            cache.GetDic("nCarColor"+strconv.Itoa(int(obj.Car.NCarColor))) + "车辆" + "/" + cache.GetDic("nCarLogo"+strconv.Itoa(int(obj.Car.NCarLogo))) + "/" + cache.GetDic("nCarLogo"+strconv.Itoa(int(obj.Car.NCarType)))
        lableAttach = cache.GetDic("nDirection"+strconv.Itoa(int(obj.Car.NDirection))) + "/" + "车牌置信度:" + strconv.Itoa(int(obj.Car.NConfidence)) + "/" +
            "车牌亮度:" + strconv.Itoa(int(obj.Car.NBright)) + "/" + "车的亮度:" + strconv.Itoa(int(obj.Car.NCarBright)) + "/" + "识别时间:" + strconv.Itoa(int(obj.Car.NTime))
    }
    return lable,lableAttach
    return lable, lableAttach
}
func msg2PersonVideo(msg structure.ResultMsg) *LinkInfo {
@@ -848,7 +848,7 @@
                    }
                }
            }
            isAlarm := 0
            isAlarm := false
            resp := make(map[string]interface{})
            // 解压缩并上传图片
            bdata, err := util.UnCompress(msg.Data)
@@ -858,7 +858,7 @@
            i := protomsg.Image{}
            err = proto.Unmarshal(bdata, &i)
            if len(alarmRules) > 0 {
                isAlarm = 1
                isAlarm = true
                //resp, err = util.PostFormBufferData(weedfsUrl, i, uuid.NewV4().String())
                resp, err = util.DrawPolygonOnImageForYolo(msg.Cid, i, msg.RuleResult["yolo"].([]structure.Result), weedfsUrl)
                if err != nil {
@@ -868,7 +868,7 @@
                    logger.Info("上传的图片信息:", resp)
                }
            } else {
                isAlarm = 0
                isAlarm = false
                // 不是报警数据不存
                return nil
            }
@@ -896,9 +896,9 @@
                    msg.Push.LocalIp,
                    "",
                    isAlarm,
                    0,
                    0,
                    0,
                    false,
                    false,
                    false,
                    nil,
                    targetInfos,
                }