feat：优化信息，完善es查询，完善网站首页公司信息查询

serve/es/serve.go

@@ -7,39 +7,57 @@ import (
 	"reflect"
 )
 
+type (
+	// SearchParams 搜索参数
+	SearchParams struct {
+		MustParams   map[string]interface{}
+		ShouldParams map[string]interface{}
+	}
+)
+
 // Create 创建操作
 func Create(index string, body []byte) error {
 	_, err := client.Index().
 		Index(index).
+		//Id(fmt.Sprintf("%d", 1)).
 		BodyJson(string(body)).
 		Do(context.Background())
 	return err
 }
 
 // Search 搜索操作
-func Search(src interface{}, index string, params map[string]interface{}, page, pageSize int) ([]interface{}, error) {
+func Search(src interface{}, index string, params *SearchParams, page, pageSize int) ([]interface{}, error) {
 	query := elastic.NewBoolQuery()
 
-	for k, v := range params {
-		query.Should(elastic.NewMatchQuery(k, v))
+	if params != nil {
+		if params.MustParams != nil && len(params.MustParams) > 0 {
+			for k, v := range params.MustParams {
+				query.Must(elastic.NewMatchQuery(k, v))
+			}
+		}
+		if params.ShouldParams != nil && len(params.ShouldParams) > 0 {
+			for k, v := range params.ShouldParams {
+				query.Should(elastic.NewMatchQuery(k, v))
+			}
+		}
 	}
-	service := client.Search().Index(index).Pretty(true).Query(query)
+	service := client.Search().Index(index)
 
 	if page > 0 && pageSize > 0 {
 		// 游标分页
-		service.From((page - 1) * pageSize)
-		service.Size(pageSize)
+		service = service.From((page - 1) * pageSize).Size(pageSize)
 	}
-	result, err := service.Do(context.Background())
+	result, err := service.Pretty(true).Query(query).Do(context.Background())
 
 	if err != nil {
 		return nil, err
 	}
 	out := make([]interface{}, 0)
 
+	_type := reflect.TypeOf(src)
+
 	for _, hit := range result.Hits.Hits {
-		data := new(interface{})
-		reflect.DeepEqual(data, src)
+		data := reflect.New(_type).Interface()
 
 		if err = json.Unmarshal(hit.Source, data); err != nil {
 			return nil, err
@@ -48,3 +66,9 @@ func Search(src interface{}, index string, params map[string]interface{}, page,
 	}
 	return out, err
 }
+
+// Delete 删除操作
+func Delete(index string) error {
+	_, err := client.DeleteIndex(index).Do(context.Background())
+	return err
+}