internal/controller/register.go

@@ -47,15 +47,3 @@ func (e *ExhibitionProvider) ExportRegisterRecord(_ context.Context, req *exhibi
 	rep.Msg = msg.Success
 	return rep, nil
 }
-func (e *ExhibitionProvider) ImportInfoByExcel(_ context.Context, req *exhibition.RegisterInfo) (rep *exhibition.SaveRegisterRecordResp, err error) {
-	if info, err := e.registerLogic.GetRecordByName(req); err != nil {
-		return nil, err
-	} else {
-		req.Uuid = info.Uuid
-	}
-	if rep, err = e.registerLogic.UpdateRegisterRecord(req); err != nil {
-		return nil, err
-	}
-	rep.Msg = msg.Success
-	return rep, nil
-}

internal/dao/register.go

@@ -111,12 +111,3 @@ func AllRecord() (data []*model.RegisterRecord, err error) {
 	}
 	return
 }
-
-func GetRecordByName(in *exhibition.RegisterInfo) (record *model.RegisterRecord, err error) {
-	if err = app.ModuleClients.ExhibitionRegister.Model(&model.RegisterRecord{}).Where("artist_name=? AND artwork_name=?", in.ArtistName, in.ArtworkName).First(&record).Error; err != nil {
-		zap.L().Error("GetRecordByName err", zap.Error(err))
-		err = errors.New(msg.ErrorSelect)
-		return
-	}
-	return
-}

internal/logic/register_logic.go

@@ -214,68 +214,3 @@ func (r *Register) CheckByPhone(in *exhibition.RegisterInfo) (out *exhibition.Ch
 
 	return out, nil
 }
-func (r *Register) GetRecordByName(in *exhibition.RegisterInfo) (out *exhibition.RegisterInfo, err error) {
-	record, err := dao.GetRecordByName(in)
-	if err != nil {
-		return nil, err
-	}
-	if record == nil {
-		return nil, errors.New("未找到该记录")
-	}
-	data := &exhibition.RegisterInfo{
-		Id:   int32(record.ID),
-		Uuid: record.UUID,
-	}
-	return data, nil
-}
-func (r *Register) UpdateRegisterRecord(in *exhibition.RegisterInfo) (out *exhibition.SaveRegisterRecordResp, err error) {
-	out = &exhibition.SaveRegisterRecordResp{}
-	record := &model.RegisterRecord{
-		ArtistName:          in.ArtistName,
-		Gender:              in.Gender,
-		PhoneNum:            in.PhoneNum,
-		IdCard:              in.IdCard,
-		Address:             in.Address,
-		Address1:            in.Address1,
-		IdCardPhoto:         in.IdCardPhoto,
-		IdCardBackPhoto:     in.IdCardBackPhoto,
-		ArtistPhoto:         in.ArtistPhoto,
-		ArtworkFile:         in.ArtworkFile,
-		ArtworkName:         in.ArtworkName,
-		Province:            in.Province,
-		ArtworkType:         in.ArtworkType,
-		ArtworkSize:         in.ArtworkSize,
-		PreliminaryRatingNo: in.PreliminaryRatingNo,
-		ReRatingNo:          in.ReRatingNo,
-		UUID:                in.Uuid,
-	}
-	registerRecord, err1 := dao.UpdateRegisterRecord(record)
-	if err1 != nil {
-		return nil, err1
-	}
-
-	data := &exhibition.RegisterInfo{
-		Id:                  int32(registerRecord.ID),
-		Uuid:                registerRecord.UUID,
-		ArtistName:          registerRecord.ArtistName,
-		Gender:              registerRecord.Gender,
-		PhoneNum:            registerRecord.PhoneNum,
-		IdCard:              registerRecord.IdCard,
-		Address:             registerRecord.Address,
-		Address1:            registerRecord.Address1,
-		IdCardPhoto:         registerRecord.IdCardPhoto,
-		IdCardBackPhoto:     registerRecord.IdCardBackPhoto,
-		ArtistPhoto:         registerRecord.ArtistPhoto,
-		ArtworkFile:         registerRecord.ArtworkFile,
-		ArtworkName:         registerRecord.ArtworkName,
-		Province:            registerRecord.Province,
-		ArtworkType:         registerRecord.ArtworkType,
-		ArtworkSize:         registerRecord.ArtworkSize,
-		PreliminaryRatingNo: registerRecord.PreliminaryRatingNo,
-		ReRatingNo:          registerRecord.ReRatingNo,
-		CreatedAt:           registerRecord.CreatedAt.Format("2006-01-02 15:04:05"),
-		UpdatedAt:           registerRecord.UpdatedAt.Format("2006-01-02 15:04:05"),
-	}
-	out.Data = data
-	return out, nil
-}

