From 1edbd16e65fdc036500c68c22745b61a39ee13db Mon Sep 17 00:00:00 2001
From: liuxiaolong <liuxiaolong@aiotlink.com>
Date: 星期三, 17 六月 2020 17:03:02 +0800
Subject: [PATCH] add picDate and sdkType
---
esutil/EsClient.go | 7 +++++--
1 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/esutil/EsClient.go b/esutil/EsClient.go
index c625f86..88de0f4 100644
--- a/esutil/EsClient.go
+++ b/esutil/EsClient.go
@@ -63,7 +63,7 @@
}
d["id"] = value.(map[string]interface{})["_id"]
-
+ d["picDate"] = source["picDate"]
pmax, exist := source["picMaxUrl"]
if !exist {
continue
@@ -104,6 +104,9 @@
} else {
d["baseInfo"] = []interface{}{}
}
+ d["sdkType"] = "浜鸿劯"
+ } else {
+ d["sdkType"] = source["sdkName"]
}
}
@@ -232,7 +235,7 @@
filterStr = strings.Join(filterArr, ",")
}
param := "{\"query\":{\"bool\":{\"filter\":["+filterStr+"]}},\"size\":\""+sizeStr+"\",\"sort\":[{\"picDate\":{\"order\":\"desc\"}}]," +
- "\"_source\":{\"includes\":[\"baseInfo\",\"targetInfo\",\"content\",\"id\",\"picMaxUrl\",\"picDate\",\"showLabels\",\"taskName\"],\"excludes\":[\"*.feature\",\"*.attachTarget\",\"*.targetLocation\",\"alarmRules\"]}" +
+ "\"_source\":{\"includes\":[\"baseInfo\",\"targetInfo\",\"content\",\"id\",\"picMaxUrl\",\"picDate\",\"showLabels\",\"taskName\",\"sdkName\"],\"excludes\":[\"*.feature\",\"*.attachTarget\",\"*.targetLocation\",\"alarmRules\"]}" +
"}"
err, tokenRes := GetEsDataReq(url, param, true)
--
Gitblit v1.8.0