修改批量

elastic/service.go

@@ -53,7 +53,7 @@ func GetCount(req GetCountReq) (count int64,err error) {
 }
 
 //根据搜索条件 获取数据
-func GetList(req GetListReq) (searchResult *elastic.SearchResult) {
+func GetList(req GetListReq) (searchResult *elastic.SearchResult,err error) {
 	//检测是from_size查询还是search_after滚动式查询
 	isSearchAfter, from, size := checkParam(req)
 	//连接Es
@@ -82,7 +82,7 @@ func GetList(req GetListReq) (searchResult *elastic.SearchResult) {
 			Do(ctx)
 	}
 
-	return searchResult
+	return
 }
 
 //检验参数 区分 分页查询 滚动式查询
@@ -107,11 +107,11 @@ func Bulk(req BulkReq) (bulkIndex *BulkIndex, err error) {
 
 	switch req.Type {
 	case "add":
-		bulkIndexAdd = BulkAdd(req.IndexName)
+		bulkIndexAdd = BulkAdd(req)
 	case "update":
-		bulkIndexUpdate = BulkUpdate(req.IndexName)
+		bulkIndexUpdate = BulkUpdate(req)
 	case "del":
-		bulkIndexDel = BulkDel(req.IndexName)
+		bulkIndexDel = BulkDel(req)
 
 	}
 	if bulkIndexAdd != nil {
@@ -127,20 +127,20 @@ func Bulk(req BulkReq) (bulkIndex *BulkIndex, err error) {
 }
 
 //批量处理 准备数据 1.添加
-func BulkAdd(indexName string) (indexReq *elastic.BulkIndexRequest) {
-	indexReq = elastic.NewBulkIndexRequest().Index(indexName).Type(docType)
+func BulkAdd(req BulkReq) (indexReq *elastic.BulkIndexRequest) {
+	indexReq = elastic.NewBulkIndexRequest().Index(req.IndexName).Type(docType).Id(req.DocId).Routing(req.RoutingId).Doc(req.Doc)
 	return
 }
 
 //批量处理 准备数据 1.删除
-func BulkDel(indexName string) (indexReq *elastic.BulkDeleteRequest) {
-	indexReq = elastic.NewBulkDeleteRequest().Index(indexName).Type(docType)
+func BulkDel(req BulkReq) (indexReq *elastic.BulkDeleteRequest) {
+	indexReq = elastic.NewBulkDeleteRequest().Index(req.IndexName).Type(docType).Id(req.DocId).Routing(req.RoutingId)
 	return
 }
 
 //批量处理 准备数据 1.更新
-func BulkUpdate(indexName string) (indexReq *elastic.BulkUpdateRequest) {
-	indexReq = elastic.NewBulkUpdateRequest().Index(indexName).Type(docType)
+func BulkUpdate(req BulkReq) (indexReq *elastic.BulkUpdateRequest) {
+	indexReq = elastic.NewBulkUpdateRequest().Index(req.IndexName).Type(docType).Id(req.DocId).Routing(req.RoutingId).Doc(req.Doc)
 	return
 }
 

elastic/struct.go

@@ -5,6 +5,9 @@ import "github.com/olivere/elastic/v7"
 type BulkReq struct {
 	Type string `json:"type"`
 	IndexName string `json:"index_name"`
+	DocId string `json:"doc_id"`
+	RoutingId string `json:"routing_id"`
+	Doc interface{} `json:"doc"`
 }
 type BulkIndex struct {
 	*elastic.BulkIndexRequest