配置文件读法改为读缓存

panlei

2019-09-24 0489506a01dbdaa51f36667e96dfd96742799e09

配置文件读法改为读缓存

 insertdata/config.go

@@ -59,5 +59,5 @@
    viper.UnmarshalKey("es", EsInfo)
    viper.UnmarshalKey("weedfs", WeedFs)
    viper.UnmarshalKey("sopath",SoPath)
    InitInsertEs()
    //InitInsertEs()
}

 insertdata/insertDataToEs.go

@@ -29,11 +29,11 @@
    DbTablePersons string `yaml:"dbTablePersons"`
}

func InitInsertEs() {
    weedfsUrl = "http://"+WeedFs.Ip+":"+strconv.Itoa(WeedFs.UploadPort)+"/submit"
    videoPersonUrl = "http://"+EsInfo.Masterip+":"+EsInfo.Httpport+"/"+EsInfo.EsIndex.VideoPersons.IndexName+"/"+EsInfo.EsIndex.VideoPersons.IndexType
    personAction = "http://"+EsInfo.Masterip+":"+EsInfo.Httpport+"/"+EsInfo.EsIndex.Personaction.IndexName+"/"+EsInfo.EsIndex.Personaction.IndexType
}
//func InitInsertEs() {
//    weedfsUrl = "http://"+WeedFs.Ip+":"+strconv.Itoa(WeedFs.UploadPort)+"/submit"
//    videoPersonUrl = "http://"+EsInfo.Masterip+":"+EsInfo.Httpport+"/"+EsInfo.EsIndex.VideoPersons.IndexName+"/"+EsInfo.EsIndex.VideoPersons.IndexType
//    personAction = "http://"+EsInfo.Masterip+":"+EsInfo.Httpport+"/"+EsInfo.EsIndex.Personaction.IndexName+"/"+EsInfo.EsIndex.Personaction.IndexType
//}

// 人脸的数据结构
type PerVideoPicture struct {
@@ -140,6 +140,13 @@
            logger.Error("es模块儿的异常捕获：",err)
        }
    }()
    localConfig1, err := cache.GetServerInfo()
    if err != nil {
        panic("配置文件不合法")
    }
    weedfsUrl = "http://"+localConfig1.WebPicIp+":"+strconv.Itoa(int(localConfig1.WebPicPort))+"/submit"
    videoPersonUrl = "http://"+localConfig1.AlarmIp+":"+strconv.Itoa(int(localConfig1.AlarmPort))+"/"+EsInfo.EsIndex.VideoPersons.IndexName+"/"+EsInfo.EsIndex.VideoPersons.IndexType
    personAction = "http://"+localConfig1.AlarmIp+":"+strconv.Itoa(int(localConfig1.AlarmPort))+"/"+EsInfo.EsIndex.Personaction.IndexName+"/"+EsInfo.EsIndex.Personaction.IndexType
    InsertFace(msg, "")
    // 如果标签中含有持续时间首次报警的timeLabel的话则不需要过人体追踪，不然就没的插入了
    fk := ruleserver.TrackOrNot(msg.RuleResult)
@@ -222,8 +229,8 @@
                if linkId != "" {
                    linksId = linkId
                }
                logger.Info("人脸的id:",strconv.FormatUint(face.Id, 10))
                logger.Info("人脸的分值：",face.Score)
                //logger.Info("人脸的id:",strconv.FormatUint(face.Id, 10))
                //logger.Info("人脸的分值：",face.Score)
                pervideo := PerVideoPicture{
                    esDataId,
                    msg.Cid,

 ruleserver/readyDataForRule.go

@@ -246,14 +246,14 @@
                            //logger.Info("--------------看看compareFlag的值和tableId和areaMap.args的长度：",compareFlag,tableIds,len(areaMap.args))
                            for _, arg := range areaMap.args {
                                arg.Liker = arg.Liker[0:0]
                                logger.Info("清空之后看看之前打的人脸标签变了没：")
                                if args.RuleResult["face"] != nil && len(args.RuleResult["face"].([]FaceResult)) > 0 {
                                    for _, faceResult := range args.RuleResult["face"].([]FaceResult) {
                                        for _,arg := range faceResult.Args {
                                            logger.Info("人员分值是：",arg.Score,"liker的数量为",arg.Liker)
                                        }
                                    }
                                }
                                //logger.Info("清空之后看看之前打的人脸标签变了没：")
                                //if args.RuleResult["face"] != nil && len(args.RuleResult["face"].([]FaceResult)) > 0 {
                                //    for _, faceResult := range args.RuleResult["face"].([]FaceResult) {
                                //        for _,arg := range faceResult.Args {
                                //            logger.Info("人员分值是：",arg.Score,"liker的数量为",arg.Liker)
                                //        }
                                //    }
                                //}
                                if compareFlag == 1 {
                                    arg.fillLiker(nil, threshold)
                                }