From f3863b12653fc47996073710b56e792de0be4c8d Mon Sep 17 00:00:00 2001
From: sunty <1172534965@qq.com>
Date: 星期二, 25 六月 2019 17:57:05 +0800
Subject: [PATCH] 根据新索引结构修改算法和接口
---
service/CameraVideoService.go | 12 ++++++------
1 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/service/CameraVideoService.go b/service/CameraVideoService.go
index 74423c3..907dd8e 100644
--- a/service/CameraVideoService.go
+++ b/service/CameraVideoService.go
@@ -16,10 +16,12 @@
if reqBody.DataBases != nil {
tableIds = reqBody.DataBases
}
- startDate := "";endDate := ""
+ startDate := ""
+ endDate := ""
if reqBody.SearchTime != nil && len(reqBody.SearchTime) >= 2 {
dates := reqBody.SearchTime
- startDate = dates[0];endDate = dates[1] // 璧峰缁撴潫鏃堕棿
+ startDate = dates[0]
+ endDate = dates[1] // 璧峰缁撴潫鏃堕棿
}
contentValue := reqBody.InputValue //杈撳叆妗嗗唴瀹�
/*page := 1 ;if reqBody["page"] != nil { page = int(reqBody["page"].(float64)) } // 椤电爜
@@ -35,7 +37,7 @@
syncTerm += ",{\"terms\":{\"tableId\":" + string(bytes) + "}}" // 搴曞簱浜哄憳
}
if startDate != "" && endDate != "" {
- syncTerm += ",{\"range\":{\"create_time\":{\"from\":\"" + startDate + "\"," +
+ syncTerm += ",{\"range\":{\"createTime\":{\"from\":\"" + startDate + "\"," +
"\"to\":\"" + endDate + "\",\"include_lower\":true,\"include_upper\":true,\"boost\":1}}}" // 搴曞簱浜哄憳
}
if contentValue != "" {
@@ -43,10 +45,8 @@
"\"fields\":[\"personName\",\"sex\",\"idcard\",\"phoneNum\",\"reserved\"],\"boost\":1}}]"
}
params := "{\"query\":{\"bool\":{\"filter\":[" +
- "{\"term\":{\"del_flag\":\"0\"}}" + syncTerm + "]" + contentParam + "}},\"from\":0,\"size\":10000,\"sort\":{\"uuid\":{\"order\":\"desc\"}}}"
+ "{\"term\":{\"isDelete\":\"0\"}}" + syncTerm + "]" + contentParam + "}},\"from\":0,\"size\":10000,\"sort\":{\"uuid\":{\"order\":\"desc\"}}}"
fmt.Print("鏌ヨ鍏ㄩ儴搴曞簱浜哄憳 璇锋眰url:%s;\n 璇锋眰鍙傛暟params:%s", url, params)
data := esutil.GetEsDataReq(url, params, true)
return data
}
-
-
--
Gitblit v1.8.0