Merge branch 'hotfix/v1.1.31.1_ws' of BaseService/jyMicroservices into hotfix/v1.1.31.1

jyBXBase/rpc/model/newestBidding.go

@@ -115,11 +115,12 @@ func (n *NewestInfo) IsHasNewPushData(time int64) bool {
 
 // GetPushHistory
 func (n *NewestInfo) GetPushHistory() (res []*bxbase.NewestList) {
-	//
 	findSQL := "select a.infoid,REPLACE(a.matchkeys,'+',' ') as matchkeys,a.attachment_count,a.budget,a.bidamount from %s  a  where a.userid=%d   order by a.id desc limit ?"
 	findSQL = fmt.Sprintf(findSQL, n.TableName, n.NewUserId)
 	logx.Info(n.TableName, "-------", n.NewUserId, ",findSQL:", findSQL)
+	t := time.Now()
 	list := n.MysqlDb.SelectBySql(findSQL, n.NewsLimitNum)
+	log.Println("SQL 订阅信息耗时：", time.Since(t))
 	if len(*list) > 0 && list != nil {
 		m := map[string]bool{}
 		es_ids := []string{}
@@ -141,7 +142,9 @@ func (n *NewestInfo) GetPushHistory() (res []*bxbase.NewestList) {
 			}
 		}
 		if len(es_ids) > 0 {
+			t = time.Now()
 			list := elastic.Get(search_index, search_type, fmt.Sprintf(query, strings.Join(es_ids, `","`), len(es_ids)))
+			log.Println("elastic 招标信息耗时：", time.Since(t))
 			if list != nil {
 				for _, v := range *list {
 					_id := MC.ObjToString(v["_id"])
@@ -166,7 +169,9 @@ func (n *NewestInfo) GetPushHistory() (res []*bxbase.NewestList) {
 			}
 		}
 		if len(mgo_ids) > 0 {
+			t = time.Now()
 			list, ok := IC.MgoBidding.Find("bidding", map[string]interface{}{"_id": map[string]interface{}{"$in": mgo_ids}}, nil, mongodb_fields, false, -1, -1)
+			log.Println("mongodb bidding 招标信息耗时：", time.Since(t))
 			if ok && *list != nil {
 				for _, v := range *list {
 					_id := mongodb.BsonIdToSId(v["_id"])
@@ -191,7 +196,9 @@ func (n *NewestInfo) GetPushHistory() (res []*bxbase.NewestList) {
 			}
 		}
 		if len(mgo_back_ids) > 0 {
+			t = time.Now()
 			list, ok := IC.MgoBidding.Find("bidding_back", map[string]interface{}{"_id": map[string]interface{}{"$in": mgo_back_ids}}, nil, mongodb_fields, false, -1, -1)
+			log.Println("mongodb bidding_back 招标信息耗时：", time.Since(t))
 			if ok && *list != nil {
 				for _, v := range *list {
 					_id := mongodb.BsonIdToSId(v["_id"])