pb/exhibition.proto

@@ -12,7 +12,6 @@ service Exhibition {
   rpc RegisterRecordList(RecordListReq) returns (RecordListResp);
   rpc ExportRegisterRecord(ExportRecordReq) returns (ExportRecordResp);
   rpc CheckIdCard(RegisterInfo) returns (CheckIdCardResp);
-  rpc ImportInfoByExcel(RegisterInfo) returns(SaveRegisterRecordResp); 
 }
 
 message RegisterInfo{

pb/exhibition/exhibition.pb.go

@@ -926,7 +926,7 @@ var file_pb_exhibition_proto_rawDesc = []byte{
 	0x61, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x16, 0x2e, 0x65, 0x78, 0x68, 0x69, 0x62, 0x69,
 	0x74, 0x69, 0x6f, 0x6e, 0x2e, 0x45, 0x78, 0x70, 0x6f, 0x72, 0x74, 0x49, 0x6e, 0x66, 0x6f, 0x52,
 	0x04, 0x64, 0x61, 0x74, 0x61, 0x12, 0x10, 0x0a, 0x03, 0x6d, 0x73, 0x67, 0x18, 0x02, 0x20, 0x01,
-	0x28, 0x09, 0x52, 0x03, 0x6d, 0x73, 0x67, 0x32, 0xdd, 0x03, 0x0a, 0x0a, 0x45, 0x78, 0x68, 0x69,
+	0x28, 0x09, 0x52, 0x03, 0x6d, 0x73, 0x67, 0x32, 0x8a, 0x03, 0x0a, 0x0a, 0x45, 0x78, 0x68, 0x69,
 	0x62, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x42, 0x0a, 0x0a, 0x43, 0x68, 0x65, 0x63, 0x6b, 0x50,
 	0x68, 0x6f, 0x6e, 0x65, 0x12, 0x18, 0x2e, 0x65, 0x78, 0x68, 0x69, 0x62, 0x69, 0x74, 0x69, 0x6f,
 	0x6e, 0x2e, 0x52, 0x65, 0x67, 0x69, 0x73, 0x74, 0x65, 0x72, 0x49, 0x6e, 0x66, 0x6f, 0x1a, 0x1a,
@@ -951,14 +951,8 @@ var file_pb_exhibition_proto_rawDesc = []byte{
 	0x65, 0x78, 0x68, 0x69, 0x62, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x2e, 0x52, 0x65, 0x67, 0x69, 0x73,
 	0x74, 0x65, 0x72, 0x49, 0x6e, 0x66, 0x6f, 0x1a, 0x1b, 0x2e, 0x65, 0x78, 0x68, 0x69, 0x62, 0x69,
 	0x74, 0x69, 0x6f, 0x6e, 0x2e, 0x43, 0x68, 0x65, 0x63, 0x6b, 0x49, 0x64, 0x43, 0x61, 0x72, 0x64,
-	0x52, 0x65, 0x73, 0x70, 0x12, 0x51, 0x0a, 0x11, 0x49, 0x6d, 0x70, 0x6f, 0x72, 0x74, 0x49, 0x6e,
+	0x52, 0x65, 0x73, 0x70, 0x42, 0x11, 0x5a, 0x0f, 0x2e, 0x2f, 0x70, 0x62, 0x2f, 0x65, 0x78, 0x68,
-	0x66, 0x6f, 0x42, 0x79, 0x45, 0x78, 0x63, 0x65, 0x6c, 0x12, 0x18, 0x2e, 0x65, 0x78, 0x68, 0x69,
+	0x69, 0x62, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
-	0x62, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x2e, 0x52, 0x65, 0x67, 0x69, 0x73, 0x74, 0x65, 0x72, 0x49,
-	0x6e, 0x66, 0x6f, 0x1a, 0x22, 0x2e, 0x65, 0x78, 0x68, 0x69, 0x62, 0x69, 0x74, 0x69, 0x6f, 0x6e,
-	0x2e, 0x53, 0x61, 0x76, 0x65, 0x52, 0x65, 0x67, 0x69, 0x73, 0x74, 0x65, 0x72, 0x52, 0x65, 0x63,
-	0x6f, 0x72, 0x64, 0x52, 0x65, 0x73, 0x70, 0x42, 0x11, 0x5a, 0x0f, 0x2e, 0x2f, 0x70, 0x62, 0x2f,
-	0x65, 0x78, 0x68, 0x69, 0x62, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74,
-	0x6f, 0x33,
 }
 
 var (
@@ -995,15 +989,13 @@ var file_pb_exhibition_proto_depIdxs = []int32{
 	4, // 6: exhibition.Exhibition.RegisterRecordList:input_type -> exhibition.RecordListReq
 	6, // 7: exhibition.Exhibition.ExportRegisterRecord:input_type -> exhibition.ExportRecordReq
 	0, // 8: exhibition.Exhibition.CheckIdCard:input_type -> exhibition.RegisterInfo
-	0,  // 9: exhibition.Exhibition.ImportInfoByExcel:input_type -> exhibition.RegisterInfo
+	2, // 9: exhibition.Exhibition.CheckPhone:output_type -> exhibition.CheckPhoneResp
-	2,  // 10: exhibition.Exhibition.CheckPhone:output_type -> exhibition.CheckPhoneResp
+	1, // 10: exhibition.Exhibition.SaveRegisterRecord:output_type -> exhibition.SaveRegisterRecordResp
-	1,  // 11: exhibition.Exhibition.SaveRegisterRecord:output_type -> exhibition.SaveRegisterRecordResp
+	5, // 11: exhibition.Exhibition.RegisterRecordList:output_type -> exhibition.RecordListResp
-	5,  // 12: exhibition.Exhibition.RegisterRecordList:output_type -> exhibition.RecordListResp
+	8, // 12: exhibition.Exhibition.ExportRegisterRecord:output_type -> exhibition.ExportRecordResp
-	8,  // 13: exhibition.Exhibition.ExportRegisterRecord:output_type -> exhibition.ExportRecordResp
+	3, // 13: exhibition.Exhibition.CheckIdCard:output_type -> exhibition.CheckIdCardResp
-	3,  // 14: exhibition.Exhibition.CheckIdCard:output_type -> exhibition.CheckIdCardResp
+	9, // [9:14] is the sub-list for method output_type
-	1,  // 15: exhibition.Exhibition.ImportInfoByExcel:output_type -> exhibition.SaveRegisterRecordResp
+	4, // [4:9] is the sub-list for method input_type
-	10, // [10:16] is the sub-list for method output_type
-	4,  // [4:10] is the sub-list for method input_type
 	4, // [4:4] is the sub-list for extension type_name
 	4, // [4:4] is the sub-list for extension extendee
 	0, // [0:4] is the sub-list for field type_name

pb/exhibition/exhibition_triple.pb.go

@@ -33,7 +33,6 @@ type ExhibitionClient interface {
 	RegisterRecordList(ctx context.Context, in *RecordListReq, opts ...grpc_go.CallOption) (*RecordListResp, common.ErrorWithAttachment)
 	ExportRegisterRecord(ctx context.Context, in *ExportRecordReq, opts ...grpc_go.CallOption) (*ExportRecordResp, common.ErrorWithAttachment)
 	CheckIdCard(ctx context.Context, in *RegisterInfo, opts ...grpc_go.CallOption) (*CheckIdCardResp, common.ErrorWithAttachment)
-	ImportInfoByExcel(ctx context.Context, in *RegisterInfo, opts ...grpc_go.CallOption) (*SaveRegisterRecordResp, common.ErrorWithAttachment)
 }
 
 type exhibitionClient struct {
@@ -46,7 +45,6 @@ type ExhibitionClientImpl struct {
 	RegisterRecordList   func(ctx context.Context, in *RecordListReq) (*RecordListResp, error)
 	ExportRegisterRecord func(ctx context.Context, in *ExportRecordReq) (*ExportRecordResp, error)
 	CheckIdCard          func(ctx context.Context, in *RegisterInfo) (*CheckIdCardResp, error)
-	ImportInfoByExcel    func(ctx context.Context, in *RegisterInfo) (*SaveRegisterRecordResp, error)
 }
 
 func (c *ExhibitionClientImpl) GetDubboStub(cc *triple.TripleConn) ExhibitionClient {
@@ -91,12 +89,6 @@ func (c *exhibitionClient) CheckIdCard(ctx context.Context, in *RegisterInfo, op
 	return out, c.cc.Invoke(ctx, "/"+interfaceKey+"/CheckIdCard", in, out)
 }
 
-func (c *exhibitionClient) ImportInfoByExcel(ctx context.Context, in *RegisterInfo, opts ...grpc_go.CallOption) (*SaveRegisterRecordResp, common.ErrorWithAttachment) {
-	out := new(SaveRegisterRecordResp)
-	interfaceKey := ctx.Value(constant.InterfaceKey).(string)
-	return out, c.cc.Invoke(ctx, "/"+interfaceKey+"/ImportInfoByExcel", in, out)
-}
-
 // ExhibitionServer is the server API for Exhibition service.
 // All implementations must embed UnimplementedExhibitionServer
 // for forward compatibility
@@ -106,7 +98,6 @@ type ExhibitionServer interface {
 	RegisterRecordList(context.Context, *RecordListReq) (*RecordListResp, error)
 	ExportRegisterRecord(context.Context, *ExportRecordReq) (*ExportRecordResp, error)
 	CheckIdCard(context.Context, *RegisterInfo) (*CheckIdCardResp, error)
-	ImportInfoByExcel(context.Context, *RegisterInfo) (*SaveRegisterRecordResp, error)
 	mustEmbedUnimplementedExhibitionServer()
 }
 
@@ -130,9 +121,6 @@ func (UnimplementedExhibitionServer) ExportRegisterRecord(context.Context, *Expo
 func (UnimplementedExhibitionServer) CheckIdCard(context.Context, *RegisterInfo) (*CheckIdCardResp, error) {
 	return nil, status.Errorf(codes.Unimplemented, "method CheckIdCard not implemented")
 }
-func (UnimplementedExhibitionServer) ImportInfoByExcel(context.Context, *RegisterInfo) (*SaveRegisterRecordResp, error) {
-	return nil, status.Errorf(codes.Unimplemented, "method ImportInfoByExcel not implemented")
-}
 func (s *UnimplementedExhibitionServer) XXX_SetProxyImpl(impl protocol.Invoker) {
 	s.proxyImpl = impl
 }
@@ -306,35 +294,6 @@ func _Exhibition_CheckIdCard_Handler(srv interface{}, ctx context.Context, dec f
 	return interceptor(ctx, in, info, handler)
 }
 
-func _Exhibition_ImportInfoByExcel_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc_go.UnaryServerInterceptor) (interface{}, error) {
-	in := new(RegisterInfo)
-	if err := dec(in); err != nil {
-		return nil, err
-	}
-	base := srv.(dubbo3.Dubbo3GrpcService)
-	args := []interface{}{}
-	args = append(args, in)
-	md, _ := metadata.FromIncomingContext(ctx)
-	invAttachment := make(map[string]interface{}, len(md))
-	for k, v := range md {
-		invAttachment[k] = v
-	}
-	invo := invocation.NewRPCInvocation("ImportInfoByExcel", args, invAttachment)
-	if interceptor == nil {
-		result := base.XXX_GetProxyImpl().Invoke(ctx, invo)
-		return result, result.Error()
-	}
-	info := &grpc_go.UnaryServerInfo{
-		Server:     srv,
-		FullMethod: ctx.Value("XXX_TRIPLE_GO_INTERFACE_NAME").(string),
-	}
-	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
-		result := base.XXX_GetProxyImpl().Invoke(ctx, invo)
-		return result, result.Error()
-	}
-	return interceptor(ctx, in, info, handler)
-}
-
 // Exhibition_ServiceDesc is the grpc_go.ServiceDesc for Exhibition service.
 // It's only intended for direct use with grpc_go.RegisterService,
 // and not to be introspected or modified (even as a copy)
@@ -362,10 +321,6 @@ var Exhibition_ServiceDesc = grpc_go.ServiceDesc{
 			MethodName: "CheckIdCard",
 			Handler:    _Exhibition_CheckIdCard_Handler,
 		},
-		{
-			MethodName: "ImportInfoByExcel",
-			Handler:    _Exhibition_ImportInfoByExcel_Handler,
-		},
 	},
 	Streams:  []grpc_go.StreamDesc{},
 	Metadata: "pb/exhibition.proto",