fuwencai hace 4 años
padre
commit
6259bb8e16

+ 17 - 0
rpc/deduplication.proto

@@ -32,9 +32,26 @@ message GetEntCountResponse {
   string message = 2;  //响应消息
   int64 data = 3;     //响应内容
 }
+// 根据账户id判重参数
+message ByAccountRequest {
+  string personId = 1;     //人员id
+  string  infoId = 2;      //信息id  逗号分隔
+  string accountId = 3;    // 账户id
+}
+// 根据账户id判重返回值
+message ByAccountResponse {
+  int64  code = 1;    //响应代码
+  string message = 2;  //响应消息
+  Info   data = 3;     //响应内容
+}
+
 service Deduplication {
   // 数据判重
   rpc dataDeduplication(Request) returns(Response);
   // 获取企业数据总量
   rpc GetEntCount(GetEntCountRequest) returns(GetEntCountResponse);
+  //  根据账户id进行判重
+  rpc dataDeduplicateByAccount(ByAccountRequest) returns(ByAccountResponse);
+  //  根据账户id判重并存入数据
+  rpc dataDeduplicateAndSave(ByAccountRequest) returns(ByAccountRequest);
 }

+ 283 - 23
rpc/deduplication/deduplication.pb.go

@@ -352,6 +352,134 @@ func (x *GetEntCountResponse) GetData() int64 {
 	return 0
 }
 
