Forráskód Böngészése

MatchUserDBWithoutMap

wfz 3 éve
szülő
commit
23783ba4af
5 módosított fájl, 252 hozzáadás és 102 törlés
  1. 188 101
      api/user/user.pb.go
  2. 11 0
      api/user/user.proto
  3. 38 0
      api/user/user_grpc.pb.go
  4. 1 1
      js/api/user/user_http_pb.ts
  5. 14 0
      js/api/user/user_pb.ts

A különbségek nem kerülnek megjelenítésre, a fájl túl nagy
+ 188 - 101
api/user/user.pb.go


+ 11 - 0
api/user/user.proto

@@ -703,6 +703,17 @@ service User {
   rpc UserGetInformationAwardByActivity (UserGetInformationAwardByActivityRequest) returns (UserGetInformationAwardByActivityReply){};
   // 获取userIDs对应的vip信息
   rpc FindUserVipDBList (common.PersonIDList) returns (FindUserVipListDBReply){};
+  // 匹配不存在map中并满足条件的用户
+  rpc MatchUserDBWithoutMap (MatchUserDBWithoutMapRequest) returns (common.PersonDB){};
+}
+
+message MatchUserDBWithoutMapRequest{
+  map <string,bool> isMatchingMap = 1;// 已经匹配过的map
+  string province = 2;// 省
+  string city = 3;// 市
+  int64 maxAge = 4;// 最大年龄
+  int64 minAge = 5;// 最小年龄
+  int64 sex = 6;// 性别
 }
 
 message GetUserLookHandPickNumReply{

+ 38 - 0
api/user/user_grpc.pb.go

@@ -252,6 +252,8 @@ type UserClient interface {
 	UserGetInformationAwardByActivity(ctx context.Context, in *UserGetInformationAwardByActivityRequest, opts ...grpc.CallOption) (*UserGetInformationAwardByActivityReply, error)
 	// 获取userIDs对应的vip信息
 	FindUserVipDBList(ctx context.Context, in *common.PersonIDList, opts ...grpc.CallOption) (*FindUserVipListDBReply, error)
+	// 匹配不存在map中并满足条件的用户
+	MatchUserDBWithoutMap(ctx context.Context, in *MatchUserDBWithoutMapRequest, opts ...grpc.CallOption) (*common.PersonDB, error)
 }
 
 type userClient struct {
@@ -1279,6 +1281,15 @@ func (c *userClient) FindUserVipDBList(ctx context.Context, in *common.PersonIDL
 	return out, nil
 }
 
+func (c *userClient) MatchUserDBWithoutMap(ctx context.Context, in *MatchUserDBWithoutMapRequest, opts ...grpc.CallOption) (*common.PersonDB, error) {
+	out := new(common.PersonDB)
+	err := c.cc.Invoke(ctx, "/api.user.User/MatchUserDBWithoutMap", in, out, opts...)
+	if err != nil {
+		return nil, err
+	}
+	return out, nil
+}
+
 // UserServer is the server API for User service.
 // All implementations must embed UnimplementedUserServer
 // for forward compatibility
@@ -1513,6 +1524,8 @@ type UserServer interface {
 	UserGetInformationAwardByActivity(context.Context, *UserGetInformationAwardByActivityRequest) (*UserGetInformationAwardByActivityReply, error)
 	// 获取userIDs对应的vip信息
 	FindUserVipDBList(context.Context, *common.PersonIDList) (*FindUserVipListDBReply, error)
+	// 匹配不存在map中并满足条件的用户
+	MatchUserDBWithoutMap(context.Context, *MatchUserDBWithoutMapRequest) (*common.PersonDB, error)
 	mustEmbedUnimplementedUserServer()
 }
 
@@ -1859,6 +1872,9 @@ func (UnimplementedUserServer) UserGetInformationAwardByActivity(context.Context
 func (UnimplementedUserServer) FindUserVipDBList(context.Context, *common.PersonIDList) (*FindUserVipListDBReply, error) {
 	return nil, status.Errorf(codes.Unimplemented, "method FindUserVipDBList not implemented")
 }
+func (UnimplementedUserServer) MatchUserDBWithoutMap(context.Context, *MatchUserDBWithoutMapRequest) (*common.PersonDB, error) {
+	return nil, status.Errorf(codes.Unimplemented, "method MatchUserDBWithoutMap not implemented")
+}
 func (UnimplementedUserServer) mustEmbedUnimplementedUserServer() {}
 
 // UnsafeUserServer may be embedded to opt out of forward compatibility for this service.
@@ -3906,6 +3922,24 @@ func _User_FindUserVipDBList_Handler(srv interface{}, ctx context.Context, dec f
 	return interceptor(ctx, in, info, handler)
 }
 
+func _User_MatchUserDBWithoutMap_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
+	in := new(MatchUserDBWithoutMapRequest)
+	if err := dec(in); err != nil {
+		return nil, err
+	}
+	if interceptor == nil {
+		return srv.(UserServer).MatchUserDBWithoutMap(ctx, in)
+	}
+	info := &grpc.UnaryServerInfo{
+		Server:     srv,
+		FullMethod: "/api.user.User/MatchUserDBWithoutMap",
+	}
+	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
+		return srv.(UserServer).MatchUserDBWithoutMap(ctx, req.(*MatchUserDBWithoutMapRequest))
+	}
+	return interceptor(ctx, in, info, handler)
+}
+
 // User_ServiceDesc is the grpc.ServiceDesc for User service.
 // It's only intended for direct use with grpc.RegisterService,
 // and not to be introspected or modified (even as a copy)
@@ -4365,6 +4399,10 @@ var User_ServiceDesc = grpc.ServiceDesc{
 			MethodName: "FindUserVipDBList",
 			Handler:    _User_FindUserVipDBList_Handler,
 		},
+		{
+			MethodName: "MatchUserDBWithoutMap",
+			Handler:    _User_MatchUserDBWithoutMap_Handler,
+		},
 	},
 	Streams:  []grpc.StreamDesc{},
 	Metadata: "user.proto",

