panlei
2019-07-27 29ec0580c1300d63ccb0f9fcf491515f4fa1fc23
追踪
2个文件已修改
21 ■■■■ 已修改文件
insertdata/insertDataToEs.go 5 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruleserver/personTrack.go 16 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
insertdata/insertDataToEs.go
@@ -107,6 +107,7 @@
    GroupId    string `json:"groupId"`
    AlarmLevel string `json:"alarmLevel"`
    RuleText   string `json:"ruleText"`
    DefenceState bool   `json:"defenceState"`
}
// 往ES插数据
@@ -146,7 +147,7 @@
                }
                alarmRules := []AlarmRule{}
                alarm := ChangeToString(faceResult.DefenceState,faceResult.AlarmLevel)
                alarmRules = append(alarmRules, AlarmRule{faceResult.RuleGroupId, alarm, faceResult.RuleText})
                alarmRules = append(alarmRules, AlarmRule{faceResult.RuleGroupId, alarm, faceResult.RuleText,faceResult.DefenceState})
                i := protomsg.Image{}
                err = proto.Unmarshal(bdata, &i)
                bigPhotoUrl := make(map[string]interface{})
@@ -315,7 +316,7 @@
        for _, yoloResult := range msg.RuleResult["yolo"].([]ruleserver.Result) {
            sdkNames = sdkNames + yoloResult.SdkName
            alarm := ChangeToString(yoloResult.DefenceState,yoloResult.AlarmLevel)
            alarmRules = append(alarmRules, AlarmRule{yoloResult.RuleGroupId, alarm, yoloResult.RuleText})
            alarmRules = append(alarmRules, AlarmRule{yoloResult.RuleGroupId, alarm, yoloResult.RuleText,yoloResult.DefenceState})
        }
        isAlarm := 0
        resp := make(map[string]interface{})
ruleserver/personTrack.go
@@ -19,7 +19,7 @@
    logger.Debug("---------------------缓存池--------------------------:",TrackPond)
    for _, sdkinfo := range msg.Tasklab.Sdkinfos { // 遍历各算法的sdkData
        if sdkinfo.Sdktype == "FaceDetect" { // 人脸检测
            if len(sdkinfo.Sdkdata) > 1 {
            //if len(sdkinfo.Sdkdata) > 1 {
                faceParam := protomsg.ParamFacePos{}
                err := proto.Unmarshal(sdkinfo.Sdkdata, &faceParam)
                if err != nil {
@@ -47,12 +47,12 @@
                        TrackPond[msg.Cid] = &PersonTrack{Face:len(faceParam.Faces)}
                    }
                }
            } else {
                continue
            }
            //} else {
            //    continue
            //}
        }
        if sdkinfo.Sdktype == "Yolo" {
            if len(sdkinfo.Sdkdata) > 1 {
            //if len(sdkinfo.Sdkdata) > 1 {
                yoloParam := protomsg.ParamYoloObj{}
                err := proto.Unmarshal(sdkinfo.Sdkdata, &yoloParam)
                if err != nil {
@@ -86,9 +86,9 @@
                        TrackPond[msg.Cid] = &PersonTrack{Yolo:yoloNum}
                    }
                }
            } else {
                continue
            }
            //} else {
            //    continue
            //}
        }
    }
    logger.Debug("---------------------------------------追踪结束--------------------------------------")