FindOnlineCanMatchingPerson

api/manager/manager.proto

@@ -245,7 +245,7 @@ service Manager {
     };
   };
   // 查询在线人数
-  rpc FindOnlinePerson (FindOnlinePersonRequest) returns (websocket.FindOnlinePersonReply){
+  rpc FindOnlinePerson (FindOnlinePersonRequest) returns (FindOnlinePersonReply){
     option (google.api.http) = {
       post: "/api/manager/online/details/list",
       body:"*"
@@ -259,7 +259,7 @@ service Manager {
     };
   };
   // 查询在线可匹配人数
-  rpc FindOnlineCanMatchingPerson (google.protobuf.Empty) returns (websocket.FindOnlineCanMatchingPersonReply){
+  rpc FindOnlineCanMatchingPerson (google.protobuf.Empty) returns (FindOnlineCanMatchingPersonReply){
     option (google.api.http) = {
       post: "/api/manager/user/matching/list",
       body:"*"
@@ -275,6 +275,34 @@ service Manager {
 
 }
 
+message FindOnlineCanMatchingPersonReply{
+  repeated FindOnlineCanMatchingPersonInfo list = 1;
+}
+
+message FindOnlineCanMatchingPersonInfo{
+  int64 todayMatchedNum = 1;// 今日被匹配数
+  string personId = 2;
+  int64 weight = 3;// 权重
+  string workingStatus = 4;// 工作状态
+  int64 sex = 5;// 性别
+  int64 age = 6;// 年龄
+  string province = 7;// 省
+  string city = 8;// 市
+  string lastLoginTime = 9;
+}
+
+message FindOnlinePersonReply{
+  repeated OnlinePersonInfo list = 1;
+}
+
+message OnlinePersonInfo{
+  string personId = 2;
+  int64 weight = 3;// 权重
+  string workingStatus = 4;// 工作状态
+  int64 sex = 5;// 性别
+  string lastLoginTime = 6;
+}
+
 message ManagerAddBlackPictureRequest{
   string pictureUrl = 1;
 }

api/manager/manager_grpc.pb.go

@@ -5,7 +5,6 @@ package manager
 import (
 	context "context"
 	common "git.ikuban.com/server/pw-protobuf/api/common"
-	websocket "git.ikuban.com/server/pw-protobuf/api/websocket"
 	grpc "google.golang.org/grpc"
 	codes "google.golang.org/grpc/codes"
 	status "google.golang.org/grpc/status"
@@ -88,11 +87,11 @@ type ManagerClient interface {
 	// 管理员查询某个举报者的举报详情列表
 	ManagerFindReportDetailsList(ctx context.Context, in *common.ManagerFindReportDetailsListRequest, opts ...grpc.CallOption) (*common.ManagerFindReportDetailsListReply, error)
 	// 查询在线人数
-	FindOnlinePerson(ctx context.Context, in *FindOnlinePersonRequest, opts ...grpc.CallOption) (*websocket.FindOnlinePersonReply, error)
+	FindOnlinePerson(ctx context.Context, in *FindOnlinePersonRequest, opts ...grpc.CallOption) (*FindOnlinePersonReply, error)
 	// 管理员注销用户
 	ManagerUserUnsubscribe(ctx context.Context, in *ManagerUserUnsubscribeRequest, opts ...grpc.CallOption) (*emptypb.Empty, error)
 	// 查询在线可匹配人数
-	FindOnlineCanMatchingPerson(ctx context.Context, in *emptypb.Empty, opts ...grpc.CallOption) (*websocket.FindOnlineCanMatchingPersonReply, error)
+	FindOnlineCanMatchingPerson(ctx context.Context, in *emptypb.Empty, opts ...grpc.CallOption) (*FindOnlineCanMatchingPersonReply, error)
 	// 管理员增加黑名单图片
 	ManagerAddBlackPicture(ctx context.Context, in *ManagerAddBlackPictureRequest, opts ...grpc.CallOption) (*emptypb.Empty, error)
 }
@@ -402,8 +401,8 @@ func (c *managerClient) ManagerFindReportDetailsList(ctx context.Context, in *co
 	return out, nil
 }
 
-func (c *managerClient) FindOnlinePerson(ctx context.Context, in *FindOnlinePersonRequest, opts ...grpc.CallOption) (*websocket.FindOnlinePersonReply, error) {
-	out := new(websocket.FindOnlinePersonReply)
+func (c *managerClient) FindOnlinePerson(ctx context.Context, in *FindOnlinePersonRequest, opts ...grpc.CallOption) (*FindOnlinePersonReply, error) {
+	out := new(FindOnlinePersonReply)
 	err := c.cc.Invoke(ctx, "/api.manager.Manager/FindOnlinePerson", in, out, opts...)
 	if err != nil {
 		return nil, err
@@ -420,8 +419,8 @@ func (c *managerClient) ManagerUserUnsubscribe(ctx context.Context, in *ManagerU
 	return out, nil
 }
 
-func (c *managerClient) FindOnlineCanMatchingPerson(ctx context.Context, in *emptypb.Empty, opts ...grpc.CallOption) (*websocket.FindOnlineCanMatchingPersonReply, error) {
-	out := new(websocket.FindOnlineCanMatchingPersonReply)
+func (c *managerClient) FindOnlineCanMatchingPerson(ctx context.Context, in *emptypb.Empty, opts ...grpc.CallOption) (*FindOnlineCanMatchingPersonReply, error) {
+	out := new(FindOnlineCanMatchingPersonReply)
 	err := c.cc.Invoke(ctx, "/api.manager.Manager/FindOnlineCanMatchingPerson", in, out, opts...)
 	if err != nil {
 		return nil, err
@@ -509,11 +508,11 @@ type ManagerServer interface {
 	// 管理员查询某个举报者的举报详情列表
 	ManagerFindReportDetailsList(context.Context, *common.ManagerFindReportDetailsListRequest) (*common.ManagerFindReportDetailsListReply, error)
 	// 查询在线人数
-	FindOnlinePerson(context.Context, *FindOnlinePersonRequest) (*websocket.FindOnlinePersonReply, error)
+	FindOnlinePerson(context.Context, *FindOnlinePersonRequest) (*FindOnlinePersonReply, error)
 	// 管理员注销用户
 	ManagerUserUnsubscribe(context.Context, *ManagerUserUnsubscribeRequest) (*emptypb.Empty, error)
 	// 查询在线可匹配人数
-	FindOnlineCanMatchingPerson(context.Context, *emptypb.Empty) (*websocket.FindOnlineCanMatchingPersonReply, error)
+	FindOnlineCanMatchingPerson(context.Context, *emptypb.Empty) (*FindOnlineCanMatchingPersonReply, error)
 	// 管理员增加黑名单图片
 	ManagerAddBlackPicture(context.Context, *ManagerAddBlackPictureRequest) (*emptypb.Empty, error)
 	mustEmbedUnimplementedManagerServer()
@@ -622,13 +621,13 @@ func (UnimplementedManagerServer) ManagerFindReportList(context.Context, *common
 func (UnimplementedManagerServer) ManagerFindReportDetailsList(context.Context, *common.ManagerFindReportDetailsListRequest) (*common.ManagerFindReportDetailsListReply, error) {
 	return nil, status.Errorf(codes.Unimplemented, "method ManagerFindReportDetailsList not implemented")
 }
-func (UnimplementedManagerServer) FindOnlinePerson(context.Context, *FindOnlinePersonRequest) (*websocket.FindOnlinePersonReply, error) {
+func (UnimplementedManagerServer) FindOnlinePerson(context.Context, *FindOnlinePersonRequest) (*FindOnlinePersonReply, error) {
 	return nil, status.Errorf(codes.Unimplemented, "method FindOnlinePerson not implemented")
 }
 func (UnimplementedManagerServer) ManagerUserUnsubscribe(context.Context, *ManagerUserUnsubscribeRequest) (*emptypb.Empty, error) {
 	return nil, status.Errorf(codes.Unimplemented, "method ManagerUserUnsubscribe not implemented")
 }
-func (UnimplementedManagerServer) FindOnlineCanMatchingPerson(context.Context, *emptypb.Empty) (*websocket.FindOnlineCanMatchingPersonReply, error) {
+func (UnimplementedManagerServer) FindOnlineCanMatchingPerson(context.Context, *emptypb.Empty) (*FindOnlineCanMatchingPersonReply, error) {
 	return nil, status.Errorf(codes.Unimplemented, "method FindOnlineCanMatchingPerson not implemented")
 }
 func (UnimplementedManagerServer) ManagerAddBlackPicture(context.Context, *ManagerAddBlackPictureRequest) (*emptypb.Empty, error) {

api/manager/manager_http.pb.go

@@ -9,7 +9,6 @@ import (
 	base "git.ikuban.com/server/base-protobuf/kuban/api/base"
 	reply "git.ikuban.com/server/kratos-utils/http/reply"
 	common "git.ikuban.com/server/pw-protobuf/api/common"
-	websocket "git.ikuban.com/server/pw-protobuf/api/websocket"
 	http "github.com/go-kratos/kratos/v2/transport/http"
 	binding "github.com/go-kratos/kratos/v2/transport/http/binding"
 	emptypb "google.golang.org/protobuf/types/known/emptypb"
@@ -29,8 +28,8 @@ var _ = new(base.Html)
 const _ = http.SupportPackageIsVersion1
 
 type ManagerHTTPServer interface {
-	FindOnlineCanMatchingPerson(context.Context, *emptypb.Empty) (*websocket.FindOnlineCanMatchingPersonReply, error)
-	FindOnlinePerson(context.Context, *FindOnlinePersonRequest) (*websocket.FindOnlinePersonReply, error)
+	FindOnlineCanMatchingPerson(context.Context, *emptypb.Empty) (*FindOnlineCanMatchingPersonReply, error)
+	FindOnlinePerson(context.Context, *FindOnlinePersonRequest) (*FindOnlinePersonReply, error)
 	ManagerAddBlackPicture(context.Context, *ManagerAddBlackPictureRequest) (*emptypb.Empty, error)
 	ManagerDeleteHighQualityUser(context.Context, *common.PersonIDParam) (*emptypb.Empty, error)
 	ManagerDeleteScrip(context.Context, *common.IDParam) (*emptypb.Empty, error)
@@ -1109,8 +1108,8 @@ func _Manager_ManagerAddBlackPicture0_HTTP_Handler(srv ManagerHTTPServer) func(c
 }
 
 type ManagerHTTPClient interface {
-	FindOnlineCanMatchingPerson(ctx context.Context, req *emptypb.Empty, opts ...http.CallOption) (rsp *websocket.FindOnlineCanMatchingPersonReply, err error)
-	FindOnlinePerson(ctx context.Context, req *FindOnlinePersonRequest, opts ...http.CallOption) (rsp *websocket.FindOnlinePersonReply, err error)
+	FindOnlineCanMatchingPerson(ctx context.Context, req *emptypb.Empty, opts ...http.CallOption) (rsp *FindOnlineCanMatchingPersonReply, err error)
+	FindOnlinePerson(ctx context.Context, req *FindOnlinePersonRequest, opts ...http.CallOption) (rsp *FindOnlinePersonReply, err error)
 	ManagerAddBlackPicture(ctx context.Context, req *ManagerAddBlackPictureRequest, opts ...http.CallOption) (rsp *emptypb.Empty, err error)
 	ManagerDeleteHighQualityUser(ctx context.Context, req *common.PersonIDParam, opts ...http.CallOption) (rsp *emptypb.Empty, err error)
 	ManagerDeleteScrip(ctx context.Context, req *common.IDParam, opts ...http.CallOption) (rsp *emptypb.Empty, err error)
@@ -1156,8 +1155,8 @@ func NewManagerHTTPClient(client *http.Client) ManagerHTTPClient {
 	return &ManagerHTTPClientImpl{client}
 }
 
-func (c *ManagerHTTPClientImpl) FindOnlineCanMatchingPerson(ctx context.Context, in *emptypb.Empty, opts ...http.CallOption) (*websocket.FindOnlineCanMatchingPersonReply, error) {
-	var out websocket.FindOnlineCanMatchingPersonReply
+func (c *ManagerHTTPClientImpl) FindOnlineCanMatchingPerson(ctx context.Context, in *emptypb.Empty, opts ...http.CallOption) (*FindOnlineCanMatchingPersonReply, error) {
+	var out FindOnlineCanMatchingPersonReply
 	pattern := "/api/manager/user/matching/list"
 	path := binding.EncodeURL(pattern, in, false)
 	opts = append(opts, http.Operation("/api.manager.Manager/FindOnlineCanMatchingPerson"))
@@ -1169,8 +1168,8 @@ func (c *ManagerHTTPClientImpl) FindOnlineCanMatchingPerson(ctx context.Context,
 	return &out, err
 }
 
-func (c *ManagerHTTPClientImpl) FindOnlinePerson(ctx context.Context, in *FindOnlinePersonRequest, opts ...http.CallOption) (*websocket.FindOnlinePersonReply, error) {
-	var out websocket.FindOnlinePersonReply
+func (c *ManagerHTTPClientImpl) FindOnlinePerson(ctx context.Context, in *FindOnlinePersonRequest, opts ...http.CallOption) (*FindOnlinePersonReply, error) {
+	var out FindOnlinePersonReply
 	pattern := "/api/manager/online/details/list"
 	path := binding.EncodeURL(pattern, in, false)
 	opts = append(opts, http.Operation("/api.manager.Manager/FindOnlinePerson"))

js/api/manager/manager_http_pb.ts

@@ -1,8 +1,7 @@
 // @ts-ignore
 import request from '@/libs/request';
 import {ManagerFindPersonListRequest,ManagerFindPersonListReply,ManagerFindPersonListReply2,ManagerFindCanHandpickUserListRequest,ManagerFindCanHandpickUserListReply,ManagerSetHandpickUserRequest,ManagerSetHandpickUserOneRequest,PersonIDParam,PersonIDList,ManagerUpdatePersonVoiceRequest,ManagerUpdatePersonPicturesRequest,ManagerUpdatePersonSignatureRequest,ManagerUpdatePersonAvatarRequest,ManagerUpdatePersonNameRequest,ManagerUpdatePersonWeightRequest,ManagerUpdatePersonIsBlackRequest,ManagerLoginRequest,LoginToken,ManagerFindRoomListRequest,ManagerFindRoomListReply,ManagerFindChatRecordListRequest,ChatRecordListReply,ManagerFindScripListRequest,ManagerScripReply,ManagerFindScripListV2Request,ManagerScripV2Reply,ManagerUpdateScripTextRequest,ManagerUpdateScripPictureRequest,IDParam,Ids,ManagerFindReportListRequest,ManagerFindReportListReply,ManagerFindReportDetailsListRequest,ManagerFindReportDetailsListReply} from "../common/common_pb";
-import {ManagerFindIsCheckQualityUserListRequest,ManagerMarkHighQualityUserRequest,ManagerReMarkHighQualityUserRequest,ManagerUpdateUserSexRequest,ManagerUpdateUserCreditRequest,OnlinePersonReply,FindOnlinePersonRequest,ManagerUserUnsubscribeRequest,ManagerAddBlackPictureRequest} from "./manager_pb";
-import {FindOnlinePersonReply,FindOnlineCanMatchingPersonReply} from "../websocket/websocket_pb";
+import {ManagerFindIsCheckQualityUserListRequest,ManagerMarkHighQualityUserRequest,ManagerReMarkHighQualityUserRequest,ManagerUpdateUserSexRequest,ManagerUpdateUserCreditRequest,OnlinePersonReply,FindOnlinePersonRequest,FindOnlinePersonReply,ManagerUserUnsubscribeRequest,FindOnlineCanMatchingPersonReply,ManagerAddBlackPictureRequest} from "./manager_pb";
 
 const ManagerService = {
   /**  管理员查询用户列表 */

js/api/manager/manager_pb.ts

@@ -1,3 +1,37 @@
+export interface FindOnlineCanMatchingPersonReply{
+    list?:Array<FindOnlineCanMatchingPersonInfo>;
+}
+export interface FindOnlineCanMatchingPersonInfo{
+    /**  今日被匹配数 */
+    todayMatchedNum?:number;
+    personId?:string;
+    /**  权重 */
+    weight?:number;
+    /**  工作状态 */
+    workingStatus?:string;
+    /**  性别 */
+    sex?:number;
+    /**  年龄 */
+    age?:number;
+    /**  省 */
+    province?:string;
+    /**  市 */
+    city?:string;
+    lastLoginTime?:string;
+}
+export interface FindOnlinePersonReply{
+    list?:Array<OnlinePersonInfo>;
+}
+export interface OnlinePersonInfo{
+    personId?:string;
+    /**  权重 */
+    weight?:number;
+    /**  工作状态 */
+    workingStatus?:string;
+    /**  性别 */
+    sex?:number;
+    lastLoginTime?:string;
+}
 export interface ManagerAddBlackPictureRequest{
     pictureUrl?:string;
 }