feat:es升级

entniche_new/src/entity/portraitBuyerSearch.go

@@ -22,9 +22,9 @@ const (
 	buyerPortraitSearchSql = `{"query":{"bool":{"must":[%s]}},"aggs":{"year_bidamount":{"range":{"field":"firsttime","ranges":[%s]},"aggs":{"count":{"sum":{"field":"bidamount"}}}},"fail_count":{"filter":{"bool":{"must":[{"term":{"bidstatus":"流标"}}]}}},"winner_count":{"cardinality":{"field":"entidlist"}},"bidamount_count":{"sum":{"field":"bidamount"}},"moneyRange":{"filter":{"bool":{"must":{"range":{"project_rate":{"gte":0,"lte":0.6}}}}},"aggs":{"moneyRangeValue":{"range":{"field":"bidamount","ranges":[%s]},"aggs":{"bidamount_count":{"sum":{"field":"bidamount"}},"budget_count":{"sum":{"field":"budget"}}}}}},"bidtypeData":{"filter":{"bool":{"must":{"terms":{"bidtype":["招标","邀标","询价","单一","竞价","竞谈"]}}}},"aggs":{"bidtype_group":{"terms":{"field":"bidtype"},"aggs":{"bidamount_count":{"sum":{"field":"bidamount"}}}},"bidamount_count":{"sum":{"field":"bidamount"}}}},"topScopeclassData":{"terms":{"field":"topscopeclass","size":12,"order":[{"bidamount_count":"desc"}]},"aggs":{"bidamount_count":{"sum":{"field":"bidamount"}},"top_scopeclass_rate_time_avg":` + YearRate + `}},"allScopeclassData":` + YearRate + `,"topAgencyData":{"terms":{"field":"agency","size":10,"order":[{"_count":"desc"},{"last_with_time":"desc"}]},"aggs":{"last_with_time":{"max":{"field":"firsttime"}}}},"topWinner":{"terms":{"field":"entidlist","size":0,"order":[{"count_bidamount":"desc"},{"_count":"desc"},{"last_with_time":"desc"}]},"aggs":{"last_with_time":{"max":{"field":"firsttime"}},"count_bidamount":{"sum":{"field":"bidamount"}},"avg_data":{"filter":{"bool":{"must":{"range":{"project_rate":{"gte":0,"lte":0.6}}}}},"aggs":{"bidamount_count":{"sum":{"field":"bidamount"}},"budget_count":{"sum":{"field":"budget"}}}}}},"firstWinner":{"terms":{"field":"first_cooperation","size":0}},"allWinnerList":{"terms":{"field":"entidlist","size":4000},"aggs":{"count_bidamount":{"sum":{"field":"bidamount"}},"avg_data":` + BaseRate + `}}},"size":0}`
 	queryTermByIdSql       = `{"terms":{"_id":[%s]}}`
 
-	queryMustSql                = `{"query":{"filtered":{"filter":{"bool":{"must":[%s]}}}}}`
+	queryMustSql                = `{"query":{"bool":{"must":[%s]}}}`
 	buyerWithEntThreadSearchNum = 50
-	buyerWithEntPortraitSqlPage = `{"query":{"filtered":{"filter":{"bool":{"must":[%s]}}}},"_source":["_id","company_area","capital","establish_date","tag_business"],"from":%d,"size":%d}`
+	buyerWithEntPortraitSqlPage = `{"query":{"bool":{"must":[%s]}},"_source":["_id","company_area","capital","establish_date","tag_business"],"from":%d,"size":%d}`
 )
 
 var ClearHtml = regexp.MustCompile("<[^>]*>")
@@ -1109,7 +1109,7 @@ func GetWinnerNamesByIds(ids []string) (returnMap map[string]string) {
 		return
 	}
 	doSearchSql := fmt.Sprintf(queryTermByIdSql, `"`+strings.Join(ids, `","`)+`"`)
-	list := elastic.Get("qyxy", "qyxy", fmt.Sprintf(`{"query":{"filtered":{"filter":{"bool":{"must":[%s]}}}},"_source":["_id","company_name"],"size":60}`, doSearchSql))
+	list := elastic.Get("qyxy", "qyxy", fmt.Sprintf(`{"query":{"bool":{"must":[%s]}},"_source":["_id","company_name"],"size":60}`, doSearchSql))
 	if list == nil || len(*list) == 0 {
 		return
 	}
