feat:p718 bxcore

jyBXCore/api/bxcore.api

@@ -13,6 +13,7 @@ type (
 		UserType        string   `path:"userType,optional"`
 		AppId           string   `header:"appId"`
 		UserId          string   `header:"userId,optional"`
+		UserName        string   `header:"userName,optional"`
 		Phone           string   `header:"phone,optional"`
 		NewUserId       string   `header:"newUserId,optional"`
 		EntId           int64    `header:"entId,optional"`

jyBXCore/api/internal/logic/searchListLogic.go

@@ -94,6 +94,7 @@ func (l *SearchListLogic) SearchList(req *types.SearchReq) (resp *types.CommonRe
 		Scale:           req.Scale,
 		MobileTag:       req.MobileTag,
 		UserAgent:       l.r.UserAgent(),
+		UserName:        req.UserName,
 	})
 
 	log.Println("请求接口耗时：", time.Since(t).Seconds())
@@ -167,6 +168,7 @@ func (l *SearchListLogic) SearchList(req *types.SearchReq) (resp *types.CommonRe
 		"additionalWords":    req.AdditionalWords,
 		"exclusionWords":     req.ExclusionWords,
 		"search_publishtime": req.PublishTime,
+		"userName":           req.UserName,
 	}
 	go IC.SearchLog.SendLogs(data)
 	return &types.CommonResp{

jyBXCore/api/internal/types/types.go

@@ -8,6 +8,7 @@ type SearchReq struct {
 	UserType        string   `path:"userType,optional"`
 	AppId           string   `header:"appId"`
 	UserId          string   `header:"userId,optional"`
+	UserName        string   `header:"userName,optional"`
 	Phone           string   `header:"phone,optional"`
 	NewUserId       string   `header:"newUserId,optional"`
 	EntId           int64    `header:"entId,optional"`

jyBXCore/rpc/bxcore.proto

@@ -56,6 +56,7 @@ message SearchReq {
   int64 entAccountId = 50; //企业账户id
   string userAgent = 51;//请求头信息
   bool  isFuzzyNumber = 52;//是否需模糊查询
+  string  userName = 53;// 用户名称 sessionid中的userName
 
 }
 
@@ -120,8 +121,8 @@ message  SearchList {
 }
 //物业专版 BI
 message BI {
-  string tagSubInformation =1;
-  repeated string tagTopInformation =2;
+  string tagSubInformation = 1;
+  repeated string tagTopInformation = 2;
   string propertyForm = 3;
 }
 //
@@ -666,8 +667,8 @@ message PurchaseReq {
   string deliveryCity = 20;//交付地点-城市
   string deliveryDistrict = 21;//交付地点-县区
   string projectArea = 22;     //项目地区-省份
-  string projectCity  = 23;    //项目地区-城市
-  string projectDistrict  = 24; //项目地区-县区
+  string projectCity = 23;    //项目地区-城市
+  string projectDistrict = 24; //项目地区-县区
   string industry = 25;//行业
   int64 fileExists = 26;//是否有附件
   int64 publisher = 27;//发布者：可选：全部、用户发布：1、平台发布:2。
@@ -731,12 +732,12 @@ message  PurchaseList {
 }
 message OperatorSearchCriteriaReq{
   int64 entId = 1;
-  int64 tag=2;
-  int64 positionId=3;
+  int64 tag = 2;
+  int64 positionId = 3;
 }
 message OperatorSearchReq{
   int64  entId = 1;//企业id 没有企业 企业id=0
-  int64  pageNum =2;//当前页码
+  int64  pageNum = 2;//当前页码
   int64  pageSize = 3;//每页数量
   string  province = 4;//省份
   string  topType = 6;//信息类型-二级
@@ -747,17 +748,17 @@ message OperatorSearchReq{
   int64 searchMode = 12;//搜索模式：0：精准搜索；1：模糊搜索
   int64 wordsMode = 13;//搜索关键词模式；默认0：包含所有，1：包含任意
   string keyWords = 14;//关键词：多个空格隔开（主）
-  string  tagname=16;
-  string  tagname1=17;
-  string  tagname2=18;
-  int64   tag=19;
-  string openingTime=20;
-  string purchaseTime=21;
-  string winnerTag=7;
-  int64 positionId=15;
-  string  order =22;
+  string  tagname = 16;
+  string  tagname1 = 17;
+  string  tagname2 = 18;
+  int64   tag = 19;
+  string openingTime = 20;
+  string purchaseTime = 21;
+  string winnerTag = 7;
+  int64 positionId = 15;
+  string  order = 22;
   string  userId = 23;//用户id
-  string  businesstype=24;
+  string  businesstype = 24;
 }
 message  OperatorSearchResp{
   int64 error_code = 1;

jyBXCore/rpc/bxcore/bxcore.go

@@ -1,4 +1,4 @@
-// Code generated by goctl. DO NOT EDIT.
+// Code generated by goctl. DO NOT EDIT!
 // Source: bxcore.proto
 
 package bxcore
@@ -85,23 +85,23 @@ type (
 		GetSearchList(ctx context.Context, in *SearchReq, opts ...grpc.CallOption) (*SearchResp, error)
 		// 标讯搜索限制内容
 		SearchLimit(ctx context.Context, in *SearchLimitReq, opts ...grpc.CallOption) (*SearchLimitResp, error)
-		// 列表数据参标信息接口
+		//  列表数据参标信息接口
 		ParticipateShow(ctx context.Context, in *ParticipateShowReq, opts ...grpc.CallOption) (*ParticipateShowRes, error)
-		// 详情页参标信息接口
+		//  详情页参标信息接口
 		ParticipateInfo(ctx context.Context, in *ParticipateInfoReq, opts ...grpc.CallOption) (*ParticipateInfoRes, error)
-		// 投标状态更新
+		//   投标状态更新
 		UpdateBidStatus(ctx context.Context, in *UpdateBidStatusReq, opts ...grpc.CallOption) (*UpdateBidStatusRes, error)
-		// 获取投标状态信息
+		//  获取投标状态信息
 		ParticipateContent(ctx context.Context, in *ParticipateContentReq, opts ...grpc.CallOption) (*ParticipateContentRes, error)
-		// 参标操作记录
+		//  参标操作记录
 		ParticipateRecords(ctx context.Context, in *ParticipateRecordsReq, opts ...grpc.CallOption) (*ParticipateRecordsRes, error)
-		// 当前部门/企业下参标人员信息
+		//  当前部门/企业下参标人员信息
 		ParticipatePersons(ctx context.Context, in *ParticipatePersonsReq, opts ...grpc.CallOption) (*ParticipatePersonsRes, error)
-		// 参标设置信息
+		//  参标设置信息
 		ParticipateSetUpInfo(ctx context.Context, in *ParticipateSetUpInfoReq, opts ...grpc.CallOption) (*ParticipateSetUpInfoRes, error)
-		// 项目参标 终止参标 划转等动作
+		//  项目参标 终止参标 划转等动作
 		ParticipateAction(ctx context.Context, in *ParticipateActionReq, opts ...grpc.CallOption) (*ParticipateActionRes, error)
-		// 我的参标项目列表|企业参标项目列表
+		//  我的参标项目列表|企业参标项目列表
 		ParticipateList(ctx context.Context, in *ParticipateListReq, opts ...grpc.CallOption) (*ParticipateListRes, error)
 		// 推送参标统计
 		PushStatistics(ctx context.Context, in *StatisticsListReq, opts ...grpc.CallOption) (*PushStatisticsDataRes, error)
@@ -144,55 +144,55 @@ func (m *defaultBxCore) SearchLimit(ctx context.Context, in *SearchLimitReq, opt
 	return client.SearchLimit(ctx, in, opts...)
 }
 
-// 列表数据参标信息接口
+//  列表数据参标信息接口
 func (m *defaultBxCore) ParticipateShow(ctx context.Context, in *ParticipateShowReq, opts ...grpc.CallOption) (*ParticipateShowRes, error) {
 	client := bxcore.NewBxCoreClient(m.cli.Conn())
 	return client.ParticipateShow(ctx, in, opts...)
 }
 
-// 详情页参标信息接口
+//  详情页参标信息接口
 func (m *defaultBxCore) ParticipateInfo(ctx context.Context, in *ParticipateInfoReq, opts ...grpc.CallOption) (*ParticipateInfoRes, error) {
 	client := bxcore.NewBxCoreClient(m.cli.Conn())
 	return client.ParticipateInfo(ctx, in, opts...)
 }
 
-// 投标状态更新
+//   投标状态更新
 func (m *defaultBxCore) UpdateBidStatus(ctx context.Context, in *UpdateBidStatusReq, opts ...grpc.CallOption) (*UpdateBidStatusRes, error) {
 	client := bxcore.NewBxCoreClient(m.cli.Conn())
 	return client.UpdateBidStatus(ctx, in, opts...)
 }
 
-// 获取投标状态信息
+//  获取投标状态信息
 func (m *defaultBxCore) ParticipateContent(ctx context.Context, in *ParticipateContentReq, opts ...grpc.CallOption) (*ParticipateContentRes, error) {
 	client := bxcore.NewBxCoreClient(m.cli.Conn())
 	return client.ParticipateContent(ctx, in, opts...)
 }
 
-// 参标操作记录
+//  参标操作记录
 func (m *defaultBxCore) ParticipateRecords(ctx context.Context, in *ParticipateRecordsReq, opts ...grpc.CallOption) (*ParticipateRecordsRes, error) {
 	client := bxcore.NewBxCoreClient(m.cli.Conn())
 	return client.ParticipateRecords(ctx, in, opts...)
 }
 
-// 当前部门/企业下参标人员信息
+//  当前部门/企业下参标人员信息
 func (m *defaultBxCore) ParticipatePersons(ctx context.Context, in *ParticipatePersonsReq, opts ...grpc.CallOption) (*ParticipatePersonsRes, error) {
 	client := bxcore.NewBxCoreClient(m.cli.Conn())
 	return client.ParticipatePersons(ctx, in, opts...)
 }
 
-// 参标设置信息
+//  参标设置信息
 func (m *defaultBxCore) ParticipateSetUpInfo(ctx context.Context, in *ParticipateSetUpInfoReq, opts ...grpc.CallOption) (*ParticipateSetUpInfoRes, error) {
 	client := bxcore.NewBxCoreClient(m.cli.Conn())
 	return client.ParticipateSetUpInfo(ctx, in, opts...)
 }
 
-// 项目参标 终止参标 划转等动作
+//  项目参标 终止参标 划转等动作
 func (m *defaultBxCore) ParticipateAction(ctx context.Context, in *ParticipateActionReq, opts ...grpc.CallOption) (*ParticipateActionRes, error) {
 	client := bxcore.NewBxCoreClient(m.cli.Conn())
 	return client.ParticipateAction(ctx, in, opts...)
 }
 
-// 我的参标项目列表|企业参标项目列表
+//  我的参标项目列表|企业参标项目列表
 func (m *defaultBxCore) ParticipateList(ctx context.Context, in *ParticipateListReq, opts ...grpc.CallOption) (*ParticipateListRes, error) {
 	client := bxcore.NewBxCoreClient(m.cli.Conn())
 	return client.ParticipateList(ctx, in, opts...)

jyBXCore/rpc/internal/logic/getsearchlistlogic.go

@@ -37,7 +37,7 @@ const (
 	TaskActiveId             = 16
 	TaskActivityCacheKey     = "activity_day_task_%v_%v_%v"
 	TaskActivityCacheTimeout = 60 * 60 * 3
-	TaskIdSearch = 3
+	TaskIdSearch             = 3
 )
 
 // GetSearchList 标讯搜索结果列表数据
@@ -168,6 +168,7 @@ func (l *GetSearchListLogic) GetSearchList(in *bxcore.SearchReq) (*bxcore.Search
 					"positionId": in.PositionId,
 					"activeId":   TaskActiveId,
 					"taskInfoId": TaskIdSearch,
+					"nickName":   in.UserName,
 				})
 				if err != nil {
 					log.Println("nsq队列写入失败-->", err, "lottery_draw_task", TaskIdSearch, in.UserId)

jyBXCore/rpc/internal/server/bxcoreserver.go

@@ -1,4 +1,4 @@
-// Code generated by goctl. DO NOT EDIT.
+// Code generated by goctl. DO NOT EDIT!
 // Source: bxcore.proto
 
 package server
@@ -34,55 +34,55 @@ func (s *BxCoreServer) SearchLimit(ctx context.Context, in *bxcore.SearchLimitRe
 	return l.SearchLimit(in)
 }
 
-// 列表数据参标信息接口
+//  列表数据参标信息接口
 func (s *BxCoreServer) ParticipateShow(ctx context.Context, in *bxcore.ParticipateShowReq) (*bxcore.ParticipateShowRes, error) {
 	l := logic.NewParticipateShowLogic(ctx, s.svcCtx)
 	return l.ParticipateShow(in)
 }
 
-// 详情页参标信息接口
+//  详情页参标信息接口
 func (s *BxCoreServer) ParticipateInfo(ctx context.Context, in *bxcore.ParticipateInfoReq) (*bxcore.ParticipateInfoRes, error) {
 	l := logic.NewParticipateInfoLogic(ctx, s.svcCtx)
 	return l.ParticipateInfo(in)
 }
 
-// 投标状态更新
+//   投标状态更新
 func (s *BxCoreServer) UpdateBidStatus(ctx context.Context, in *bxcore.UpdateBidStatusReq) (*bxcore.UpdateBidStatusRes, error) {
 	l := logic.NewUpdateBidStatusLogic(ctx, s.svcCtx)
 	return l.UpdateBidStatus(in)
 }
 
-// 获取投标状态信息
+//  获取投标状态信息
 func (s *BxCoreServer) ParticipateContent(ctx context.Context, in *bxcore.ParticipateContentReq) (*bxcore.ParticipateContentRes, error) {
 	l := logic.NewParticipateContentLogic(ctx, s.svcCtx)
 	return l.ParticipateContent(in)
 }
 
-// 参标操作记录
+//  参标操作记录
 func (s *BxCoreServer) ParticipateRecords(ctx context.Context, in *bxcore.ParticipateRecordsReq) (*bxcore.ParticipateRecordsRes, error) {
 	l := logic.NewParticipateRecordsLogic(ctx, s.svcCtx)
 	return l.ParticipateRecords(in)
 }
 
-// 当前部门/企业下参标人员信息
+//  当前部门/企业下参标人员信息
 func (s *BxCoreServer) ParticipatePersons(ctx context.Context, in *bxcore.ParticipatePersonsReq) (*bxcore.ParticipatePersonsRes, error) {
 	l := logic.NewParticipatePersonsLogic(ctx, s.svcCtx)
 	return l.ParticipatePersons(in)
 }
 
-// 参标设置信息
+//  参标设置信息
 func (s *BxCoreServer) ParticipateSetUpInfo(ctx context.Context, in *bxcore.ParticipateSetUpInfoReq) (*bxcore.ParticipateSetUpInfoRes, error) {
 	l := logic.NewParticipateSetUpInfoLogic(ctx, s.svcCtx)
 	return l.ParticipateSetUpInfo(in)
 }
 
-// 项目参标 终止参标 划转等动作
+//  项目参标 终止参标 划转等动作
 func (s *BxCoreServer) ParticipateAction(ctx context.Context, in *bxcore.ParticipateActionReq) (*bxcore.ParticipateActionRes, error) {
 	l := logic.NewParticipateActionLogic(ctx, s.svcCtx)
 	return l.ParticipateAction(in)
 }
 
-// 我的参标项目列表|企业参标项目列表
+//  我的参标项目列表|企业参标项目列表
 func (s *BxCoreServer) ParticipateList(ctx context.Context, in *bxcore.ParticipateListReq) (*bxcore.ParticipateListRes, error) {
 	l := logic.NewParticipateListLogic(ctx, s.svcCtx)
 	return l.ParticipateList(in)

jyBXCore/rpc/type/bxcore/bxcore_grpc.pb.go

@@ -22,15 +22,15 @@ const _ = grpc.SupportPackageIsVersion7
 //
 // For semantics around ctx use and closing/ending streaming RPCs, please refer to https://pkg.go.dev/google.golang.org/grpc/?tab=doc#ClientConn.NewStream.
 type BxCoreClient interface {
-	// 标讯搜索结果列表数据
+	//标讯搜索结果列表数据
 	GetSearchList(ctx context.Context, in *SearchReq, opts ...grpc.CallOption) (*SearchResp, error)
-	// 标讯搜索限制内容
+	//标讯搜索限制内容
 	SearchLimit(ctx context.Context, in *SearchLimitReq, opts ...grpc.CallOption) (*SearchLimitResp, error)
 	// 列表数据参标信息接口
 	ParticipateShow(ctx context.Context, in *ParticipateShowReq, opts ...grpc.CallOption) (*ParticipateShowRes, error)
 	// 详情页参标信息接口
 	ParticipateInfo(ctx context.Context, in *ParticipateInfoReq, opts ...grpc.CallOption) (*ParticipateInfoRes, error)
-	// 投标状态更新
+	//  投标状态更新
 	UpdateBidStatus(ctx context.Context, in *UpdateBidStatusReq, opts ...grpc.CallOption) (*UpdateBidStatusRes, error)
 	// 获取投标状态信息
 	ParticipateContent(ctx context.Context, in *ParticipateContentReq, opts ...grpc.CallOption) (*ParticipateContentRes, error)
@@ -44,21 +44,21 @@ type BxCoreClient interface {
 	ParticipateAction(ctx context.Context, in *ParticipateActionReq, opts ...grpc.CallOption) (*ParticipateActionRes, error)
 	// 我的参标项目列表|企业参标项目列表
 	ParticipateList(ctx context.Context, in *ParticipateListReq, opts ...grpc.CallOption) (*ParticipateListRes, error)
-	// 推送参标统计
+	//推送参标统计
 	PushStatistics(ctx context.Context, in *StatisticsListReq, opts ...grpc.CallOption) (*PushStatisticsDataRes, error)
-	// 参标项目统计
+	//参标项目统计
 	ProjectStatistics(ctx context.Context, in *StatisticsListReq, opts ...grpc.CallOption) (*ProjectStatisticsDataRes, error)
-	// 聚合搜索
+	//聚合搜索
 	PolymerizeSearch(ctx context.Context, in *PolymerizeSearchReq, opts ...grpc.CallOption) (*PolymerizeSearchResp, error)
 	ProjectDetails(ctx context.Context, in *ProjectDetailsReq, opts ...grpc.CallOption) (*DetailDataRes, error)
 	PropertySearchCriteria(ctx context.Context, in *SearchReq, opts ...grpc.CallOption) (*SearchCriteriaRes, error)
-	// 热搜词
+	//热搜词
 	SearchHotKey(ctx context.Context, in *HotKeysReq, opts ...grpc.CallOption) (*HotKeysRes, error)
-	// 采购信息搜索
+	//采购信息搜索
 	PurchaseSearch(ctx context.Context, in *PurchaseReq, opts ...grpc.CallOption) (*PurchaseResp, error)
-	// 运营商搜索条件
+	//运营商搜索条件
 	OperatorSearchCriteria(ctx context.Context, in *OperatorSearchCriteriaReq, opts ...grpc.CallOption) (*OperatorSearchResp, error)
-	// 运营商搜索
+	//运营商搜索
 	OperatorSearch(ctx context.Context, in *OperatorSearchReq, opts ...grpc.CallOption) (*OperatorSearchResp, error)
 }
 
@@ -254,15 +254,15 @@ func (c *bxCoreClient) OperatorSearch(ctx context.Context, in *OperatorSearchReq
 // All implementations must embed UnimplementedBxCoreServer
 // for forward compatibility
 type BxCoreServer interface {
-	// 标讯搜索结果列表数据
+	//标讯搜索结果列表数据
 	GetSearchList(context.Context, *SearchReq) (*SearchResp, error)
-	// 标讯搜索限制内容
+	//标讯搜索限制内容
 	SearchLimit(context.Context, *SearchLimitReq) (*SearchLimitResp, error)
 	// 列表数据参标信息接口
 	ParticipateShow(context.Context, *ParticipateShowReq) (*ParticipateShowRes, error)
 	// 详情页参标信息接口
 	ParticipateInfo(context.Context, *ParticipateInfoReq) (*ParticipateInfoRes, error)
-	// 投标状态更新
+	//  投标状态更新
 	UpdateBidStatus(context.Context, *UpdateBidStatusReq) (*UpdateBidStatusRes, error)
 	// 获取投标状态信息
 	ParticipateContent(context.Context, *ParticipateContentReq) (*ParticipateContentRes, error)
@@ -276,21 +276,21 @@ type BxCoreServer interface {
 	ParticipateAction(context.Context, *ParticipateActionReq) (*ParticipateActionRes, error)
 	// 我的参标项目列表|企业参标项目列表
 	ParticipateList(context.Context, *ParticipateListReq) (*ParticipateListRes, error)
-	// 推送参标统计
+	//推送参标统计
 	PushStatistics(context.Context, *StatisticsListReq) (*PushStatisticsDataRes, error)
-	// 参标项目统计
+	//参标项目统计
 	ProjectStatistics(context.Context, *StatisticsListReq) (*ProjectStatisticsDataRes, error)
-	// 聚合搜索
+	//聚合搜索
 	PolymerizeSearch(context.Context, *PolymerizeSearchReq) (*PolymerizeSearchResp, error)
 	ProjectDetails(context.Context, *ProjectDetailsReq) (*DetailDataRes, error)
 	PropertySearchCriteria(context.Context, *SearchReq) (*SearchCriteriaRes, error)
-	// 热搜词
+	//热搜词
 	SearchHotKey(context.Context, *HotKeysReq) (*HotKeysRes, error)
-	// 采购信息搜索
+	//采购信息搜索
 	PurchaseSearch(context.Context, *PurchaseReq) (*PurchaseResp, error)
-	// 运营商搜索条件
+	//运营商搜索条件
 	OperatorSearchCriteria(context.Context, *OperatorSearchCriteriaReq) (*OperatorSearchResp, error)
-	// 运营商搜索
+	//运营商搜索
 	OperatorSearch(context.Context, *OperatorSearchReq) (*OperatorSearchResp, error)
 	mustEmbedUnimplementedBxCoreServer()
 }