From 2987ec0089a770a3b6a3a63a243f308c57a912f0 Mon Sep 17 00:00:00 2001
From: liuxiaolong <736321739@qq.com>
Date: 星期三, 31 七月 2019 19:41:38 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.1.14:10010/r/webserver
---
controllers/esSearch.go | 11 +++++++++--
1 files changed, 9 insertions(+), 2 deletions(-)
diff --git a/controllers/esSearch.go b/controllers/esSearch.go
index ef49c27..1c20631 100644
--- a/controllers/esSearch.go
+++ b/controllers/esSearch.go
@@ -84,8 +84,15 @@
queryStr = "\"must\":[{\"multi_match\":{\"query\":\"" + queryBody + "\",\"fields\":[\"baseInfo.sex\",\"baseInfo.phoneNum.raw^1.5\",\"baseInfo.personName.raw^1.5\",\"alarmRules.alarmLevel^1.5\",\"ageDescription^1.5\",\"taskName^1.5\",\"baseInfo.tableName^1.5\",\"sex^2.0\",\"race^2.0\",\"content^1.0\",\"baseInfo.idCard^1.8\",\"cameraAddr^1.0\"]," +
"\"type\":\"cross_fields\",\"operator\":\"OR\",\"slop\":0,\"prefix_length\":0,\"max_expansions\":50,\"zero_terms_query\":\"NONE\",\"auto_generate_synonyms_phrase_query\":true,\"fuzzy_transpositions\":true,\"boost\":1}}],"
}
- gteDate := searchBody["searchTime"].([]interface{})[0].(string)
- lteDate := searchBody["searchTime"].([]interface{})[1].(string)
+ searchTime := searchBody["searchTime"].([]interface{})
+ if searchBody["searchTime"] == nil || len(searchTime) < 2 {
+ info := make(map[string]interface{}, 0)
+ info["err"] = "璇疯緭鍏ユ椂闂磋寖鍥�"
+ return info
+ }
+
+ gteDate := searchTime[0].(string)
+ lteDate := searchTime[1].(string)
//鍒ゆ柇浠诲姟ID
taskIdStr := ""
taskId := searchBody["tasks"].([]interface{})
--
Gitblit v1.8.0