Merge branch 'master' of http://192.168.1.14:10010/r/Android/tcpserver

liuxiaolong

2019-05-31 b3ac362c6cc7319ed96aff8c7a3a35d2fa3e0a4d

Merge branch 'master' of http://192.168.1.14:10010/r/Android/tcpserver

 esutil/EsClient.go

@@ -90,12 +90,33 @@
            if !exist {
                return errors.New("picSmUrl is not string"), nil
            }
            //fmt.Println("picSmUrl: ",psm)

            if !strings.HasPrefix(psm, "http") {
                source["picSmUrl"] = picurl + psm
            }
            //videoUrl := getVideoUrl(source)

            prace, exist := source["Race"]
            if exist {
                source["race"] = prace
            }

            pGender, exist := source["Gender"]
            if exist {
                source["gender"] = pGender
            }

            source["ageDescription"] = getAgeDesc(source["Age"])

            source["videoNum"] = getVideoUrl(source)
            picDate := source["picDate"].(string)
            lastIdx := strings.LastIndex(picDate,":")
            picDateStr := picDate[:lastIdx]
            if err == nil {
                source["picDate"] = picDateStr
            }

            baseInfo := getSourceBaseInfo(source)
            source["baseInfo"] = baseInfo

            sources = append(sources, source)
        }
@@ -106,9 +127,96 @@
    }
}

func getAgeDesc(age interface{})(ageDesc string) {
    if age !=nil {
        ageInt := age.(float64)
        if ageInt >0 && ageInt<7 {
            ageDesc = "童年"
        } else if ageInt >=7 && ageInt<18 {
            ageDesc = "少年"
        } else if ageInt >=18 && ageInt<40 {
            ageDesc = "青年"
        } else if ageInt >=40 && ageInt<65 {
            ageDesc = "中年"
        } else if ageInt >=65 {
            ageDesc = "老年"
        } else {
            ageDesc = ""
        }
    }
    return ageDesc
}

type BaseInfo struct {
    TaskId string `json:"taskId"`
    TaskName string `json:"taskName"`
    LikePer string `json:"likePer"`
    TableId string `json:"tableId"`
    TableName string `json:"tableName"`
    PersonId string `json:"personId"`
    PersonPicUrl string `json:"personPicUrl"`
    PersonName string `json:"personName"`
    Gender string `json:"gender"`
    PhoneNum string `json:"phoneNum"`
    IDCard string `json:"IDCard"`
    MonitorLevel string `json:"monitorLevel"`
    Content string `json:"content"`
}

func getSourceBaseInfo(source map[string]interface{}) []BaseInfo {
    sdkType := source["sdkType"].(string)
    baseInfoArr := make([]BaseInfo,0)
    if sdkType == "人脸" {
        likePer,baseName,personId,idCard,personPicUrl,gender,content :="","","","","","",""
        if source["likePer"] !=nil {
            likePer = source["likePer"].(string)
        }
        if source["BaseName"] !=nil {
            baseName = source["BaseName"].(string)
        }
        if source["personId"] !=nil {
            personId = source["personId"].(string)
        }
        if source["idcard"] !=nil {
            idCard = source["idcard"].(string)
        }
        if source["personPicUrl"] !=nil {
            personPicUrl = source["personPicUrl"].(string)
        }
        if source["Gender"] !=nil {
            gender = source["Gender"].(string)
        }
        if source["content"] !=nil {
            content = source["content"].(string)
        }
        var baseInfo = BaseInfo{
            TaskId:"",//2.0新字段
            TaskName:"",//2.0新字段
            LikePer:likePer,
            TableId:"",//2.0新字段
            TableName:baseName,
            PersonId:personId,
            PersonName:idCard,//人员姓名，从管理平台获取
            PersonPicUrl:personPicUrl,
            Gender:gender,
            PhoneNum:"",//手机号，从管理平台获取
            IDCard:idCard,
            MonitorLevel:"",//2.0新字段
            Content:content,
        }

        baseInfoArr = append(baseInfoArr, baseInfo)
        //bytes, err := json.Marshal(baseInfoArr)
        //if err !=nil {
        //    return ""
        //}
    }
    return baseInfoArr
}