+// 根据账户id判重参数
+type ByAccountRequest struct {
+	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
+
+	PersonId  string `protobuf:"bytes,1,opt,name=personId,proto3" json:"personId,omitempty"`   //人员id
+	InfoId    string `protobuf:"bytes,2,opt,name=infoId,proto3" json:"infoId,omitempty"`       //信息id  逗号分隔
+	AccountId string `protobuf:"bytes,3,opt,name=accountId,proto3" json:"accountId,omitempty"` // 账户id
+}
+
+func (x *ByAccountRequest) Reset() {
+	*x = ByAccountRequest{}
+	if protoimpl.UnsafeEnabled {
+		mi := &file_deduplication_proto_msgTypes[5]
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		ms.StoreMessageInfo(mi)
+	}
+}
+
+func (x *ByAccountRequest) String() string {
+	return protoimpl.X.MessageStringOf(x)
+}
+
+func (*ByAccountRequest) ProtoMessage() {}
+
+func (x *ByAccountRequest) ProtoReflect() protoreflect.Message {
+	mi := &file_deduplication_proto_msgTypes[5]
+	if protoimpl.UnsafeEnabled && x != nil {
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		if ms.LoadMessageInfo() == nil {
+			ms.StoreMessageInfo(mi)
+		}
+		return ms
+	}
+	return mi.MessageOf(x)
+}
+
+// Deprecated: Use ByAccountRequest.ProtoReflect.Descriptor instead.
+func (*ByAccountRequest) Descriptor() ([]byte, []int) {
+	return file_deduplication_proto_rawDescGZIP(), []int{5}
+}
+
+func (x *ByAccountRequest) GetPersonId() string {
+	if x != nil {
+		return x.PersonId
+	}
+	return ""
+}
+
+func (x *ByAccountRequest) GetInfoId() string {
+	if x != nil {
+		return x.InfoId
+	}
+	return ""
+}
+
+func (x *ByAccountRequest) GetAccountId() string {
+	if x != nil {
+		return x.AccountId
+	}
+	return ""
+}
+
+// 根据账户id判重返回值
+type ByAccountResponse struct {
+	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
+
+	Code    int64  `protobuf:"varint,1,opt,name=code,proto3" json:"code,omitempty"`      //响应代码
+	Message string `protobuf:"bytes,2,opt,name=message,proto3" json:"message,omitempty"` //响应消息
+	Data    *Info  `protobuf:"bytes,3,opt,name=data,proto3" json:"data,omitempty"`       //响应内容
+}
+
+func (x *ByAccountResponse) Reset() {
+	*x = ByAccountResponse{}
+	if protoimpl.UnsafeEnabled {
+		mi := &file_deduplication_proto_msgTypes[6]
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		ms.StoreMessageInfo(mi)
+	}
+}
+
+func (x *ByAccountResponse) String() string {
+	return protoimpl.X.MessageStringOf(x)
+}
+
+func (*ByAccountResponse) ProtoMessage() {}
+
+func (x *ByAccountResponse) ProtoReflect() protoreflect.Message {
+	mi := &file_deduplication_proto_msgTypes[6]
+	if protoimpl.UnsafeEnabled && x != nil {
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		if ms.LoadMessageInfo() == nil {
+			ms.StoreMessageInfo(mi)
+		}
+		return ms
+	}
+	return mi.MessageOf(x)
+}
+
+// Deprecated: Use ByAccountResponse.ProtoReflect.Descriptor instead.
+func (*ByAccountResponse) Descriptor() ([]byte, []int) {
+	return file_deduplication_proto_rawDescGZIP(), []int{6}
+}
+
+func (x *ByAccountResponse) GetCode() int64 {
+	if x != nil {
+		return x.Code
+	}
+	return 0
+}
+
+func (x *ByAccountResponse) GetMessage() string {
+	if x != nil {
+		return x.Message
+	}
+	return ""
+}
+
+func (x *ByAccountResponse) GetData() *Info {
+	if x != nil {
+		return x.Data
+	}
+	return nil
+}
+
 var File_deduplication_proto protoreflect.FileDescriptor
 
 var file_deduplication_proto_rawDesc = []byte{
@@ -388,18 +516,43 @@ var file_deduplication_proto_rawDesc = []byte{
 	0x52, 0x04, 0x63, 0x6f, 0x64, 0x65, 0x12, 0x18, 0x0a, 0x07, 0x6d, 0x65, 0x73, 0x73, 0x61, 0x67,
 	0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x07, 0x6d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65,
 	0x12, 0x12, 0x0a, 0x04, 0x64, 0x61, 0x74, 0x61, 0x18, 0x03, 0x20, 0x01, 0x28, 0x03, 0x52, 0x04,
-	0x64, 0x61, 0x74, 0x61, 0x32, 0xab, 0x01, 0x0a, 0x0d, 0x44, 0x65, 0x64, 0x75, 0x70, 0x6c, 0x69,
-	0x63, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x44, 0x0a, 0x11, 0x64, 0x61, 0x74, 0x61, 0x44, 0x65,
-	0x64, 0x75, 0x70, 0x6c, 0x69, 0x63, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x16, 0x2e, 0x64, 0x65,
-	0x64, 0x75, 0x70, 0x6c, 0x69, 0x63, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x2e, 0x52, 0x65, 0x71, 0x75,
-	0x65, 0x73, 0x74, 0x1a, 0x17, 0x2e, 0x64, 0x65, 0x64, 0x75, 0x70, 0x6c, 0x69, 0x63, 0x61, 0x74,
-	0x69, 0x6f, 0x6e, 0x2e, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x54, 0x0a, 0x0b,
-	0x47, 0x65, 0x74, 0x45, 0x6e, 0x74, 0x43, 0x6f, 0x75, 0x6e, 0x74, 0x12, 0x21, 0x2e, 0x64, 0x65,
-	0x64, 0x75, 0x70, 0x6c, 0x69, 0x63, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x2e, 0x47, 0x65, 0x74, 0x45,
-	0x6e, 0x74, 0x43, 0x6f, 0x75, 0x6e, 0x74, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x22,
-	0x2e, 0x64, 0x65, 0x64, 0x75, 0x70, 0x6c, 0x69, 0x63, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x2e, 0x47,
-	0x65, 0x74, 0x45, 0x6e, 0x74, 0x43, 0x6f, 0x75, 0x6e, 0x74, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e,
-	0x73, 0x65, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
+	0x64, 0x61, 0x74, 0x61, 0x22, 0x64, 0x0a, 0x10, 0x42, 0x79, 0x41, 0x63, 0x63, 0x6f, 0x75, 0x6e,
+	0x74, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x1a, 0x0a, 0x08, 0x70, 0x65, 0x72, 0x73,
+	0x6f, 0x6e, 0x49, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x70, 0x65, 0x72, 0x73,
+	0x6f, 0x6e, 0x49, 0x64, 0x12, 0x16, 0x0a, 0x06, 0x69, 0x6e, 0x66, 0x6f, 0x49, 0x64, 0x18, 0x02,
+	0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x69, 0x6e, 0x66, 0x6f, 0x49, 0x64, 0x12, 0x1c, 0x0a, 0x09,
+	0x61, 0x63, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x49, 0x64, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52,
+	0x09, 0x61, 0x63, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x49, 0x64, 0x22, 0x6a, 0x0a, 0x11, 0x42, 0x79,
+	0x41, 0x63, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12,
+	0x12, 0x0a, 0x04, 0x63, 0x6f, 0x64, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x03, 0x52, 0x04, 0x63,
+	0x6f, 0x64, 0x65, 0x12, 0x18, 0x0a, 0x07, 0x6d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x18, 0x02,
+	0x20, 0x01, 0x28, 0x09, 0x52, 0x07, 0x6d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x12, 0x27, 0x0a,
+	0x04, 0x64, 0x61, 0x74, 0x61, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x13, 0x2e, 0x64, 0x65,
+	0x64, 0x75, 0x70, 0x6c, 0x69, 0x63, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x2e, 0x49, 0x6e, 0x66, 0x6f,
+	0x52, 0x04, 0x64, 0x61, 0x74, 0x61, 0x32, 0xe6, 0x02, 0x0a, 0x0d, 0x44, 0x65, 0x64, 0x75, 0x70,
+	0x6c, 0x69, 0x63, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x44, 0x0a, 0x11, 0x64, 0x61, 0x74, 0x61,
+	0x44, 0x65, 0x64, 0x75, 0x70, 0x6c, 0x69, 0x63, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x16, 0x2e,
+	0x64, 0x65, 0x64, 0x75, 0x70, 0x6c, 0x69, 0x63, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x2e, 0x52, 0x65,
+	0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x17, 0x2e, 0x64, 0x65, 0x64, 0x75, 0x70, 0x6c, 0x69, 0x63,
+	0x61, 0x74, 0x69, 0x6f, 0x6e, 0x2e, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x54,
+	0x0a, 0x0b, 0x47, 0x65, 0x74, 0x45, 0x6e, 0x74, 0x43, 0x6f, 0x75, 0x6e, 0x74, 0x12, 0x21, 0x2e,
+	0x64, 0x65, 0x64, 0x75, 0x70, 0x6c, 0x69, 0x63, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x2e, 0x47, 0x65,
+	0x74, 0x45, 0x6e, 0x74, 0x43, 0x6f, 0x75, 0x6e, 0x74, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74,
+	0x1a, 0x22, 0x2e, 0x64, 0x65, 0x64, 0x75, 0x70, 0x6c, 0x69, 0x63, 0x61, 0x74, 0x69, 0x6f, 0x6e,
+	0x2e, 0x47, 0x65, 0x74, 0x45, 0x6e, 0x74, 0x43, 0x6f, 0x75, 0x6e, 0x74, 0x52, 0x65, 0x73, 0x70,
+	0x6f, 0x6e, 0x73, 0x65, 0x12, 0x5d, 0x0a, 0x18, 0x64, 0x61, 0x74, 0x61, 0x44, 0x65, 0x64, 0x75,
+	0x70, 0x6c, 0x69, 0x63, 0x61, 0x74, 0x65, 0x42, 0x79, 0x41, 0x63, 0x63, 0x6f, 0x75, 0x6e, 0x74,
+	0x12, 0x1f, 0x2e, 0x64, 0x65, 0x64, 0x75, 0x70, 0x6c, 0x69, 0x63, 0x61, 0x74, 0x69, 0x6f, 0x6e,
+	0x2e, 0x42, 0x79, 0x41, 0x63, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73,
+	0x74, 0x1a, 0x20, 0x2e, 0x64, 0x65, 0x64, 0x75, 0x70, 0x6c, 0x69, 0x63, 0x61, 0x74, 0x69, 0x6f,
+	0x6e, 0x2e, 0x42, 0x79, 0x41, 0x63, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x52, 0x65, 0x73, 0x70, 0x6f,
+	0x6e, 0x73, 0x65, 0x12, 0x5a, 0x0a, 0x16, 0x64, 0x61, 0x74, 0x61, 0x44, 0x65, 0x64, 0x75, 0x70,
+	0x6c, 0x69, 0x63, 0x61, 0x74, 0x65, 0x41, 0x6e, 0x64, 0x53, 0x61, 0x76, 0x65, 0x12, 0x1f, 0x2e,
+	0x64, 0x65, 0x64, 0x75, 0x70, 0x6c, 0x69, 0x63, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x2e, 0x42, 0x79,
+	0x41, 0x63, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x1f,
+	0x2e, 0x64, 0x65, 0x64, 0x75, 0x70, 0x6c, 0x69, 0x63, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x2e, 0x42,
+	0x79, 0x41, 0x63, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x62,
+	0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
 }
 
 var (
@@ -414,25 +567,32 @@ func file_deduplication_proto_rawDescGZIP() []byte {
 	return file_deduplication_proto_rawDescData
 }
 
-var file_deduplication_proto_msgTypes = make([]protoimpl.MessageInfo, 5)
+var file_deduplication_proto_msgTypes = make([]protoimpl.MessageInfo, 7)
 var file_deduplication_proto_goTypes = []interface{}{
 	(*Request)(nil),             // 0: deduplication.Request
 	(*Info)(nil),                // 1: deduplication.Info
 	(*GetEntCountRequest)(nil),  // 2: deduplication.GetEntCountRequest
 	(*Response)(nil),            // 3: deduplication.Response
 	(*GetEntCountResponse)(nil), // 4: deduplication.GetEntCountResponse
+	(*ByAccountRequest)(nil),    // 5: deduplication.ByAccountRequest
+	(*ByAccountResponse)(nil),   // 6: deduplication.ByAccountResponse
 }
 var file_deduplication_proto_depIdxs = []int32{
 	1, // 0: deduplication.Response.data:type_name -> deduplication.Info
-	0, // 1: deduplication.Deduplication.dataDeduplication:input_type -> deduplication.Request
-	2, // 2: deduplication.Deduplication.GetEntCount:input_type -> deduplication.GetEntCountRequest
-	3, // 3: deduplication.Deduplication.dataDeduplication:output_type -> deduplication.Response
-	4, // 4: deduplication.Deduplication.GetEntCount:output_type -> deduplication.GetEntCountResponse
-	3, // [3:5] is the sub-list for method output_type
-	1, // [1:3] is the sub-list for method input_type
-	1, // [1:1] is the sub-list for extension type_name
-	1, // [1:1] is the sub-list for extension extendee
-	0, // [0:1] is the sub-list for field type_name
+	1, // 1: deduplication.ByAccountResponse.data:type_name -> deduplication.Info
+	0, // 2: deduplication.Deduplication.dataDeduplication:input_type -> deduplication.Request
+	2, // 3: deduplication.Deduplication.GetEntCount:input_type -> deduplication.GetEntCountRequest
+	5, // 4: deduplication.Deduplication.dataDeduplicateByAccount:input_type -> deduplication.ByAccountRequest
+	5, // 5: deduplication.Deduplication.dataDeduplicateAndSave:input_type -> deduplication.ByAccountRequest
+	3, // 6: deduplication.Deduplication.dataDeduplication:output_type -> deduplication.Response
+	4, // 7: deduplication.Deduplication.GetEntCount:output_type -> deduplication.GetEntCountResponse
+	6, // 8: deduplication.Deduplication.dataDeduplicateByAccount:output_type -> deduplication.ByAccountResponse
+	5, // 9: deduplication.Deduplication.dataDeduplicateAndSave:output_type -> deduplication.ByAccountRequest
+	6, // [6:10] is the sub-list for method output_type
+	2, // [2:6] is the sub-list for method input_type
+	2, // [2:2] is the sub-list for extension type_name
+	2, // [2:2] is the sub-list for extension extendee
+	0, // [0:2] is the sub-list for field type_name
 }
 
 func init() { file_deduplication_proto_init() }
@@ -501,6 +661,30 @@ func file_deduplication_proto_init() {
 				return nil
 			}
 		}
+		file_deduplication_proto_msgTypes[5].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*ByAccountRequest); i {
+			case 0:
+				return &v.state
+			case 1:
+				return &v.sizeCache
+			case 2:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_deduplication_proto_msgTypes[6].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*ByAccountResponse); i {
+			case 0:
+				return &v.state
+			case 1:
+				return &v.sizeCache
+			case 2:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
 	}
 	type x struct{}
 	out := protoimpl.TypeBuilder{
@@ -508,7 +692,7 @@ func file_deduplication_proto_init() {
 			GoPackagePath: reflect.TypeOf(x{}).PkgPath(),
 			RawDescriptor: file_deduplication_proto_rawDesc,
 			NumEnums:      0,
-			NumMessages:   5,
+			NumMessages:   7,
 			NumExtensions: 0,
 			NumServices:   1,
 		},
@@ -538,6 +722,10 @@ type DeduplicationClient interface {
 	DataDeduplication(ctx context.Context, in *Request, opts ...grpc.CallOption) (*Response, error)
 	// 获取企业数据总量
 	GetEntCount(ctx context.Context, in *GetEntCountRequest, opts ...grpc.CallOption) (*GetEntCountResponse, error)
+	//  根据账户id进行判重
+	DataDeduplicateByAccount(ctx context.Context, in *ByAccountRequest, opts ...grpc.CallOption) (*ByAccountResponse, error)
+	//  根据账户id判重并存入数据
+	DataDeduplicateAndSave(ctx context.Context, in *ByAccountRequest, opts ...grpc.CallOption) (*ByAccountRequest, error)
 }
 
 type deduplicationClient struct {
@@ -566,12 +754,34 @@ func (c *deduplicationClient) GetEntCount(ctx context.Context, in *GetEntCountRe
 	return out, nil
 }
 
+func (c *deduplicationClient) DataDeduplicateByAccount(ctx context.Context, in *ByAccountRequest, opts ...grpc.CallOption) (*ByAccountResponse, error) {
+	out := new(ByAccountResponse)
+	err := c.cc.Invoke(ctx, "/deduplication.Deduplication/dataDeduplicateByAccount", in, out, opts...)
+	if err != nil {
+		return nil, err
+	}
+	return out, nil
+}
+
+func (c *deduplicationClient) DataDeduplicateAndSave(ctx context.Context, in *ByAccountRequest, opts ...grpc.CallOption) (*ByAccountRequest, error) {
+	out := new(ByAccountRequest)
+	err := c.cc.Invoke(ctx, "/deduplication.Deduplication/dataDeduplicateAndSave", in, out, opts...)
+	if err != nil {
+		return nil, err
+	}
+	return out, nil
+}
+
 // DeduplicationServer is the server API for Deduplication service.
 type DeduplicationServer interface {
 	// 数据判重
 	DataDeduplication(context.Context, *Request) (*Response, error)
 	// 获取企业数据总量
 	GetEntCount(context.Context, *GetEntCountRequest) (*GetEntCountResponse, error)
+	//  根据账户id进行判重
+	DataDeduplicateByAccount(context.Context, *ByAccountRequest) (*ByAccountResponse, error)
+	//  根据账户id判重并存入数据
+	DataDeduplicateAndSave(context.Context, *ByAccountRequest) (*ByAccountRequest, error)
 }
 
 // UnimplementedDeduplicationServer can be embedded to have forward compatible implementations.
@@ -584,6 +794,12 @@ func (*UnimplementedDeduplicationServer) DataDeduplication(context.Context, *Req
 func (*UnimplementedDeduplicationServer) GetEntCount(context.Context, *GetEntCountRequest) (*GetEntCountResponse, error) {
 	return nil, status.Errorf(codes.Unimplemented, "method GetEntCount not implemented")
 }
+func (*UnimplementedDeduplicationServer) DataDeduplicateByAccount(context.Context, *ByAccountRequest) (*ByAccountResponse, error) {
+	return nil, status.Errorf(codes.Unimplemented, "method DataDeduplicateByAccount not implemented")
+}
+func (*UnimplementedDeduplicationServer) DataDeduplicateAndSave(context.Context, *ByAccountRequest) (*ByAccountRequest, error) {
+	return nil, status.Errorf(codes.Unimplemented, "method DataDeduplicateAndSave not implemented")
+}
 
 func RegisterDeduplicationServer(s *grpc.Server, srv DeduplicationServer) {
 	s.RegisterService(&_Deduplication_serviceDesc, srv)
@@ -625,6 +841,42 @@ func _Deduplication_GetEntCount_Handler(srv interface{}, ctx context.Context, de
 	return interceptor(ctx, in, info, handler)
 }
 
+func _Deduplication_DataDeduplicateByAccount_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
+	in := new(ByAccountRequest)
+	if err := dec(in); err != nil {
+		return nil, err
+	}
+	if interceptor == nil {
+		return srv.(DeduplicationServer).DataDeduplicateByAccount(ctx, in)
+	}
+	info := &grpc.UnaryServerInfo{
+		Server:     srv,
+		FullMethod: "/deduplication.Deduplication/DataDeduplicateByAccount",
+	}
+	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
+		return srv.(DeduplicationServer).DataDeduplicateByAccount(ctx, req.(*ByAccountRequest))
+	}
+	return interceptor(ctx, in, info, handler)
+}
+
+func _Deduplication_DataDeduplicateAndSave_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
+	in := new(ByAccountRequest)
+	if err := dec(in); err != nil {
+		return nil, err
+	}
+	if interceptor == nil {
+		return srv.(DeduplicationServer).DataDeduplicateAndSave(ctx, in)
+	}
+	info := &grpc.UnaryServerInfo{
+		Server:     srv,
+		FullMethod: "/deduplication.Deduplication/DataDeduplicateAndSave",
+	}
+	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
+		return srv.(DeduplicationServer).DataDeduplicateAndSave(ctx, req.(*ByAccountRequest))
+	}
+	return interceptor(ctx, in, info, handler)
+}
+
 var _Deduplication_serviceDesc = grpc.ServiceDesc{
 	ServiceName: "deduplication.Deduplication",
 	HandlerType: (*DeduplicationServer)(nil),
@@ -637,6 +889,14 @@ var _Deduplication_serviceDesc = grpc.ServiceDesc{
 			MethodName: "GetEntCount",
 			Handler:    _Deduplication_GetEntCount_Handler,
 		},
+		{
+			MethodName: "dataDeduplicateByAccount",
+			Handler:    _Deduplication_DataDeduplicateByAccount_Handler,
+		},
+		{
+			MethodName: "dataDeduplicateAndSave",
+			Handler:    _Deduplication_DataDeduplicateAndSave_Handler,
+		},
 	},
 	Streams:  []grpc.StreamDesc{},
 	Metadata: "deduplication.proto",