+ 1 - 1
js/api/user/user_http_pb.ts

@@ -1,6 +1,6 @@
 // @ts-ignore
 import request from '@/libs/request';
-import {UserInfo,UserBalance,UserFindChatListReply,CreateScripRequest,DeleteScripRequest,UserFindScripRequest,PersonLookScripRequest,ReplyScripRequest,KeyRequest,InformationStatus,UserRechargeRequest,PayInfo,RechargeList,VipRechargeList,FindPayOrderListRequest,PayOrderList,FindMatchingAvatarAndNumReply,UserFreeNum,SendMessageRequest,VipInfo,GetUserLookHandPickNumReply,ManagerFindIsCheckQualityUserListRequest,ManagerMarkHighQualityUserRequest,ManagerReMarkHighQualityUserRequest,ManagerUpdateUserCreditRequest,FindRecommendHighQualityUserRequest,FindRecommendHighQualityUserReply,GetUserDBMsgFromWebsocketReply,SendMsgReduceCreditRequest,SendNewMessageUnreadReminderRequest,UpdateUserMatchedNumRequest,UpdateUserMatchedNumAndReturnUserMsgReply,GetRecommendUserDBRequest,ReportUserBlackRequest,AddUserCreditRequest,UserGetInformationAwardByActivityRequest,UserGetInformationAwardByActivityReply,FindUserVipListDBReply} from "./user_pb";
+import {UserInfo,UserBalance,UserFindChatListReply,CreateScripRequest,DeleteScripRequest,UserFindScripRequest,PersonLookScripRequest,ReplyScripRequest,KeyRequest,InformationStatus,UserRechargeRequest,PayInfo,RechargeList,VipRechargeList,FindPayOrderListRequest,PayOrderList,FindMatchingAvatarAndNumReply,UserFreeNum,SendMessageRequest,VipInfo,GetUserLookHandPickNumReply,ManagerFindIsCheckQualityUserListRequest,ManagerMarkHighQualityUserRequest,ManagerReMarkHighQualityUserRequest,ManagerUpdateUserCreditRequest,FindRecommendHighQualityUserRequest,FindRecommendHighQualityUserReply,GetUserDBMsgFromWebsocketReply,SendMsgReduceCreditRequest,SendNewMessageUnreadReminderRequest,UpdateUserMatchedNumRequest,UpdateUserMatchedNumAndReturnUserMsgReply,GetRecommendUserDBRequest,ReportUserBlackRequest,AddUserCreditRequest,UserGetInformationAwardByActivityRequest,UserGetInformationAwardByActivityReply,FindUserVipListDBReply,MatchUserDBWithoutMapRequest} from "./user_pb";
 import {SendPhoneCodeRequest,CheckPhoneCodeRequest,UpdateInformationRequest,CreateChatRoomParam,PersonParam,HomeInfo,LookedAndLikedNum,ListPageRequest,WxConfReq,WxConfResponse,SexReq,TagListReply,ListPage2Request,RecommendPersonListReply,FindChatRecordListRequest,ChatRecordListReply,FindChatRoomMsgRequest,ChatRoomMsg,IsLike,MemeRequest,MemeList,FindChatTopicRequest,ChatTopicList,RandomNum,CommonTextList,RandomNumAndSex,MemeTitleList,ChatCardInfo,ReportChatRequest,FindOverSevenDayAvatarReply,UpdateLastScripIDRequest,ScripID,ScripReply,FindScripRequest,ScripInfo,ChatRecordInfo,RoomIDRequest,PartnerIDParam,AddFriendMessageInfo,SendMessageReply,HandpickPersonListReply,PersonIDParam,ManagerFindPersonListRequest,ManagerFindPersonListReply,ManagerFindPersonListReply2,ManagerFindCanHandpickUserListRequest,ManagerFindCanHandpickUserListReply,ManagerSetHandpickUserRequest,ManagerSetHandpickUserOneRequest,PersonIDList,ManagerUpdatePersonVoiceRequest,ManagerUpdatePersonPicturesRequest,ManagerUpdatePersonSignatureRequest,ManagerUpdatePersonAvatarRequest,ManagerUpdatePersonNameRequest,ManagerUpdatePersonWeightRequest,ManagerUpdatePersonIsBlackRequest,PersonMsg,PersonDBReply,UpdateLastScripIDDBRequest,FindRecommendRequest,IDParam,PersonDB} from "../common/common_pb";
 import {RoomReply,UnreadNumReply,UserRoomInfo,CheckUserPartnerIsRelationshipReply,WindowInfo,GetRandomMatchingReply} from "../chat/chat_pb";
 import {LookAndLikeListReply,LookAndLikeMessageReply,LookMessageReply} from "../statistics/statistics_pb";

+ 14 - 0
js/api/user/user_pb.ts

@@ -1,5 +1,19 @@
 import {Message} from "../common/common_pb";
 
+export interface MatchUserDBWithoutMapRequest{
+    /**  已经匹配过的map */
+    isMatchingMap?:any;
+    /**  省 */
+    province?:string;
+    /**  市 */
+    city?:string;
+    /**  最大年龄 */
+    maxAge?:number;
+    /**  最小年龄 */
+    minAge?:number;
+    /**  性别 */
+    sex?:number;
+}
 export interface GetUserLookHandPickNumReply{
     num?:number;
     userIdList?:Array<string>;

Nem az összes módosított fájl került megjelenítésre, mert túl sok fájl változott