func getVideoUrl(source map[string]interface{}) (videoUrl string){
    imgKey := source["imgKey"].(string)
    picDte := source["picDate"].(string)//抓拍日期
    picDate := source["picDate"].(string)//抓拍日期
    cameraId := source["videoReqNum"].(string)//摄像机id
    indeviceId := source["indeviceid"].(string)//分析设备id
    deviceMap := make(map[string]string,0)
@@ -127,31 +235,41 @@
    reqUrl := deviceMap[indeviceId]
    paramMap := make(map[string]interface{},0)
    paramMap["imgKey"] = imgKey
    paramMap["picDate"] = picDte
    paramMap["picDate"] = picDate
    paramMap["videoNum"] = cameraId

    respBytes, err := doPostRequest(reqUrl, "application/json", paramMap, nil, nil)
    if err !=nil{
        return ""
    }

    var resp RespVideo
    err = json.Unmarshal(respBytes, &resp)
    if err !=nil {
        return ""
    }
    filePath := resp.FilePath

    filePath := resp.FilePath
    videoUrl = ""
    if !strings.Contains(filePath, "/cut"){
        return ""
        videoUrl = ""
        fmt.Printf("videoReqUrl:%s ,imgKey:%s ,picDate:%s ,cameraId:%s ,filePath:%s \n ",reqUrl,imgKey,picDate,cameraId,filePath)
    } else {
        strArr := strings.Split(filePath, "/cut")
        ngxUrl := ngxMap[indeviceId]
        if ngxUrl !="" && len(strArr) >0 {
            return ngxUrl + strArr[1]
            videoUrl = ngxUrl + strArr[1]
        }
    }

    return ""
    if videoUrl == ""{
        respMap := make(map[string]interface{},0)
        err := json.Unmarshal(respBytes, &respMap)
        if err !=nil {
            fmt.Println("resp UnmarshalToMap err: ",err)
        }
        fmt.Println("resp: ",respMap)
    }
    return videoUrl
}

type RespVideo struct{
@@ -164,11 +282,13 @@
        var err error
        bodyJson, err = json.Marshal(body)
        if err != nil {
            log.Log.Errorln("doPostRequestMarshal err:",err)
            return resultBytes, err
        }
    }
    request, err := http.NewRequest("POST", url, bytes.NewBuffer(bodyJson))
    if err != nil {
        log.Log.Errorln("NewRequest ERR:",err)
        return resultBytes, err
    }
    request.Header.Set("Content-type", contentType)
@@ -186,14 +306,19 @@
            request.Header.Add(key, val)
        }
    }
    client := &http.Client{}
    timeOut:= time.Duration(8*time.Second)//set request timeout
    client := &http.Client{
        Timeout:timeOut,
    }
    resp, err := client.Do(request)
    if err != nil {
        log.Log.Errorln("DoRequest ERR:",err)
        return resultBytes, err
    }
    defer resp.Body.Close()
    resultBytes, err = ioutil.ReadAll(resp.Body)
    if err != nil {
        log.Log.Errorln("ReadAll ERR:",err)
        return resultBytes, err
    }
    return resultBytes, nil
@@ -211,9 +336,12 @@
    url := fmt.Sprintf("%s%s%s", Eurl, index, "/_search")

    seccond := strconv.Itoa(sec)

    prama := "{\"query\":{\"bool\":{\"filter\":[{\"term\":{\"personIsHub\":\"1\"}},{\"range\":{\"picDate\":{\"gte\":\"now+8h-" + seccond + "s\",\"lt\":\"now+8h\"}}}]}},\"size\":\"1000\",\"sort\":[{\"picDate\":{\"order\":\"desc\"}}]," +
        "\"_source\":[\"baseInfo\",\"gender\",\"indeviceName\",\"imgKey\",\"sdkType\",\"ageDescription\",\"indeviceid\",\"content\",\"ID\",\"picAddress\",\"picMaxUrl\",\"picDate\",\"race\",\"videoNum\",\"picSmUrl\",\"taskName\",\"personIsHub\",\"IDCard\",\"videoIp\",\"videoReqNum\"]" +
    preSec := ""
    if sec > 60 {
        preSec = "-60s"
    }
    prama := "{\"query\":{\"bool\":{\"filter\":[{\"range\":{\"picDate\":{\"gte\":\"now+8h-" + seccond + "s\",\"lt\":\"now+8h"+preSec+"\"}}}]}},\"size\":\"1000\",\"sort\":[{\"picDate\":{\"order\":\"desc\"}}]," +
        "\"_source\":[\"baseInfo\",\"Gender\",\"BaseName\",\"Age\",\"personId\",\"personPicUrl\",\"indeviceName\",\"imgKey\",\"sdkType\",\"ageDescription\",\"indeviceid\",\"content\",\"Id\",\"picAddress\",\"picMaxUrl\",\"picDate\",\"Race\",\"videoNum\",\"picSmUrl\",\"taskName\",\"personIsHub\",\"idcard\",\"videoIp\",\"videoReqNum\"]" +
        "}"
    err, tokenRes := GetEsDataReq(url, prama, picurl, true)