wip:最新招标信息查询优化

src/jfw/front/classificationTag.go

@@ -397,6 +397,12 @@ func RecommendationBeacon() []Signal {
 		return rData
 	}
 
+	var (
+		now         = time.Now()
+		startTime   = fmt.Sprint(time.Date(now.Year(), now.Month(), now.Day()-7, now.Hour(), now.Minute(), now.Second(), 0, time.Local).Unix()) //最近7天
+		endTime     = fmt.Sprint(now.Unix())
+		publishTime = fmt.Sprintf("%s_%s", startTime, endTime)
+	)
 	sy := sync.RWMutex{}
 	wg := sync.WaitGroup{}
 	var data, dataArr []Signal
@@ -405,8 +411,10 @@ func RecommendationBeacon() []Signal {
 		wg.Add(1)
 		go func(vst string) {
 			defer wg.Done()
-			var list []map[string]interface{}
-			_, _, lists := bidsearch.GetPcBidSearchData("", "", "", "", vst, "", "", "", "", "", "", "", "", 1, false, nil, bidSearch_field_1, "", false, false, "", 8, "")
+			var (
+				list []map[string]interface{}
+			)
+			_, _, lists := bidsearch.GetPcBidSearchData("", "", "", publishTime, vst, "", "", "", "", "", "", "", "", 1, false, nil, bidSearch_field_1, "", false, false, "", 8, "")
 			if lists != nil {
 				for _, v1 := range *lists {
 					v1["_id"] = encrypt.CommonEncodeArticle("content", v1["_id"].(string))
@@ -562,7 +570,14 @@ func NewIndexbids(session *httpsession.Session, r *http.Request) []map[string]in
 		data.Count = total
 	*/
 	// p397 收回查看拟建权限
-	_, _, lists := bidsearch.GetPcBidSearchData("", "", "", "", "招标预告,招标公告,招标结果,招标信用信息", "", "", "", "", "", "", "", "", 1, false, nil, bidSearch_field_1, "", false, false, "", 8, "")
+
+	var (
+		now         = time.Now()
+		startTime   = fmt.Sprint(time.Date(now.Year(), now.Month(), now.Day()-7, now.Hour(), now.Minute(), now.Second(), 0, time.Local).Unix()) //最近7天
+		endTime     = fmt.Sprint(now.Unix())
+		publishTime = fmt.Sprintf("%s_%s", startTime, endTime)
+	)
+	_, _, lists := bidsearch.GetPcBidSearchData("", "", "", publishTime, "招标预告,招标公告,招标结果,招标信用信息", "", "", "", "", "", "", "", "", 1, false, nil, bidSearch_field_1, "", false, false, "", 8, "")
 	if lists != nil {
 		for _, v1 := range *lists {
 			v1["_id"] = encrypt.CommonEncodeArticle("content", v1["_id"].(string))

src/jfw/front/pcIndex.go

@@ -329,7 +329,13 @@ func GetNewArticle(typ int, pageSize int) (list []map[string]interface{}) {
 	if l, ok := redis.Get("other", rediskey).([]interface{}); ok && l != nil && len(l) > 0 {
 		list = util.ObjArrToMapArr(l)
 	} else {
-		_, _, lists := bidsearch.GetPcBidSearchData("", "", "", "", subtype, "", "", "", "", "", "", "", "", 1, false, nil, bidSearch_field_1, "", false, false, "", pageSize, "")
+		var (
+			now         = time.Now()
+			startTime   = fmt.Sprint(time.Date(now.Year(), now.Month(), now.Day()-7, now.Hour(), now.Minute(), now.Second(), 0, time.Local).Unix()) //最近7天
+			endTime     = fmt.Sprint(now.Unix())
+			publishTime = fmt.Sprintf("%s_%s", startTime, endTime)
+		)
+		_, _, lists := bidsearch.GetPcBidSearchData("", "", "", publishTime, subtype, "", "", "", "", "", "", "", "", 1, false, nil, bidSearch_field_1, "", false, false, "", pageSize, "")
 		if lists != nil && len(*lists) > 5 {
 			*lists = (*lists)[0:6]
 			for _, v := range *lists {
@@ -624,8 +630,14 @@ func (f *PcIndex) SearchResult(at, name string) error {
 				query := getLastNewsQuery(area, "", stype, industry, city)
 				datas = elastic.GetPage(INDEX, TYPE, query, bidSearch_sort, `"_id","title","publishtime","toptype","subtype","type","area","href","bidopentime","winner","buyer","bidamount","budget","s_subscopeclass","projectname"`, startPage, limitcount)
 			} else {
+				var (
+					now         = time.Now()
+					startTime   = fmt.Sprint(time.Date(now.Year(), now.Month(), now.Day()-7, now.Hour(), now.Minute(), now.Second(), 0, time.Local).Unix()) //最近7天
+					endTime     = fmt.Sprint(now.Unix())
+					publishTime = fmt.Sprintf("%s_%s", startTime, endTime)
+				)
 				//关键词  如果规定时间内未取到数据 则按照老规则取数据   //规则开发一半被砍 暂时注释
-				_, _, datas = bidsearch.GetPcBidSearchData(keywords, "", "", "", stype, key_industry, "", "", "", "", "", "", "", 0, true, nil, bidSearch_field_1, "", false, false, "", 300, "")
+				_, _, datas = bidsearch.GetPcBidSearchData(keywords, "", "", publishTime, stype, key_industry, "", "", "", "", "", "", "", 0, true, nil, bidSearch_field_1, "", false, false, "", 300, "")
 				if datas != nil && len(*datas) > limitcount {
 					*datas = (*datas)[0:limitcount]
 				}

src/jfw/front/supsearch.go

@@ -159,6 +159,15 @@ func (p *Pcsearch) ProposedProject() error {
 	var list *[]map[string]interface{}
 	var status = 1
 	var count int64
+	if publishtime == "" {
+		var (
+			now       = time.Now()
+			startTime = fmt.Sprint(time.Date(now.Year(), now.Month()-6, now.Day(), now.Hour(), now.Minute(), now.Second(), 0, time.Local).Unix()) //最近7天
+			endTime   = fmt.Sprint(now.Unix())
+		)
+		publishtime = fmt.Sprintf("%s_%s", startTime, endTime)
+	}
+
 	if len(s_word) > 0 {
 		status = 2
 		count, totalPage, list = bidsearch.GetPcBidSearchData(s_word, area, "", publishtime, subtype, "", "", "", "", "", "", "", "", 0, true, nil, bidSearch_field_1, "", false, false, "", pageSize, userId)

src/jfw/front/tags.go

@@ -464,7 +464,13 @@ func (this *Tags) GetNewBidInfo() (list []map[string]interface{}) {
 		list = qu.ObjArrToMapArr(l)
 	} else {
 		// p397 未登录详情页最新招投标信息去掉拟建
-		_, _, lists := bidsearch.GetPcBidSearchData("", "", "", "", "招标预告,招标公告,招标结果,招标信用信息", "", "", "", "", "", "", "", "", 1, false, nil, bidSearch_field_1, "", false, false, "", 50, "")
+		var (
+			now         = time.Now()
+			startTime   = fmt.Sprint(time.Date(now.Year(), now.Month(), now.Day()-7, now.Hour(), now.Minute(), now.Second(), 0, time.Local).Unix()) //最近7天
+			endTime     = fmt.Sprint(now.Unix())
+			publishTime = fmt.Sprintf("%s_%s", startTime, endTime)
+		)
+		_, _, lists := bidsearch.GetPcBidSearchData("", "", "", publishTime, "招标预告,招标公告,招标结果,招标信用信息", "", "", "", "", "", "", "", "", 1, false, nil, bidSearch_field_1, "", false, false, "", 50, "")
 		if lists != nil && len(*lists) > 10 {
 			*lists = (*lists)[0:10]
 			for _, v := range *lists {

src/jfw/modules/app/src/app/front/swordfish.go

@@ -304,6 +304,9 @@ func (m *Front) WxsearchlistPaging() {
 			hasBuyerTel, hasWinnerTel = m.GetString("buyertel"), m.GetString("winnertel")
 			notkey = m.GetString("notkey")
 			city = m.GetString("city")
+			if publishtime == "" {
+				publishtime = "fiveyear"
+			}
 		}
 		//校验是否有大会员中标企业查询权限
 		bigBaseMsg := jy.GetBigVipUserBaseMsg(m.Session(), *config.Middleground)