@@ -1127,7 +1127,7 @@ func GetWinnerNamesByIds(ids []string) (returnMap map[string]string) {
 }
 
 func GetProposed(entName, dataType string, start, limit int) (res []map[string]interface{}, total int64) {
-	sql := `{"query": {"filtered": {"filter": {"bool": {"must": [{"terms": {"subtype": ["%s"]}},{"terms": {"buyer": ["%s"]}}]}}}}}`
+	sql := `{"query": {"bool": {"must": [{"terms": {"subtype": ["%s"]}},{"terms": {"buyer": ["%s"]}}]}}}`
 	sql = fmt.Sprintf(sql, dataType, entName)
 	total = elastic.Count("bidding", "bidding", sql)
 	sql = sql[:len(sql)-1] + fmt.Sprintf(`,"from":%d,"size":%d}"`, start, limit)
@@ -1151,7 +1151,7 @@ func GetProposed(entName, dataType string, start, limit int) (res []map[string]i
 }
 
 func GetExpire(entName string, startTime, endTime int64, start, limit int) (res []map[string]interface{}, total int64) {
-	sql := `{"query": {"filtered": {"filter": {"bool": {"must": [{"terms": {"buyer": ["%s"]}},{"range": {"project_completedate": {"gte": %d,"lt": %d}}}]}}}}}`
+	sql := `{"query": {"bool": {"must": [{"terms": {"buyer": ["%s"]}},{"range": {"project_completedate": {"gte": %d,"lt": %d}}}]}}}`
 	sql = fmt.Sprintf(sql, entName, startTime, endTime)
 	total = elastic.Count("bidding", "bidding", sql)
 	sql = sql[:len(sql)-1] + fmt.Sprintf(`,"from":%d,"size":%d}"`, start, limit)
@@ -1228,7 +1228,7 @@ func onceGetWinnerMsgByIds(ids []string) (returnMap map[string]*WinnerSimpleData
 		return
 	}
 	doSearchSql := fmt.Sprintf(queryTermByIdSql, `"`+strings.Join(ids, `","`)+`"`)
-	list := elastic.Get("qyxy", "qyxy", fmt.Sprintf(`{"query":{"filtered":{"filter":{"bool":{"must":[%s]}}}},"_source":["_id","company_name","tag_business"],"size":%d}`, doSearchSql, len(ids)))
+	list := elastic.Get("qyxy", "qyxy", fmt.Sprintf(`{"query":{"bool":{"must":[%s]}},"_source":["_id","company_name","tag_business"],"size":%d}`, doSearchSql, len(ids)))
 	if list == nil || len(*list) == 0 {
 		return
 	}

entniche_new/src/entity/portrait_screen.go

@@ -28,7 +28,7 @@ const (
 	NewMustSearch                    = `{"query":{"bool":{"must":[%s]}}%s}`
 	ListSearchLimit                  = `,"_source":[%s],"sort":[{"%s":{"order":"desc"}}],"from":%d,"size":%d`
 
-	newBiddingSearchShowSql = `{"query":{"filtered":{"filter":{"bool":{"must":[%s,{"range":{"firsttime":{"gte":"%d"}}}]}}}},"aggs":{"group_area":{"terms":{"field":"area","size":40}},"group_scopeArr":{"terms":{"field":"subscopeclass","size":20}}}}`
+	newBiddingSearchShowSql = `{"query":{"bool":{"must":[%s,{"range":{"firsttime":{"gte":"%d"}}}]}},"aggs":{"group_area":{"terms":{"field":"area","size":40}},"group_scopeArr":{"terms":{"field":"subscopeclass","size":20}}}}`
 )
 
 var searchPool = make(chan bool, 3)

nicheinsight/src/entity/portrait_search.go

@@ -298,8 +298,6 @@ func GetAggs(index, itype, query string) (aggs elastic1.Aggregations) {
 
 var (
 	Query_ent_1 = `{"query": {
-    "filtered": {
-      "filter": {
         "bool": {
           "must": [
             {
@@ -323,8 +321,6 @@ var (
 
 			}]
         }
-      }
-    }
   },
   "size": 10,
   "_source": [
@@ -343,8 +339,6 @@ var (
 }`
 
 	Query_ent_2 = `{"query": {
-    "filtered": {
-      "filter": {
         "bool": {
           "must": [
             {
@@ -362,8 +356,6 @@ var (
             }
           ]
         }
-      }
-    }
   },
   "aggs": {
     "year_ranges": {
@@ -473,8 +465,6 @@ var (
 }`
 
 	Query_ent_21 = `{"query": {
-    "filtered": {
-      "filter": {
         "bool": {
           "must": [
             {
@@ -496,8 +486,6 @@ var (
             }
           ]
         }
-      }
-    }
   },
   "aggs": {
 	"group_by_compete": {

nicheinsight/src/entity/portrait_search2.go

@@ -307,8 +307,6 @@ func repairNum(num int) int {
 
 var Query_buyer_ent_1 = `{
 	"query": {
-		"filtered": {
-			"filter": {
 				"bool": {
 					"must": [{
 							"term": {
@@ -331,8 +329,6 @@ var Query_buyer_ent_1 = `{
 
 					}]
 				}
-			}
-		}
 	},
 	"size": 10,
 	"_source": [

nicheinsight/src/test_hx/main.go

@@ -405,8 +405,6 @@ func GetAggs(index, itype, query string) (aggs elastic1.Aggregations) {
 
 var (
 	Query_ent_1 = `{"query": {
-    "filtered": {
-      "filter": {
         "bool": {
           "must": [
             {
@@ -424,8 +422,6 @@ var (
             }
           ]
         }
-      }
-    }
   },
   "size": 10,
   "_source": [
@@ -442,8 +438,6 @@ var (
 }`
 
 	Query_ent_2 = `{"query": {
-    "filtered": {
-      "filter": {
         "bool": {
           "must": [
             {
@@ -461,8 +455,6 @@ var (
             }
           ]
         }
-      }
-    }
   },
   "aggs": {
     "year_ranges": {
@@ -572,8 +564,6 @@ var (
 }`
 
 	Query_ent_21 = `{"query": {
-    "filtered": {
-      "filter": {
         "bool": {
           "must": [
             {
@@ -595,8 +585,6 @@ var (
             }
           ]
         }
-      }
-    }
   },
   "aggs": {
     "group_by_buyerclass": {