add log

liuxiaolong

2020-07-28 89a3b406aabf07ba6faf0b6eb2a0c147d62b75d5

 esutil/EsClient.go

@@ -98,9 +98,19 @@
         if !exist {
            continue
         }
         alarmLevel, exist := source["alarmLevel"]
         alarmRules, exist := source["alarmRules"]
         if exist {
            d["alarmLevel"] = alarmLevel
            fmt.Println("exist alarmRules")
            if alarmB,ae := json.Marshal(alarmRules);ae ==nil {
               var alarmRArr []AlarmRule
               if ae = json.Unmarshal(alarmB, &alarmRArr);ae ==nil && len(alarmRArr) >0 {
                  d["alarmLevel"] = alarmRArr[0].AlarmLevel
               } else {
                  fmt.Println("unmarshal ae:", ae)
               }
            } else {
               fmt.Println("ae:", ae)
            }
         } else {
            d["alarmLevel"] = ""
         }
@@ -166,6 +176,11 @@
   } else {
      return nil, dat
   }
}

type AlarmRule struct {
   GroupId          string          `json:"groupId"`
   AlarmLevel          string          `json:"alarmLevel"`
}

type TargetInfo struct {
@@ -286,7 +301,7 @@
      mustNotStr = strings.Join(mustNotArr, ",")
   }
   param := "{\"query\":{\"bool\":{\"filter\":["+filterStr+"],\"must_not\":["+mustNotStr+"]}},\"size\":\""+sizeStr+"\",\"sort\":[{\"picDate\":{\"order\":\"desc\"}}]," +
      "\"_source\":{\"includes\":[\"cameraAddr\",\"baseInfo\",\"targetInfo\",\"content\",\"id\",\"picMaxUrl\",\"picDate\",\"showLabels\",\"taskName\",\"sdkName\",\"videoUrl\"],\"excludes\":[\"*.feature\",\"*.attachTarget\",\"*.targetLocation\",\"alarmRules\"]}" +
      "\"_source\":{\"includes\":[\"cameraAddr\",\"baseInfo\",\"targetInfo\",\"content\",\"id\",\"picMaxUrl\",\"picDate\",\"showLabels\",\"taskName\",\"sdkName\",\"videoUrl\",\"alarmRules\"],\"excludes\":[\"*.feature\",\"*.attachTarget\",\"*.targetLocation\",\"alarmRules\"]}" +
      "}"
   err, tokenRes := GetEsDataReq(url, param, true)