From b2782f7b8b49806ac67663e2ec9e25c44b69d041 Mon Sep 17 00:00:00 2001
From: liuxiaolong <736321739@qq.com>
Date: 星期六, 27 七月 2019 15:04:06 +0800
Subject: [PATCH] fix twice searchByPhoto
---
controllers/es.go | 52 +++++++++++++++++++---------------------------------
1 files changed, 19 insertions(+), 33 deletions(-)
diff --git a/controllers/es.go b/controllers/es.go
index fe2afbc..46cb2f5 100644
--- a/controllers/es.go
+++ b/controllers/es.go
@@ -33,40 +33,26 @@
util.ResponseFormat(c, code.RequestParamError, "鍙傛暟鏈夎")
return
}
- databases := searchBody.DataBases
- from := 0
- to := 0
-
- data := make(map[string]interface{})
- searchBody.Page = 1
- searchBody.Size = 15000
-
- if len(databases) == 1 && databases[0] == "esData" {
- searchBody.IsAggs = false
- } else {
- data = service.QueryDbPersonsForCompare(*searchBody)
+ if searchBody.CompareNum !="" {
+ //浜屾鎼滅储锛屼笉闇�瑕佸啀姣斿浜�
+ co := service.GetCompResultByNum(searchBody.CompareNum)
+ if co != nil {
+ //浜屾鎼滅储鍜屾帓搴�
+ twiceM := GetCompareDataTwice(co,searchBody)
+ util.ResponseFormat(c,code.Success,twiceM)
+ } else {
+ m :=make(map[string]interface{},0)
+ m["compareNum"] = searchBody.CompareNum
+ m["total"] = 0
+ m["totalList"] = []service.CompareResult{}
+ util.ResponseFormat(c,code.CompareResultGone,m)
+ }
}
- sources := data["datalist"].([]interface{})
-
- if len(sources) > 0 {
- //杩涜姣斿
- } else {
- fmt.Println("鏌ヨ鏉′欢涓嬫棤鏁版嵁 source 鏁版嵁涓虹┖锛�" + string(len(sources)))
- }
- dataLen := len(sources)
- if from > dataLen-1 {
- from = 0
- to = 0
- }
- if to > dataLen {
- to = dataLen
- }
-
- dmap := make(map[string]interface{}, 2)
- dmap["datalist"] = sources
- dmap["total"] = dataLen
- util.ResponseFormat(c, code.Success, dmap)
-
+ m :=make(map[string]interface{},0)
+ m["compareNum"] = searchBody.CompareNum
+ m["total"] = 0
+ m["totalList"] = []service.CompareResult{}
+ util.ResponseFormat(c,code.CompareResultGone,m)
}
func searchEsData(searchBody models.EsSearch) map[string]interface{} {
--
Gitblit v1.8.0