test rm personIsHub=1

liuxiaolong

2019-05-28 f308c3d7ac1dc86e7b151f736fa3ad96309245f4

 esutil/EsClient.go

@@ -76,6 +76,7 @@
         }

         pmax, exist := source["picMaxUrl"].(string)
         //fmt.Println("picMaxUrl: ",pmax)
         if !exist {
            return errors.New("picMaxurl is not string"), nil
         }
@@ -93,8 +94,16 @@
         if !strings.HasPrefix(psm, "http") {
            source["picSmUrl"] = picurl + psm
         }
         //videoUrl := getVideoUrl(source)

         source["videoNum"] = getVideoUrl(source)
         timeFormat := "2019-05-28 15:04:05"
         picDateStr, err := time.Parse(timeFormat, source["picDate"].(string))
         if err == nil {
            source["picDate"] = picDateStr
         }

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

         sources = append(sources, source)
      }
@@ -105,45 +114,100 @@
   }
}

func getVideoUrl(source map[string]interface{}) (videoUrl string) {
   imgKey := source["imgKey"].(string)
   picDte := source["picDate"].(string)        //抓拍日期
   cameraId := source["videoReqNum"].(string)  //摄像机id
   indeviceId := source["indeviceid"].(string) //分析设备id
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"`
}

   var deviceMap map[string]string
   deviceMap["DSVAD010120181119"] = "http://58.118.225.79:41241/ManCarAnaly/perVideoPic/uploadRtnVideo"
   deviceMap["DSVAD010220181119"] = "http://58.118.225.79:41242/ManCarAnaly/perVideoPic/uploadRtnVideo"
   deviceMap["DSVAD010320181119"] = "http://58.118.225.79:41243/ManCarAnaly/perVideoPic/uploadRtnVideo"
   deviceMap["DSVAD010420181119"] = "http://58.118.225.79:41244/ManCarAnaly/perVideoPic/uploadRtnVideo"
func getSourceBaseInfo(source map[string]interface{}) (baseInfoJson string) {
   sdkType := source["sdkType"].(string)
   if sdkType == "人脸" {
      var baseInfo = BaseInfo{
         TaskId:"",//2.0新字段
         TaskName:"",//2.0新字段
         LikePer:source["likePer"].(string),
         TableId:"",//2.0新字段
         TableName:source["BaseName"].(string),
         PersonId:source["personId"].(string),
         PersonName:source["idcard"].(string),//人员姓名，从管理平台获取
         PersonPicUrl:source["personPicUrl"].(string),
         Gender:source["Gender"].(string),
         PhoneNum:"",//手机号，从管理平台获取
         IDCard:source["idcard"].(string),
         MonitorLevel:"",//2.0新字段
         Content:source["content"].(string),
      }
      bytes, err := json.Marshal(baseInfo)
      if err !=nil {
         return ""
      }
      return string(bytes)
   }
   return ""
}

func getVideoUrl(source map[string]interface{}) (videoUrl string){
   imgKey := source["imgKey"].(string)
   picDte := source["picDate"].(string)//抓拍日期
   cameraId := source["videoReqNum"].(string)//摄像机id
   indeviceId := source["indeviceid"].(string)//分析设备id
   deviceMap := make(map[string]string,0)
   deviceMap["DSVAD010120181119"] = "http://172.17.50.241:11111/getRecordVideoPath"
   deviceMap["DSVAD010220181119"] = "http://172.17.50.242:11111/getRecordVideoPath"
   deviceMap["DSVAD010320181119"] = "http://172.17.50.243:11111/getRecordVideoPath"
   deviceMap["DSVAD010420181119"] = "http://172.17.50.244:11111/getRecordVideoPath"

   ngxMap := make(map[string]string,0)
   ngxMap["DSVAD010120181119"] = "http://58.118.225.79:44180/videosource"
   ngxMap["DSVAD010220181119"] = "http://58.118.225.79:44280/videosource"
   ngxMap["DSVAD010320181119"] = "http://58.118.225.79:44380/videosource"
   ngxMap["DSVAD010420181119"] = "http://58.118.225.79:44480/videosource"


   reqUrl := deviceMap[indeviceId]
   var paramMap map[string]interface{}
   paramMap := make(map[string]interface{},0)
   paramMap["imgKey"] = imgKey
   paramMap["picDate"] = picDte
   paramMap["videoPath"] = cameraId
   paramMap["videoNum"] = cameraId

   respBytes, err := doPostRequest(reqUrl, "application/x-www-form-urlencoded", paramMap, nil, nil)
   if err != nil {
   respBytes, err := doPostRequest(reqUrl, "application/json", paramMap, nil, nil)
   if err !=nil{
      return ""
   }
   var resp RespVideo
   err = json.Unmarshal(respBytes, &resp)
   if err != nil {
   if err !=nil {
      return ""
   }
   return resp.VideoPath
   filePath := resp.FilePath

   if !strings.Contains(filePath, "/cut"){
      return ""
   } else {
      strArr := strings.Split(filePath, "/cut")
      ngxUrl := ngxMap[indeviceId]
      if ngxUrl !="" && len(strArr) >0 {
         return ngxUrl + strArr[1]
      }
   }

   return ""
}

type RespVideo struct {
   Code      int32  `json:"code"`
   ErrorStr  string `json:"errorStr"`
   Msg       string `json:"msg"`
   Resp      interface{}
   Status    string `json:"status"`
   VideoPath string `json:"videoPath"`
type RespVideo struct{
   FilePath string `json:"file_path"`
}

func doPostRequest(url string, contentType string, body map[string]interface{}, params map[string]string, headers map[string]string) ([]byte, error) {
   var resultBytes []byte
   var bodyJson []byte
@@ -199,8 +263,8 @@

   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\",\"imageKey\",\"sdkType\",\"ageDescription\",\"indeviceid\",\"content\",\"ID\",\"picAddress\",\"picMaxUrl\",\"picDate\",\"race\",\"videoNum\",\"picSmUrl\",\"taskName\",\"personIsHub\",\"IDCard\",\"videoIp\",\"videoReqNum\"]" +
   prama := "{\"query\":{\"bool\":{\"filter\":[{\"range\":{\"picDate\":{\"gte\":\"now+8h-" + seccond + "s\",\"lt\":\"now+8h\"}}}]}},\"size\":\"1000\",\"sort\":[{\"picDate\":{\"order\":\"desc\"}}]," +
      "\"_source\":[\"baseInfo\",\"Gender\",\"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)