feat:增加字段

main.go

@@ -3,23 +3,26 @@ package main
 import (
 	"log"
 
-	. "app.yhyue.com/moapp/jybase/mysql"
+	. "app.yhyue.com/moapp/jybase/es"
 	. "bp.jydev.jianyu360.cn/BaseService/pushpkg/p"
 )
 
 func main() {
-	var m float64 = 27500
-	log.Println(ConversionMoney(m))
-	return
-	base := &Mysql{
-		Address:      "192.168.3.11:3366",
-		UserName:     "root",
-		PassWord:     "Topnet123",
-		DBName:       "jianyu",
-		MaxOpenConns: 2, //用于设置最大打开的连接数，默认值为0表示不限制。
-		MaxIdleConns: 2, //用于设置闲置的连接数。
+	NewEs("v7", "http://192.168.3.149:9200", 2, "", "")
+	array := []map[string]interface{}{
+		map[string]interface{}{
+			"_id": "5b7bd6b9a5cb26b9b7449fd7",
+		},
+		map[string]interface{}{
+			"_id": "5b7bd6b9a5cb26b9b7449fe4",
+		},
+		map[string]interface{}{
+			"_id": "626c4b63923488e172579d81",
+		},
+		map[string]interface{}{
+			"_id": "5b7bd6b9a5cb26b9b7449fde",
+		},
 	}
-	base.Init()
-	cc := HasService(base, "642ea6178b4de9bf1b012342", Bigmember_Service_Entchange, Bigmember_Service_Entchange_Followent).IsBuy
-	log.Println(cc)
+	BiddingRepair(array, "filetext")
+	log.Println(array)
 }

p/constant.go

@@ -35,6 +35,7 @@ const (
 	MatchWay_Filetext                     = "3"
 	MatchWay_Projectname                  = "4"
 	MatchWay_Purchasing                   = "5"
+	Es_Query_By_Ids                       = `{"query":{"bool":{"must":{"terms":{"id":[%s]}}}},"_source":["%s"],"size":%d}`
 )
 
 var (

p/public.go

@@ -14,6 +14,7 @@ import (
 	. "app.yhyue.com/moapp/jybase/common"
 	util "app.yhyue.com/moapp/jybase/common"
 	. "app.yhyue.com/moapp/jybase/date"
+	"app.yhyue.com/moapp/jybase/es"
 	"app.yhyue.com/moapp/jybase/logger"
 	. "app.yhyue.com/moapp/jybase/mongodb"
 	. "app.yhyue.com/moapp/jybase/mysql"
@@ -231,6 +232,7 @@ func LoadBidding(mgo *MongodbSim, dbName, coll string, startTime int64, redisCac
 	queryField := map[string]interface{}{
 		"title":           1,
 		"detail":          1,
+		"purchasing":      1,
 		"projectname":     1,
 		"projectcode":     1,
 		"buyer":           1,
@@ -261,7 +263,6 @@ func LoadBidding(mgo *MongodbSim, dbName, coll string, startTime int64, redisCac
 		"bidendtime":      1,
 		"entidlist":       1,
 		"autoid":          1,
-		"filetext":        1,
 	}
 	if fields == nil {
 		for k, v := range fields {
@@ -297,7 +298,9 @@ func LoadBidding(mgo *MongodbSim, dbName, coll string, startTime int64, redisCac
 				}
 				info[v] = temp[v]
 			}
-			info["detail"] = temp["detail"]
+			if temp["detail"] != nil {
+				info["detail"] = temp["detail"]
+			}
 			redis.Put(Pushcache_1, "info_"+_id, info, OneDaySecond)
 		}
 		temp = make(map[string]interface{})
@@ -306,10 +309,48 @@ func LoadBidding(mgo *MongodbSim, dbName, coll string, startTime int64, redisCac
 			logger.Info("加载", coll, "数据：", index)
 		}
 	}
+	if util.IntAll(queryField["filetext"]) > 0 {
+		array := []map[string]interface{}{}
+		for _, v := range res {
+			array = append(array, v)
+			if len(array) == 50 {
+				BiddingRepair(array, "filetext")
+				array = []map[string]interface{}{}
+			}
+		}
+		if len(array) > 0 {
+			BiddingRepair(array, "filetext")
+		}
+	}
 	logger.Info(coll, "数据已经加载结束。。。", index)
 	return &res, endTime
 }
 
+//
+func BiddingRepair(array []map[string]interface{}, fields string) {
+	ids := []string{}
+	for _, v := range array {
+		ids = append(ids, fmt.Sprintf(`"%s"`, util.ObjToString(v["_id"])))
+	}
+	m := map[string]map[string]interface{}{}
+	list := es.VarEs.Get(Es_Bidding, Es_Bidding, fmt.Sprintf(Es_Query_By_Ids, strings.Join(ids, ","), fields, len(ids)))
+	if list == nil {
+		return
+	}
+	for _, v := range *list {
+		m[util.ObjToString(v["_id"])] = v
+	}
+	for _, v := range array {
+		obj := m[util.ObjToString(v["_id"])]
+		if obj == nil {
+			continue
+		}
+		for kk, vv := range obj {
+			v[kk] = vv
+		}
+	}
+}
+
 //
 func ToSortList(list interface{}) *SortList {
 	sl := make(SortList, 0)