Merge branch 'feature/v4.8.36' into dev/v4.8.36_rjj

src/jfw/front/classificationTag.go

@@ -1,28 +1,28 @@
 package front
 
 import (
-    qu "app.yhyue.com/moapp/jybase/common"
-    "app.yhyue.com/moapp/jybase/encrypt"
-    elastic "app.yhyue.com/moapp/jybase/es"
-    "app.yhyue.com/moapp/jybase/redis"
-    "app.yhyue.com/moapp/jypkg/common/src/qfw/util/bidsearch"
-    "app.yhyue.com/moapp/jypkg/public"
-    "encoding/json"
-    "fmt"
-    "jy/src/jfw/config"
-    "jy/src/jfw/jyutil"
-    "jy/src/jfw/paging"
-    "log"
-    "math"
-    "math/rand"
-    "strconv"
-    "sync"
-    "time"
+	qu "app.yhyue.com/moapp/jybase/common"
+	"app.yhyue.com/moapp/jybase/encrypt"
+	elastic "app.yhyue.com/moapp/jybase/es"
+	"app.yhyue.com/moapp/jybase/redis"
+	"app.yhyue.com/moapp/jypkg/common/src/qfw/util/bidsearch"
+	"app.yhyue.com/moapp/jypkg/public"
+	"encoding/json"
+	"fmt"
+	"jy/src/jfw/config"
+	"jy/src/jfw/jyutil"
+	"jy/src/jfw/paging"
+	"log"
+	"math"
+	"math/rand"
+	"strconv"
+	"sync"
+	"time"
 
-    "net/http"
+	"net/http"
 
-    "app.yhyue.com/moapp/jybase/date"
-    "app.yhyue.com/moapp/jybase/go-xweb/httpsession"
+	"app.yhyue.com/moapp/jybase/date"
+	"app.yhyue.com/moapp/jybase/go-xweb/httpsession"
 )
 
 type KeyType struct {
@@ -68,6 +68,22 @@ func HotSubjectMatter() []map[string]interface{} {
 	return subjectMatter
 }
 
+// 随机展示200中标企业
+func GetWinnerName() (data []map[string]interface{}) {
+	randGen := rand.New(rand.NewSource(time.Now().UnixNano()))
+	from := randGen.Intn(100)
+
+	//关联中标企业
+	r := elastic.Get("winner", "winner", fmt.Sprintf(`{"query": {"bool": {"must": []}},"_source": ["_id","name"],"from": %d,"size": 200}`, from))
+	if r != nil {
+		for _, v := range *r {
+			v["_id"] = encrypt.EncodeArticleId2ByCheck(qu.InterfaceToStr(v["_id"]))
+			data = append(data, v)
+		}
+	}
+	return
+}
+
 // ContentRecommendation 实用内容推荐
 func ContentRecommendation() []KeyType {
 	if bytes, err := redis.GetBytes(RedisNameNew, "contentRecommendation"); err == nil && bytes != nil {

src/jfw/front/pcIndex.go

@@ -291,7 +291,7 @@ func (f *PcIndex) SearchResult(at, name string) error {
 	if at == "stype" && name == "NJ" {
 		return f.Redirect("/jylab/supsearch/proposedProject.html")
 	}
-	userId := util.ObjToString(f.GetSession("userId"))
+	//userId := util.ObjToString(f.GetSession("userId"))
 	var no = 5
 	var area = ""
 	var stype = ""
@@ -382,8 +382,7 @@ func (f *PcIndex) SearchResult(at, name string) error {
 			}
 		}
 	}
-	if stype == "" && userId == "" {
-	}
+
 	f.T["seoarea"] = area
 	f.T["seostype"] = stype
 	f.T["seotitle"] = seotitle
@@ -417,11 +416,12 @@ func (f *PcIndex) SearchResult(at, name string) error {
 			query1 += `{"term":{"city":"` + city + `"}}`
 		}
 		query1 += `],"should": [],"minimum_should_match": 0}}}`
+		//p353包含采购意向与拟建
 		//获取到昨天数据
-		if stype == "" && userId == "" {
-			// stype = "招标预告,招标公告,招标结果,招标信用信息"
-			stype = "招标,询价,竞谈,变更,单一,竞价,邀标,成交,中标,废标,流标,结果变更,合同,验收,违规,预告,需求公示,预审,论证意见,预审结果"
-		}
+		//if stype == "" && userId == "" {
+		//	// stype = "招标预告,招标公告,招标结果,招标信用信息"
+		//	stype = "拟建,采购意向,招标,询价,竞谈,变更,单一,竞价,邀标,成交,中标,废标,流标,结果变更,合同,验收,违规,预告,需求公示,预审,论证意见,预审结果"
+		//}
 
 		var datas *[]map[string]interface{}
 		if list == nil || len(list.([]interface{})) == 0 {
@@ -503,7 +503,7 @@ func getstypeMap() []map[string][]map[string]interface{} {
 		}
 	}
 	m2 := []map[string][]map[string]interface{}{} //结构整理 返给前端
-	stype_1reg := []string{"招标公告", "招标结果", "招标信用信息", "招标预告"}
+	stype_1reg := []string{"招标公告", "招标结果", "招标信用信息", "招标预告", "拟建项目", "采购意向"}
 	hotlabstypSort := config.Seoconfig["hotlabstypSort"].([]interface{})
 	notice := util.ObjArrToStringArr(hotlabstypSort[0].([]interface{}))
 	result := util.ObjArrToStringArr(hotlabstypSort[1].([]interface{}))

src/jfw/front/shorturl.go

@@ -384,7 +384,7 @@ func (s *Short) LoginCommon(userId, stype, id string) error {
 			s.T["canRead"] = canRead
 		}
 		if len(obj) > 0 {
-			if canRead {
+			if canRead || (util.ObjToString(obj["subtype"]) == "拟建" || util.ObjToString(obj["subtype"]) == "采购意向") {
 				FieldProcessing(obj, ssOpenid, industry, id, from_userid, userId, stype, true)
 				//免费用户正文手机号替换
 				if obj["site"] == "剑鱼信息发布平台" && !isMember {
@@ -427,6 +427,11 @@ func (s *Short) LoginCommon(userId, stype, id string) error {
 						obj["entIds"] = winnerIdArr
 					}
 				}
+				if !canRead {
+					//打码显示引导
+					Filter(obj)
+					s.T["isGuide"] = true
+				}
 				s.T["advertcode"] = s.GetString("advertcode")
 			} else {
 				obj = map[string]interface{}{
@@ -511,7 +516,7 @@ func (s *Short) LoginCommon(userId, stype, id string) error {
 				}
 				s.T["canRead"] = canRead
 			}
-			if node {
+			if node || (util.ObjToString(obj["subtype"]) == "拟建" || util.ObjToString(obj["subtype"]) == "采购意向") {
 				if len(po) > 0 {
 					s.T["projectOther"] = po
 				}
@@ -574,6 +579,11 @@ func (s *Short) LoginCommon(userId, stype, id string) error {
 						obj["entIds"] = winnerIdArr
 					}
 				}
+				if !node {
+					//打码遮罩
+					Filter(obj)
+					s.T["isGuide"] = true
+				}
 			} else {
 				obj = map[string]interface{}{
 					"title":    obj["title"],

src/jfw/front/supsearch.go

@@ -101,7 +101,6 @@ func PCS_task() {
 			}
 		}
 	}
-
 }
 
 // 返回内存中列表也的数据,只获取首页，其他页面访问量暂时不多
@@ -344,14 +343,15 @@ func (p *Pcsearch) PcSearchIndex(module string) error {
 	//--end--
 	userId, _ := p.GetSession("userId").(string)
 	phone, _ := p.GetSession("phone").(string)
-	noLoginBl := false
-	if userId == "" {
-		//未登录用户访问全部信息类型 需要过滤掉 拟建和采购意向
-		if subtype == "" {
-			subtype = "招标预告,招标公告,招标结果,招标信用信息"
-			noLoginBl = true
-		}
-	}
+	//p353包含采购意向与拟建
+	//noLoginBl := false
+	//if userId == "" {
+	//	//未登录用户访问全部信息类型 需要过滤掉 拟建和采购意向
+	//	if subtype == "" {
+	//		subtype = "招标预告,招标公告,招标结果,招标信用信息"
+	//		noLoginBl = true
+	//	}
+	//}
 	//高级筛选 仅vip用户可查询
 	var (
 		hasBuyerTel, hasWinnerTel = "", "" //是否有采购单位电话、是否有中标单位电话 y:有 n:没有
@@ -468,9 +468,9 @@ func (p *Pcsearch) PcSearchIndex(module string) error {
 			list, count, total = so.GetBidSearchListByCache()
 		}
 	}
-	if noLoginBl {
-		subtype = ""
-	}
+	//if noLoginBl {
+	//	subtype = ""
+	//}
 	log.Println("userId:+++", userId)
 	if userId == "" {
 		for _, v := range list {

src/jfw/front/swordfish.go

@@ -142,12 +142,7 @@ func (m *Front) PcAjaxReq() {
 		notkey = m.GetString("notkey")
 		city = m.GetString("city")
 	}
-	if userId == "" {
-		//未登录用户访问全部信息类型 需要过滤掉 拟建和采购意向
-		if subtype == "" {
-			subtype = "招标预告,招标公告,招标结果,招标信用信息"
-		}
-	}
+
 	// p329  非反爬白名单用户不放开  需要处理通用词
 	onList, _ := jyutil.IsOnTheWhitelist(m.Session())
 	searchValueString := m.GetString("searchvalue")
@@ -187,7 +182,6 @@ func (m *Front) PcAjaxReq() {
 		list, count, total = so.GetBidSearchListByCache()
 
 	}
-	log.Println("userId:+++", userId)
 	if userId == "" {
 		for _, v := range list {
 			*v = SearchFilter(*v)

src/jfw/front/tags.go

@@ -430,7 +430,7 @@ func (this *Tags) GetNewBidInfo() (list []map[string]interface{}) {
 	if l, ok := redis.Get("other", rediskey).([]interface{}); ok && l != nil && len(l) > 0 {
 		list = qu.ObjArrToMapArr(l)
 	} else {
-		_, _, lists := bidsearch.GetPcBidSearchData("", "", "", "", "招标预告,招标公告,招标结果,招标信用信息", "", "", "", "", "", "", "", "", 1, false, nil, bidSearch_field_1, "", false, false, "", 50, "")
+		_, _, lists := bidsearch.GetPcBidSearchData("", "", "", "", "", "", "", "", "", "", "", "", "", 1, false, nil, bidSearch_field_1, "", false, false, "", 50, "")
 		if lists != nil && len(*lists) > 10 {
 			*lists = (*lists)[0:10]
 			for _, v := range *lists {
@@ -460,13 +460,21 @@ func (this *Tags) GetStype(href string) (list []map[string]interface{}) {
 		list = qu.ObjArrToMapArr(l)
 	} else {
 		m := []map[string]interface{}{}
-		data := public.BaseMysql.SelectBySql(`select id,name,pid from seo_words.seo_stype where name !="拟建项目" order by id`)
+		var data []map[string]interface{}
+		newData := public.BaseMysql.SelectBySql(`select id,name,pid from seo_words.seo_stype where name == "拟建项目" and name == "采购意向 "order by id`)
+		if newData != nil && len(*newData) > 0 {
+			data = append(data, *newData...)
+		}
+		oldData := public.BaseMysql.SelectBySql(`select id,name,pid from seo_words.seo_stype where name != "拟建项目" and name != "采购意向 "order by id`)
+		if oldData != nil && len(*oldData) > 0 {
+			data = append(data, *oldData...)
+		}
 		codeMap := map[int64][]int64{}
 		level1 := []int64{}
 		nameToCode := map[string]int64{}
 		codeToName := map[int64]string{}
-		if data != nil && len(*data) > 0 {
-			for _, v := range *data {
+		if len(data) > 0 {
+			for _, v := range data {
 				name := qu.ObjToString(v["name"])
 				pid := qu.Int64All(v["pid"])
 				id := qu.Int64All(v["id"])
@@ -713,9 +721,10 @@ func (this *Tags) GetInsturyKeywords(idstr string) (name, class_1, class_2 strin
 }
 
 // 获取信息类型 【全部是虚假的全部、实则是不包含拟建和采购意向的全部】
+// p353包含采购意向与拟建
 func (this *Tags) GetInfoType(idstr string) (string, string) {
 	if idstr == "all" {
-		return "招标,邀标,询价,竞谈,单一,竞价,变更,中标,成交,废标,流标,合同,验收,违规,预告,需求公示,预审,论证意见,预审结果", ""
+		return "拟建,采购意向,招标,邀标,询价,竞谈,单一,竞价,变更,中标,成交,废标,流标,合同,验收,违规,预告,需求公示,预审,论证意见,预审结果", ""
 	}
 	id, _ := strconv.Atoi(idstr)
 	data := public.BaseMysql.SelectBySql(`select id,name from seo_words.seo_stype where id =?`, id)

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

@@ -191,7 +191,7 @@ func (s *Short) Article(stype, id string) error {
 			canRead = true
 			s.T["canRead"] = canRead
 		}
-		if canRead {
+		if canRead || (util.ObjToString(obj["subtype"]) == "拟建" || util.ObjToString(obj["subtype"]) == "采购意向") {
 			if belongUserId != "" && belongUserId != userId && util.ObjToString(obj["subtype"]) != "拟建" && userId != "" { //分享开打的
 				article_id := encrypt.CommonDecodeArticle(stype, id)[0]
 				key := fmt.Sprintf("integral_article_%s_%s_%s", article_id, belongUserId, userId)
@@ -272,6 +272,10 @@ func (s *Short) Article(stype, id string) error {
 				obj = Filter(obj)
 				obj["description"] = fmt.Sprintf("%s，%s。", obj["title"], baseInfo(obj))
 			}
+			if !canRead { //登录用户 采购&拟建 无权用户 打码 展示引导
+				obj = Filter(obj)
+				s.T["isGuide"] = true
+			}
 			if obj["l_publishtime"] != nil {
 				obj["publishtimeShorDate"] = time.Unix(util.Int64All(obj["l_publishtime"]), 0).Format(date.Date_Short_Layout)
 			}

src/jfw/modules/bigmember/src/entity/portrait.go

@@ -1,12 +1,14 @@
 package entity
 
 import (
+	"app.yhyue.com/moapp/jybase/es"
 	"app.yhyue.com/moapp/jybase/go-xweb/httpsession"
 	"errors"
 	"fmt"
 	"jy/src/jfw/modules/bigmember/src/config"
 	"jy/src/jfw/modules/bigmember/src/db"
 	"log"
+	"math/rand"
 	"strings"
 	"time"
 
@@ -112,6 +114,26 @@ func CreatePortraitManagerForContacts(session *httpsession.Session, entType int6
 	return &Portrait{uid, session}, nil
 }
 
+func NoLoginAssociatedInfo(city string) []map[string]interface{} {
+	var (
+		winnerData []map[string]interface{}
+	)
+	randGen := rand.New(rand.NewSource(time.Now().UnixNano()))
+	from := randGen.Intn(100)
+
+	//关联中标企业
+	if city != "" {
+		r := es.Get("winner", "winner", fmt.Sprintf(`{"query": {"bool": {"must": [{"query_string": {"default_field": "city","query": "%s*"}}]}},"_source": ["_id","name"],"from": %d,"size": 30}`, city, from))
+		if r != nil {
+			winnerData = *r
+		}
+	}
+	for _, v := range winnerData {
+		v["_id"] = encrypt.EncodeArticleId2ByCheck(qutil.InterfaceToStr(v["_id"]))
+	}
+	return winnerData
+}
+
 // CreateSubVipPortraitManager 超级订阅权限校验
 // int -1无权限 1免费权限 2超级订阅次数&采购单位流量包 3使用体验
 func CreateSubVipPortraitManager(userid string, pageFlag, searchValue string, isWinner bool, session *httpsession.Session) (*Portrait, int, error, bool) {

src/jfw/modules/bigmember/src/service/portrait/memberPortraitAction.go

@@ -34,6 +34,7 @@ type EntPortrait struct {
 	buyerMiniPortrait xweb.Mapper `xweb:"/portrait/buyer/miniData"`        //三级页展示采购单位基础画像信息
 	portraitContacts  xweb.Mapper `xweb:"/portrait/contacts"`              // 画像通讯录接口
 
+	noLoginAssociatedInfo xweb.Mapper `xweb:"/portrait/winner/noLoginAssociatedInfo"` //未登录用户画像详情页、关联标讯动态&关联中标企业
 }
 
 // EntDetail 企业基本信息
@@ -501,6 +502,17 @@ func (this *EntPortrait) PortraitContacts() {
 	this.ServeJson(NewResult(rData, errMsg))
 }
 
+func (this *EntPortrait) NoLoginAssociatedInfo() {
+	rData := func() interface{} {
+		city := this.GetString("city")
+		// 未登录用户关联中标企业
+		data := entity.NoLoginAssociatedInfo(city)
+		return data
+
+	}()
+	this.ServeJson(NewResult(rData, nil))
+}
+
 // formatContact 格式化混淆联系人电话
 func formatContact(contactList []map[string]interface{}) (confusing []map[string]interface{}, total int) {
 	total = len(contactList)

src/seo.json

@@ -246,6 +246,12 @@
             "KEYWORDS": "拟建项目,拟在建项目,拟建项目网,拟建项目信息",
             "DESCRIPTION": "剑鱼标讯拟建项目专栏，包含国家发改委和各部委提供的尚处于前期立项、审批阶段的招投标项目，各供应商应在立项阶段就开始掌握最新的项目信息，做到早介入，早准备，稳拿单。"
         },
+      "CGYX": {
+        "NAME": "采购意向",
+        "TITLE": "",
+        "KEYWORDS": "",
+        "DESCRIPTION": ""
+      },
         "ZBYG": {
             "NAME": "招标预告",
             "TITLE": "全国招标预告信息",