+ 19 - 1
rpc/deduplicationclient/deduplication.go

@@ -14,17 +14,23 @@ import (
 )
 
 type (
-	GetEntCountRequest  = deduplication.GetEntCountRequest
 	Response            = deduplication.Response
 	GetEntCountResponse = deduplication.GetEntCountResponse
+	ByAccountRequest    = deduplication.ByAccountRequest
+	ByAccountResponse   = deduplication.ByAccountResponse
 	Request             = deduplication.Request
 	Info                = deduplication.Info
+	GetEntCountRequest  = deduplication.GetEntCountRequest
 
 	Deduplication interface {
 		//  数据判重
 		DataDeduplication(ctx context.Context, in *Request) (*Response, error)
 		//  获取企业数据总量
 		GetEntCount(ctx context.Context, in *GetEntCountRequest) (*GetEntCountResponse, error)
+		//   根据账户id进行判重
+		DataDeduplicateByAccount(ctx context.Context, in *ByAccountRequest) (*ByAccountResponse, error)
+		//   根据账户id判重并存入数据
+		DataDeduplicateAndSave(ctx context.Context, in *ByAccountRequest) (*ByAccountRequest, error)
 	}
 
 	defaultDeduplication struct {
@@ -49,3 +55,15 @@ func (m *defaultDeduplication) GetEntCount(ctx context.Context, in *GetEntCountR
 	client := deduplication.NewDeduplicationClient(m.cli.Conn())
 	return client.GetEntCount(ctx, in)
 }
+
+//   根据账户id进行判重
+func (m *defaultDeduplication) DataDeduplicateByAccount(ctx context.Context, in *ByAccountRequest) (*ByAccountResponse, error) {
+	client := deduplication.NewDeduplicationClient(m.cli.Conn())
+	return client.DataDeduplicateByAccount(ctx, in)
+}
+
+//   根据账户id判重并存入数据
+func (m *defaultDeduplication) DataDeduplicateAndSave(ctx context.Context, in *ByAccountRequest) (*ByAccountRequest, error) {
+	client := deduplication.NewDeduplicationClient(m.cli.Conn())
+	return client.DataDeduplicateAndSave(ctx, in)
+}

+ 31 - 0
rpc/internal/logic/datadeduplicateandsavelogic.go

@@ -0,0 +1,31 @@
+package logic
+
+import (
+	"context"
+
+	"app.yhyue.com/moapp/dataDeduplication/rpc/deduplication"
+	"app.yhyue.com/moapp/dataDeduplication/rpc/internal/svc"
+
+	"github.com/tal-tech/go-zero/core/logx"
+)
+
+type DataDeduplicateAndSaveLogic struct {
+	ctx    context.Context
+	svcCtx *svc.ServiceContext
+	logx.Logger
+}
+
+func NewDataDeduplicateAndSaveLogic(ctx context.Context, svcCtx *svc.ServiceContext) *DataDeduplicateAndSaveLogic {
+	return &DataDeduplicateAndSaveLogic{
+		ctx:    ctx,
+		svcCtx: svcCtx,
+		Logger: logx.WithContext(ctx),
+	}
+}
+
+//   根据账户id判重并存入数据
+func (l *DataDeduplicateAndSaveLogic) DataDeduplicateAndSave(in *deduplication.ByAccountRequest) (*deduplication.ByAccountRequest, error) {
+	// todo: add your logic here and delete this line
+
+	return &deduplication.ByAccountRequest{}, nil
+}

+ 31 - 0
rpc/internal/logic/datadeduplicatebyaccountlogic.go

@@ -0,0 +1,31 @@
+package logic
+
+import (
+	"context"
+
+	"app.yhyue.com/moapp/dataDeduplication/rpc/deduplication"
+	"app.yhyue.com/moapp/dataDeduplication/rpc/internal/svc"
+
+	"github.com/tal-tech/go-zero/core/logx"
+)
+
+type DataDeduplicateByAccountLogic struct {
+	ctx    context.Context
+	svcCtx *svc.ServiceContext
+	logx.Logger
+}
+
+func NewDataDeduplicateByAccountLogic(ctx context.Context, svcCtx *svc.ServiceContext) *DataDeduplicateByAccountLogic {
+	return &DataDeduplicateByAccountLogic{
+		ctx:    ctx,
+		svcCtx: svcCtx,
+		Logger: logx.WithContext(ctx),
+	}
+}
+
+//   根据账户id进行判重
+func (l *DataDeduplicateByAccountLogic) DataDeduplicateByAccount(in *deduplication.ByAccountRequest) (*deduplication.ByAccountResponse, error) {
+	// todo: add your logic here and delete this line
+
+	return &deduplication.ByAccountResponse{}, nil
+}

+ 12 - 0
rpc/internal/server/deduplicationserver.go

@@ -32,3 +32,15 @@ func (s *DeduplicationServer) GetEntCount(ctx context.Context, in *deduplication
 	l := logic.NewGetEntCountLogic(ctx, s.svcCtx)
 	return l.GetEntCount(in)
 }
+
+//   根据账户id进行判重
+func (s *DeduplicationServer) DataDeduplicateByAccount(ctx context.Context, in *deduplication.ByAccountRequest) (*deduplication.ByAccountResponse, error) {
+	l := logic.NewDataDeduplicateByAccountLogic(ctx, s.svcCtx)
+	return l.DataDeduplicateByAccount(in)
+}
+
+//   根据账户id判重并存入数据
+func (s *DeduplicationServer) DataDeduplicateAndSave(ctx context.Context, in *deduplication.ByAccountRequest) (*deduplication.ByAccountRequest, error) {
+	l := logic.NewDataDeduplicateAndSaveLogic(ctx, s.svcCtx)
+	return l.DataDeduplicateAndSave(in)
+}