From c909a74f6925a943988989ea3d9ab853ecfc299b Mon Sep 17 00:00:00 2001 From: sxy <3187870250@qq.com> Date: Mon, 10 Mar 2025 15:18:11 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E8=AF=84=E9=80=89=E5=8F=B7?= =?UTF-8?q?=E7=AD=89=E5=A4=9A=E4=B8=AA=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- internal/logic/register_logic.go | 124 ++++++----- internal/model/register.go | 38 ++-- pb/exhibition.proto | 11 + pb/exhibition/exhibition.pb.go | 372 ++++++++++++++++++++----------- pkg/db/mysql.go | 11 +- 5 files changed, 351 insertions(+), 205 deletions(-) diff --git a/internal/logic/register_logic.go b/internal/logic/register_logic.go index 78185d5..77e0506 100644 --- a/internal/logic/register_logic.go +++ b/internal/logic/register_logic.go @@ -47,17 +47,22 @@ func (r *Register) FindAllRecord() (out *exhibition.ExportRecordResp, err error) var address string address = fmt.Sprintf("%s%s", record.Address, record.Address1) tmp := &exhibition.ExportInfo{ - ArtistName: record.ArtistName, - Gender: record.Gender, - PhoneNum: record.PhoneNum, - IdCard: record.IdCard, - Address: address, - IdCardPhoto: record.IdCardPhoto, - IdCardBackPhoto: record.IdCardBackPhoto, - ArtistPhoto: record.ArtistPhoto, - ArtworkName: record.ArtworkName, - CreatedAt: record.CreatedAt.Format("2006-01-02 15:04:05"), - UpdatedAt: record.UpdatedAt.Format("2006-01-02 15:04:05"), + ArtistName: record.ArtistName, + Gender: record.Gender, + PhoneNum: record.PhoneNum, + IdCard: record.IdCard, + Address: address, + IdCardPhoto: record.IdCardPhoto, + IdCardBackPhoto: record.IdCardBackPhoto, + ArtistPhoto: record.ArtistPhoto, + ArtworkName: record.ArtworkName, + PreliminaryRatingNo: record.PreliminaryRatingNo, + ReRatingNo: record.ReRatingNo, + ArtworkType: record.ArtworkType, + ArtworkSize: record.ArtworkSize, + Province: record.Province, + CreatedAt: record.CreatedAt.Format("2006-01-02 15:04:05"), + UpdatedAt: record.UpdatedAt.Format("2006-01-02 15:04:05"), } out.Data = append(out.Data, tmp) } @@ -75,21 +80,26 @@ func (r *Register) RegisterRecordList(in *exhibition.RecordListReq) (out *exhibi if total > 0 { for _, item := range recordList { tmp := &exhibition.RegisterInfo{ - Id: int32(item.ID), - Uuid: item.UUID, - ArtistName: item.ArtistName, - Gender: item.Gender, - PhoneNum: item.PhoneNum, - IdCard: item.IdCard, - Address: item.Address, - Address1: item.Address1, - IdCardPhoto: item.IdCardPhoto, - IdCardBackPhoto: item.IdCardBackPhoto, - ArtistPhoto: item.ArtistPhoto, - ArtworkFile: item.ArtworkFile, - ArtworkName: item.ArtworkName, - CreatedAt: item.CreatedAt.Format("2006-01-02 15:04:05"), - UpdatedAt: item.UpdatedAt.Format("2006-01-02 15:04:05"), + Id: int32(item.ID), + Uuid: item.UUID, + ArtistName: item.ArtistName, + Gender: item.Gender, + PhoneNum: item.PhoneNum, + IdCard: item.IdCard, + Address: item.Address, + Address1: item.Address1, + IdCardPhoto: item.IdCardPhoto, + IdCardBackPhoto: item.IdCardBackPhoto, + ArtistPhoto: item.ArtistPhoto, + ArtworkFile: item.ArtworkFile, + ArtworkName: item.ArtworkName, + PreliminaryRatingNo: item.PreliminaryRatingNo, + ReRatingNo: item.ReRatingNo, + ArtworkType: item.ArtworkType, + ArtworkSize: item.ArtworkSize, + Province: item.Province, + CreatedAt: item.CreatedAt.Format("2006-01-02 15:04:05"), + UpdatedAt: item.UpdatedAt.Format("2006-01-02 15:04:05"), } out.Data = append(out.Data, tmp) @@ -102,17 +112,22 @@ func (r *Register) RegisterRecordList(in *exhibition.RecordListReq) (out *exhibi func (r *Register) SaveRegisterRecord(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, + 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, } tmpRecord := &model.RegisterRecord{} @@ -141,21 +156,26 @@ func (r *Register) SaveRegisterRecord(in *exhibition.RegisterInfo) (out *exhibit } data := &exhibition.RegisterInfo{ - Id: int32(tmpRecord.ID), - Uuid: tmpRecord.UUID, - ArtistName: tmpRecord.ArtistName, - Gender: tmpRecord.Gender, - PhoneNum: tmpRecord.PhoneNum, - IdCard: tmpRecord.IdCard, - Address: tmpRecord.Address, - Address1: tmpRecord.Address1, - IdCardPhoto: tmpRecord.IdCardPhoto, - IdCardBackPhoto: tmpRecord.IdCardBackPhoto, - ArtistPhoto: tmpRecord.ArtistPhoto, - ArtworkFile: tmpRecord.ArtworkFile, - ArtworkName: tmpRecord.ArtworkName, - CreatedAt: tmpRecord.CreatedAt.Format("2006-01-02 15:04:05"), - UpdatedAt: tmpRecord.UpdatedAt.Format("2006-01-02 15:04:05"), + Id: int32(tmpRecord.ID), + Uuid: tmpRecord.UUID, + ArtistName: tmpRecord.ArtistName, + Gender: tmpRecord.Gender, + PhoneNum: tmpRecord.PhoneNum, + IdCard: tmpRecord.IdCard, + Address: tmpRecord.Address, + Address1: tmpRecord.Address1, + IdCardPhoto: tmpRecord.IdCardPhoto, + IdCardBackPhoto: tmpRecord.IdCardBackPhoto, + ArtistPhoto: tmpRecord.ArtistPhoto, + ArtworkFile: tmpRecord.ArtworkFile, + ArtworkName: tmpRecord.ArtworkName, + Province: tmpRecord.Province, + ArtworkType: tmpRecord.ArtworkType, + ArtworkSize: tmpRecord.ArtworkSize, + PreliminaryRatingNo: tmpRecord.PreliminaryRatingNo, + ReRatingNo: tmpRecord.ReRatingNo, + CreatedAt: tmpRecord.CreatedAt.Format("2006-01-02 15:04:05"), + UpdatedAt: tmpRecord.UpdatedAt.Format("2006-01-02 15:04:05"), } out.Data = data return out, nil diff --git a/internal/model/register.go b/internal/model/register.go index 0c8dd9c..601a51d 100644 --- a/internal/model/register.go +++ b/internal/model/register.go @@ -7,20 +7,26 @@ import ( ) type RegisterRecord struct { - ID int32 `gorm:"column:id;type:int(11);primary_key;AUTO_INCREMENT" json:"id"` - UUID string `json:"uuid" gorm:"primaryKey;column:uuid;type:varchar(255);comment:报名记录Uid"` - ArtistName string `json:"artist_name" gorm:"column:artist_name;type:varchar(255);comment:画家姓名"` - Gender int32 `json:"gender" gorm:"column:gender;type:int;comment:性别1男2女"` - PhoneNum string `json:"phone_num" gorm:"column:phone_num;type:varchar(255);not null;comment:手机号"` - IdCard string `json:"id_card" gorm:"column:id_card;type:varchar(255);comment:身份证号"` - Address string `json:"address" gorm:"column:address;type:varchar(3000);comment:通讯地址"` - Address1 string `json:"address1" gorm:"column:address1;type:varchar(1000);comment:详细地址"` - IdCardPhoto string `json:"id_card_photo" gorm:"column:id_card_photo;type:varchar(1000);comment:身份证照片"` - IdCardBackPhoto string `json:"id_card_back_photo" gorm:"column:id_card_back_photo;type:varchar(1000);comment:身份证照片背面"` - ArtistPhoto string `json:"artist_photo" gorm:"column:artist_photo;type:varchar(1000);comment:画家本人近照"` - ArtworkFile string `json:"artwork_file" gorm:"column:artwork_file;type:varchar(1000);comment:作品文件"` - ArtworkName string `json:"artwork_name" gorm:"column:artwork_name;type:varchar(255);comment:作品名称"` - CreatedAt time.Time `gorm:"column:created_at;autoCreateTime"` - UpdatedAt time.Time `gorm:"column:updated_at;autoCreateTime"` - DeletedAt soft_delete.DeletedAt + ID int32 `gorm:"column:id;type:int(11);primary_key;AUTO_INCREMENT" json:"id"` + CreatedAt time.Time `gorm:"column:created_at;autoCreateTime"` + UpdatedAt time.Time `gorm:"column:updated_at;autoCreateTime"` + DeletedAt soft_delete.DeletedAt + + UUID string `json:"uuid" gorm:"primaryKey;column:uuid;type:varchar(255);comment:报名记录Uid"` + PreliminaryRatingNo string `json:"preliminary_rating_no" gorm:"column:preliminary_rating_no;type:varchar(255);comment:初评评选号"` + ReRatingNo string `json:"re_rating_no" gorm:"column:re_rating_no;type:varchar(255);comment:复评评选号"` + ArtistName string `json:"artist_name" gorm:"column:artist_name;type:varchar(255);comment:画家姓名"` + Gender int32 `json:"gender" gorm:"column:gender;type:int;comment:性别1男2女"` + PhoneNum string `json:"phone_num" gorm:"column:phone_num;type:varchar(255);not null;comment:手机号"` + IdCard string `json:"id_card" gorm:"column:id_card;type:varchar(255);comment:身份证号"` + Province string `json:"province" gorm:"column:province;type:varchar(100);comment:省份"` + Address string `json:"address" gorm:"column:address;type:varchar(3000);comment:通讯地址"` + Address1 string `json:"address1" gorm:"column:address1;type:varchar(1000);comment:详细地址"` + IdCardPhoto string `json:"id_card_photo" gorm:"column:id_card_photo;type:varchar(1000);comment:身份证照片"` + IdCardBackPhoto string `json:"id_card_back_photo" gorm:"column:id_card_back_photo;type:varchar(1000);comment:身份证照片背面"` + ArtistPhoto string `json:"artist_photo" gorm:"column:artist_photo;type:varchar(1000);comment:画家本人近照"` + ArtworkFile string `json:"artwork_file" gorm:"column:artwork_file;type:varchar(1000);comment:作品文件"` + ArtworkName string `json:"artwork_name" gorm:"column:artwork_name;type:varchar(255);comment:作品名称"` + ArtworkType int32 `json:"artwork_type" gorm:"column:artwork_type;type:int;comment:作品类型 1 中国画 "` + ArtworkSize string `json:"artwork_size" gorm:"column:artwork_size;type:varchar(50);comment:画作尺寸"` } diff --git a/pb/exhibition.proto b/pb/exhibition.proto index ffabebe..5eb7a6f 100644 --- a/pb/exhibition.proto +++ b/pb/exhibition.proto @@ -32,6 +32,12 @@ message RegisterInfo{ string idCardEndDate = 15; string artworkFile = 16; string artworkName =17; + string PreliminaryRatingNo = 18; + string ReRatingNo = 19; + string province = 20; + int32 artworkType = 21; + string artworkSize = 22; + } @@ -84,6 +90,11 @@ message ExportInfo { string createdAt = 11; string updatedAt = 12; string artworkName =13; + string PreliminaryRatingNo = 14; + string ReRatingNo = 15; + string province = 16; + int32 artworkType = 17; + string artworkSize = 18; } diff --git a/pb/exhibition/exhibition.pb.go b/pb/exhibition/exhibition.pb.go index 1ec3f22..8c8bd49 100644 --- a/pb/exhibition/exhibition.pb.go +++ b/pb/exhibition/exhibition.pb.go @@ -27,23 +27,28 @@ type RegisterInfo struct { sizeCache protoimpl.SizeCache unknownFields protoimpl.UnknownFields - Id int32 `protobuf:"varint,1,opt,name=id,proto3" json:"id"` - Uuid string `protobuf:"bytes,2,opt,name=uuid,proto3" json:"uuid"` - ArtistName string `protobuf:"bytes,3,opt,name=artistName,proto3" json:"artistName"` - Gender int32 `protobuf:"varint,4,opt,name=gender,proto3" json:"gender"` - PhoneNum string `protobuf:"bytes,5,opt,name=phoneNum,proto3" json:"phoneNum"` - IdCard string `protobuf:"bytes,6,opt,name=idCard,proto3" json:"idCard"` - Address string `protobuf:"bytes,7,opt,name=address,proto3" json:"address"` - Address1 string `protobuf:"bytes,8,opt,name=address1,proto3" json:"address1"` - IdCardPhoto string `protobuf:"bytes,9,opt,name=idCardPhoto,proto3" json:"idCardPhoto"` - IdCardBackPhoto string `protobuf:"bytes,10,opt,name=idCardBackPhoto,proto3" json:"idCardBackPhoto"` - ArtistPhoto string `protobuf:"bytes,11,opt,name=artistPhoto,proto3" json:"artistPhoto"` - CreatedAt string `protobuf:"bytes,12,opt,name=createdAt,proto3" json:"createdAt"` - UpdatedAt string `protobuf:"bytes,13,opt,name=updatedAt,proto3" json:"updatedAt"` - IdCardStartDate string `protobuf:"bytes,14,opt,name=idCardStartDate,proto3" json:"idCardStartDate"` - IdCardEndDate string `protobuf:"bytes,15,opt,name=idCardEndDate,proto3" json:"idCardEndDate"` - ArtworkFile string `protobuf:"bytes,16,opt,name=artworkFile,proto3" json:"artworkFile"` - ArtworkName string `protobuf:"bytes,17,opt,name=artworkName,proto3" json:"artworkName"` + Id int32 `protobuf:"varint,1,opt,name=id,proto3" json:"id,omitempty"` + Uuid string `protobuf:"bytes,2,opt,name=uuid,proto3" json:"uuid,omitempty"` + ArtistName string `protobuf:"bytes,3,opt,name=artistName,proto3" json:"artistName,omitempty"` + Gender int32 `protobuf:"varint,4,opt,name=gender,proto3" json:"gender,omitempty"` + PhoneNum string `protobuf:"bytes,5,opt,name=phoneNum,proto3" json:"phoneNum,omitempty"` + IdCard string `protobuf:"bytes,6,opt,name=idCard,proto3" json:"idCard,omitempty"` + Address string `protobuf:"bytes,7,opt,name=address,proto3" json:"address,omitempty"` + Address1 string `protobuf:"bytes,8,opt,name=address1,proto3" json:"address1,omitempty"` + IdCardPhoto string `protobuf:"bytes,9,opt,name=idCardPhoto,proto3" json:"idCardPhoto,omitempty"` + IdCardBackPhoto string `protobuf:"bytes,10,opt,name=idCardBackPhoto,proto3" json:"idCardBackPhoto,omitempty"` + ArtistPhoto string `protobuf:"bytes,11,opt,name=artistPhoto,proto3" json:"artistPhoto,omitempty"` + CreatedAt string `protobuf:"bytes,12,opt,name=createdAt,proto3" json:"createdAt,omitempty"` + UpdatedAt string `protobuf:"bytes,13,opt,name=updatedAt,proto3" json:"updatedAt,omitempty"` + IdCardStartDate string `protobuf:"bytes,14,opt,name=idCardStartDate,proto3" json:"idCardStartDate,omitempty"` + IdCardEndDate string `protobuf:"bytes,15,opt,name=idCardEndDate,proto3" json:"idCardEndDate,omitempty"` + ArtworkFile string `protobuf:"bytes,16,opt,name=artworkFile,proto3" json:"artworkFile,omitempty"` + ArtworkName string `protobuf:"bytes,17,opt,name=artworkName,proto3" json:"artworkName,omitempty"` + PreliminaryRatingNo string `protobuf:"bytes,18,opt,name=PreliminaryRatingNo,proto3" json:"PreliminaryRatingNo,omitempty"` + ReRatingNo string `protobuf:"bytes,19,opt,name=ReRatingNo,proto3" json:"ReRatingNo,omitempty"` + Province string `protobuf:"bytes,20,opt,name=province,proto3" json:"province,omitempty"` + ArtworkType int32 `protobuf:"varint,21,opt,name=artworkType,proto3" json:"artworkType,omitempty"` + ArtworkSize string `protobuf:"bytes,22,opt,name=artworkSize,proto3" json:"artworkSize,omitempty"` } func (x *RegisterInfo) Reset() { @@ -195,13 +200,48 @@ func (x *RegisterInfo) GetArtworkName() string { return "" } +func (x *RegisterInfo) GetPreliminaryRatingNo() string { + if x != nil { + return x.PreliminaryRatingNo + } + return "" +} + +func (x *RegisterInfo) GetReRatingNo() string { + if x != nil { + return x.ReRatingNo + } + return "" +} + +func (x *RegisterInfo) GetProvince() string { + if x != nil { + return x.Province + } + return "" +} + +func (x *RegisterInfo) GetArtworkType() int32 { + if x != nil { + return x.ArtworkType + } + return 0 +} + +func (x *RegisterInfo) GetArtworkSize() string { + if x != nil { + return x.ArtworkSize + } + return "" +} + type SaveRegisterRecordResp struct { state protoimpl.MessageState sizeCache protoimpl.SizeCache unknownFields protoimpl.UnknownFields - Data *RegisterInfo `protobuf:"bytes,1,opt,name=data,proto3" json:"data"` - Msg string `protobuf:"bytes,2,opt,name=msg,proto3" json:"msg"` + Data *RegisterInfo `protobuf:"bytes,1,opt,name=data,proto3" json:"data,omitempty"` + Msg string `protobuf:"bytes,2,opt,name=msg,proto3" json:"msg,omitempty"` } func (x *SaveRegisterRecordResp) Reset() { @@ -253,9 +293,9 @@ type CheckPhoneResp struct { sizeCache protoimpl.SizeCache unknownFields protoimpl.UnknownFields - IsExist bool `protobuf:"varint,1,opt,name=isExist,proto3" json:"isExist"` - Msg string `protobuf:"bytes,2,opt,name=msg,proto3" json:"msg"` - Data *RegisterInfo `protobuf:"bytes,3,opt,name=data,proto3" json:"data"` + IsExist bool `protobuf:"varint,1,opt,name=isExist,proto3" json:"isExist,omitempty"` + Msg string `protobuf:"bytes,2,opt,name=msg,proto3" json:"msg,omitempty"` + Data *RegisterInfo `protobuf:"bytes,3,opt,name=data,proto3" json:"data,omitempty"` } func (x *CheckPhoneResp) Reset() { @@ -314,7 +354,7 @@ type CheckIdCardResp struct { sizeCache protoimpl.SizeCache unknownFields protoimpl.UnknownFields - Msg string `protobuf:"bytes,1,opt,name=msg,proto3" json:"msg"` + Msg string `protobuf:"bytes,1,opt,name=msg,proto3" json:"msg,omitempty"` } func (x *CheckIdCardResp) Reset() { @@ -359,11 +399,11 @@ type RecordListReq struct { sizeCache protoimpl.SizeCache unknownFields protoimpl.UnknownFields - Keyword string `protobuf:"bytes,1,opt,name=keyword,proto3" json:"keyword"` - Page int32 `protobuf:"varint,2,opt,name=page,proto3" json:"page"` - PageSize int32 `protobuf:"varint,3,opt,name=pageSize,proto3" json:"pageSize"` - SortKey int32 `protobuf:"varint,4,opt,name=sortKey,proto3" json:"sortKey"` - Sort string `protobuf:"bytes,5,opt,name=sort,proto3" json:"sort"` + Keyword string `protobuf:"bytes,1,opt,name=keyword,proto3" json:"keyword,omitempty"` + Page int32 `protobuf:"varint,2,opt,name=page,proto3" json:"page,omitempty"` + PageSize int32 `protobuf:"varint,3,opt,name=pageSize,proto3" json:"pageSize,omitempty"` + SortKey int32 `protobuf:"varint,4,opt,name=sortKey,proto3" json:"sortKey,omitempty"` + Sort string `protobuf:"bytes,5,opt,name=sort,proto3" json:"sort,omitempty"` } func (x *RecordListReq) Reset() { @@ -436,11 +476,11 @@ type RecordListResp struct { sizeCache protoimpl.SizeCache unknownFields protoimpl.UnknownFields - Data []*RegisterInfo `protobuf:"bytes,1,rep,name=data,proto3" json:"data"` - Count int32 `protobuf:"varint,2,opt,name=count,proto3" json:"count"` - Page int32 `protobuf:"varint,3,opt,name=page,proto3" json:"page"` - PageSize int32 `protobuf:"varint,4,opt,name=pageSize,proto3" json:"pageSize"` - Msg string `protobuf:"bytes,5,opt,name=msg,proto3" json:"msg"` + Data []*RegisterInfo `protobuf:"bytes,1,rep,name=data,proto3" json:"data,omitempty"` + Count int32 `protobuf:"varint,2,opt,name=count,proto3" json:"count,omitempty"` + Page int32 `protobuf:"varint,3,opt,name=page,proto3" json:"page,omitempty"` + PageSize int32 `protobuf:"varint,4,opt,name=pageSize,proto3" json:"pageSize,omitempty"` + Msg string `protobuf:"bytes,5,opt,name=msg,proto3" json:"msg,omitempty"` } func (x *RecordListResp) Reset() { @@ -549,17 +589,22 @@ type ExportInfo struct { sizeCache protoimpl.SizeCache unknownFields protoimpl.UnknownFields - ArtistName string `protobuf:"bytes,3,opt,name=artistName,proto3" json:"artistName"` - Gender int32 `protobuf:"varint,4,opt,name=gender,proto3" json:"gender"` - PhoneNum string `protobuf:"bytes,5,opt,name=phoneNum,proto3" json:"phoneNum"` - IdCard string `protobuf:"bytes,6,opt,name=idCard,proto3" json:"idCard"` - Address string `protobuf:"bytes,7,opt,name=address,proto3" json:"address"` - IdCardPhoto string `protobuf:"bytes,8,opt,name=idCardPhoto,proto3" json:"idCardPhoto"` - IdCardBackPhoto string `protobuf:"bytes,9,opt,name=idCardBackPhoto,proto3" json:"idCardBackPhoto"` - ArtistPhoto string `protobuf:"bytes,10,opt,name=artistPhoto,proto3" json:"artistPhoto"` - CreatedAt string `protobuf:"bytes,11,opt,name=createdAt,proto3" json:"createdAt"` - UpdatedAt string `protobuf:"bytes,12,opt,name=updatedAt,proto3" json:"updatedAt"` - ArtworkName string `protobuf:"bytes,13,opt,name=artworkName,proto3" json:"artworkName"` + ArtistName string `protobuf:"bytes,3,opt,name=artistName,proto3" json:"artistName,omitempty"` + Gender int32 `protobuf:"varint,4,opt,name=gender,proto3" json:"gender,omitempty"` + PhoneNum string `protobuf:"bytes,5,opt,name=phoneNum,proto3" json:"phoneNum,omitempty"` + IdCard string `protobuf:"bytes,6,opt,name=idCard,proto3" json:"idCard,omitempty"` + Address string `protobuf:"bytes,7,opt,name=address,proto3" json:"address,omitempty"` + IdCardPhoto string `protobuf:"bytes,8,opt,name=idCardPhoto,proto3" json:"idCardPhoto,omitempty"` + IdCardBackPhoto string `protobuf:"bytes,9,opt,name=idCardBackPhoto,proto3" json:"idCardBackPhoto,omitempty"` + ArtistPhoto string `protobuf:"bytes,10,opt,name=artistPhoto,proto3" json:"artistPhoto,omitempty"` + CreatedAt string `protobuf:"bytes,11,opt,name=createdAt,proto3" json:"createdAt,omitempty"` + UpdatedAt string `protobuf:"bytes,12,opt,name=updatedAt,proto3" json:"updatedAt,omitempty"` + ArtworkName string `protobuf:"bytes,13,opt,name=artworkName,proto3" json:"artworkName,omitempty"` + PreliminaryRatingNo string `protobuf:"bytes,14,opt,name=PreliminaryRatingNo,proto3" json:"PreliminaryRatingNo,omitempty"` + ReRatingNo string `protobuf:"bytes,15,opt,name=ReRatingNo,proto3" json:"ReRatingNo,omitempty"` + Province string `protobuf:"bytes,16,opt,name=province,proto3" json:"province,omitempty"` + ArtworkType int32 `protobuf:"varint,17,opt,name=artworkType,proto3" json:"artworkType,omitempty"` + ArtworkSize string `protobuf:"bytes,18,opt,name=artworkSize,proto3" json:"artworkSize,omitempty"` } func (x *ExportInfo) Reset() { @@ -669,13 +714,48 @@ func (x *ExportInfo) GetArtworkName() string { return "" } +func (x *ExportInfo) GetPreliminaryRatingNo() string { + if x != nil { + return x.PreliminaryRatingNo + } + return "" +} + +func (x *ExportInfo) GetReRatingNo() string { + if x != nil { + return x.ReRatingNo + } + return "" +} + +func (x *ExportInfo) GetProvince() string { + if x != nil { + return x.Province + } + return "" +} + +func (x *ExportInfo) GetArtworkType() int32 { + if x != nil { + return x.ArtworkType + } + return 0 +} + +func (x *ExportInfo) GetArtworkSize() string { + if x != nil { + return x.ArtworkSize + } + return "" +} + type ExportRecordResp struct { state protoimpl.MessageState sizeCache protoimpl.SizeCache unknownFields protoimpl.UnknownFields - Data []*ExportInfo `protobuf:"bytes,1,rep,name=data,proto3" json:"data"` - Msg string `protobuf:"bytes,2,opt,name=msg,proto3" json:"msg"` + Data []*ExportInfo `protobuf:"bytes,1,rep,name=data,proto3" json:"data,omitempty"` + Msg string `protobuf:"bytes,2,opt,name=msg,proto3" json:"msg,omitempty"` } func (x *ExportRecordResp) Reset() { @@ -729,7 +809,7 @@ var file_pb_exhibition_proto_rawDesc = []byte{ 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x12, 0x0a, 0x65, 0x78, 0x68, 0x69, 0x62, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x1a, 0x12, 0x70, 0x62, 0x2f, 0x76, 0x61, 0x6c, 0x69, 0x64, 0x61, 0x74, 0x6f, 0x72, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x13, 0x70, 0x62, 0x2f, 0x64, 0x65, 0x73, 0x63, 0x72, 0x69, - 0x70, 0x74, 0x6f, 0x72, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x22, 0x92, 0x04, 0x0a, 0x0c, 0x52, + 0x70, 0x74, 0x6f, 0x72, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x22, 0xc4, 0x05, 0x0a, 0x0c, 0x52, 0x65, 0x67, 0x69, 0x73, 0x74, 0x65, 0x72, 0x49, 0x6e, 0x66, 0x6f, 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x02, 0x69, 0x64, 0x12, 0x12, 0x0a, 0x04, 0x75, 0x75, 0x69, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x75, 0x75, 0x69, 0x64, 0x12, @@ -762,95 +842,117 @@ var file_pb_exhibition_proto_rawDesc = []byte{ 0x72, 0x74, 0x77, 0x6f, 0x72, 0x6b, 0x46, 0x69, 0x6c, 0x65, 0x18, 0x10, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0b, 0x61, 0x72, 0x74, 0x77, 0x6f, 0x72, 0x6b, 0x46, 0x69, 0x6c, 0x65, 0x12, 0x20, 0x0a, 0x0b, 0x61, 0x72, 0x74, 0x77, 0x6f, 0x72, 0x6b, 0x4e, 0x61, 0x6d, 0x65, 0x18, 0x11, 0x20, 0x01, - 0x28, 0x09, 0x52, 0x0b, 0x61, 0x72, 0x74, 0x77, 0x6f, 0x72, 0x6b, 0x4e, 0x61, 0x6d, 0x65, 0x22, - 0x58, 0x0a, 0x16, 0x53, 0x61, 0x76, 0x65, 0x52, 0x65, 0x67, 0x69, 0x73, 0x74, 0x65, 0x72, 0x52, - 0x65, 0x63, 0x6f, 0x72, 0x64, 0x52, 0x65, 0x73, 0x70, 0x12, 0x2c, 0x0a, 0x04, 0x64, 0x61, 0x74, - 0x61, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 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, 0x52, 0x04, 0x64, 0x61, 0x74, 0x61, 0x12, 0x10, 0x0a, 0x03, 0x6d, 0x73, 0x67, 0x18, 0x02, - 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x6d, 0x73, 0x67, 0x22, 0x6a, 0x0a, 0x0e, 0x43, 0x68, 0x65, - 0x63, 0x6b, 0x50, 0x68, 0x6f, 0x6e, 0x65, 0x52, 0x65, 0x73, 0x70, 0x12, 0x18, 0x0a, 0x07, 0x69, - 0x73, 0x45, 0x78, 0x69, 0x73, 0x74, 0x18, 0x01, 0x20, 0x01, 0x28, 0x08, 0x52, 0x07, 0x69, 0x73, - 0x45, 0x78, 0x69, 0x73, 0x74, 0x12, 0x10, 0x0a, 0x03, 0x6d, 0x73, 0x67, 0x18, 0x02, 0x20, 0x01, - 0x28, 0x09, 0x52, 0x03, 0x6d, 0x73, 0x67, 0x12, 0x2c, 0x0a, 0x04, 0x64, 0x61, 0x74, 0x61, 0x18, - 0x03, 0x20, 0x01, 0x28, 0x0b, 0x32, 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, 0x52, - 0x04, 0x64, 0x61, 0x74, 0x61, 0x22, 0x23, 0x0a, 0x0f, 0x43, 0x68, 0x65, 0x63, 0x6b, 0x49, 0x64, - 0x43, 0x61, 0x72, 0x64, 0x52, 0x65, 0x73, 0x70, 0x12, 0x10, 0x0a, 0x03, 0x6d, 0x73, 0x67, 0x18, - 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x6d, 0x73, 0x67, 0x22, 0x87, 0x01, 0x0a, 0x0d, 0x52, - 0x65, 0x63, 0x6f, 0x72, 0x64, 0x4c, 0x69, 0x73, 0x74, 0x52, 0x65, 0x71, 0x12, 0x18, 0x0a, 0x07, - 0x6b, 0x65, 0x79, 0x77, 0x6f, 0x72, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x07, 0x6b, - 0x65, 0x79, 0x77, 0x6f, 0x72, 0x64, 0x12, 0x12, 0x0a, 0x04, 0x70, 0x61, 0x67, 0x65, 0x18, 0x02, - 0x20, 0x01, 0x28, 0x05, 0x52, 0x04, 0x70, 0x61, 0x67, 0x65, 0x12, 0x1a, 0x0a, 0x08, 0x70, 0x61, - 0x67, 0x65, 0x53, 0x69, 0x7a, 0x65, 0x18, 0x03, 0x20, 0x01, 0x28, 0x05, 0x52, 0x08, 0x70, 0x61, - 0x67, 0x65, 0x53, 0x69, 0x7a, 0x65, 0x12, 0x18, 0x0a, 0x07, 0x73, 0x6f, 0x72, 0x74, 0x4b, 0x65, - 0x79, 0x18, 0x04, 0x20, 0x01, 0x28, 0x05, 0x52, 0x07, 0x73, 0x6f, 0x72, 0x74, 0x4b, 0x65, 0x79, - 0x12, 0x12, 0x0a, 0x04, 0x73, 0x6f, 0x72, 0x74, 0x18, 0x05, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, - 0x73, 0x6f, 0x72, 0x74, 0x22, 0x96, 0x01, 0x0a, 0x0e, 0x52, 0x65, 0x63, 0x6f, 0x72, 0x64, 0x4c, - 0x69, 0x73, 0x74, 0x52, 0x65, 0x73, 0x70, 0x12, 0x2c, 0x0a, 0x04, 0x64, 0x61, 0x74, 0x61, 0x18, - 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 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, 0x52, - 0x04, 0x64, 0x61, 0x74, 0x61, 0x12, 0x14, 0x0a, 0x05, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x18, 0x02, - 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x12, 0x12, 0x0a, 0x04, 0x70, - 0x61, 0x67, 0x65, 0x18, 0x03, 0x20, 0x01, 0x28, 0x05, 0x52, 0x04, 0x70, 0x61, 0x67, 0x65, 0x12, - 0x1a, 0x0a, 0x08, 0x70, 0x61, 0x67, 0x65, 0x53, 0x69, 0x7a, 0x65, 0x18, 0x04, 0x20, 0x01, 0x28, - 0x05, 0x52, 0x08, 0x70, 0x61, 0x67, 0x65, 0x53, 0x69, 0x7a, 0x65, 0x12, 0x10, 0x0a, 0x03, 0x6d, - 0x73, 0x67, 0x18, 0x05, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x6d, 0x73, 0x67, 0x22, 0x11, 0x0a, - 0x0f, 0x45, 0x78, 0x70, 0x6f, 0x72, 0x74, 0x52, 0x65, 0x63, 0x6f, 0x72, 0x64, 0x52, 0x65, 0x71, - 0x22, 0xde, 0x02, 0x0a, 0x0a, 0x45, 0x78, 0x70, 0x6f, 0x72, 0x74, 0x49, 0x6e, 0x66, 0x6f, 0x12, - 0x1e, 0x0a, 0x0a, 0x61, 0x72, 0x74, 0x69, 0x73, 0x74, 0x4e, 0x61, 0x6d, 0x65, 0x18, 0x03, 0x20, - 0x01, 0x28, 0x09, 0x52, 0x0a, 0x61, 0x72, 0x74, 0x69, 0x73, 0x74, 0x4e, 0x61, 0x6d, 0x65, 0x12, - 0x16, 0x0a, 0x06, 0x67, 0x65, 0x6e, 0x64, 0x65, 0x72, 0x18, 0x04, 0x20, 0x01, 0x28, 0x05, 0x52, - 0x06, 0x67, 0x65, 0x6e, 0x64, 0x65, 0x72, 0x12, 0x1a, 0x0a, 0x08, 0x70, 0x68, 0x6f, 0x6e, 0x65, - 0x4e, 0x75, 0x6d, 0x18, 0x05, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x70, 0x68, 0x6f, 0x6e, 0x65, - 0x4e, 0x75, 0x6d, 0x12, 0x16, 0x0a, 0x06, 0x69, 0x64, 0x43, 0x61, 0x72, 0x64, 0x18, 0x06, 0x20, - 0x01, 0x28, 0x09, 0x52, 0x06, 0x69, 0x64, 0x43, 0x61, 0x72, 0x64, 0x12, 0x18, 0x0a, 0x07, 0x61, - 0x64, 0x64, 0x72, 0x65, 0x73, 0x73, 0x18, 0x07, 0x20, 0x01, 0x28, 0x09, 0x52, 0x07, 0x61, 0x64, - 0x64, 0x72, 0x65, 0x73, 0x73, 0x12, 0x20, 0x0a, 0x0b, 0x69, 0x64, 0x43, 0x61, 0x72, 0x64, 0x50, - 0x68, 0x6f, 0x74, 0x6f, 0x18, 0x08, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0b, 0x69, 0x64, 0x43, 0x61, - 0x72, 0x64, 0x50, 0x68, 0x6f, 0x74, 0x6f, 0x12, 0x28, 0x0a, 0x0f, 0x69, 0x64, 0x43, 0x61, 0x72, - 0x64, 0x42, 0x61, 0x63, 0x6b, 0x50, 0x68, 0x6f, 0x74, 0x6f, 0x18, 0x09, 0x20, 0x01, 0x28, 0x09, - 0x52, 0x0f, 0x69, 0x64, 0x43, 0x61, 0x72, 0x64, 0x42, 0x61, 0x63, 0x6b, 0x50, 0x68, 0x6f, 0x74, - 0x6f, 0x12, 0x20, 0x0a, 0x0b, 0x61, 0x72, 0x74, 0x69, 0x73, 0x74, 0x50, 0x68, 0x6f, 0x74, 0x6f, - 0x18, 0x0a, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0b, 0x61, 0x72, 0x74, 0x69, 0x73, 0x74, 0x50, 0x68, - 0x6f, 0x74, 0x6f, 0x12, 0x1c, 0x0a, 0x09, 0x63, 0x72, 0x65, 0x61, 0x74, 0x65, 0x64, 0x41, 0x74, - 0x18, 0x0b, 0x20, 0x01, 0x28, 0x09, 0x52, 0x09, 0x63, 0x72, 0x65, 0x61, 0x74, 0x65, 0x64, 0x41, - 0x74, 0x12, 0x1c, 0x0a, 0x09, 0x75, 0x70, 0x64, 0x61, 0x74, 0x65, 0x64, 0x41, 0x74, 0x18, 0x0c, - 0x20, 0x01, 0x28, 0x09, 0x52, 0x09, 0x75, 0x70, 0x64, 0x61, 0x74, 0x65, 0x64, 0x41, 0x74, 0x12, - 0x20, 0x0a, 0x0b, 0x61, 0x72, 0x74, 0x77, 0x6f, 0x72, 0x6b, 0x4e, 0x61, 0x6d, 0x65, 0x18, 0x0d, - 0x20, 0x01, 0x28, 0x09, 0x52, 0x0b, 0x61, 0x72, 0x74, 0x77, 0x6f, 0x72, 0x6b, 0x4e, 0x61, 0x6d, - 0x65, 0x22, 0x50, 0x0a, 0x10, 0x45, 0x78, 0x70, 0x6f, 0x72, 0x74, 0x52, 0x65, 0x63, 0x6f, 0x72, - 0x64, 0x52, 0x65, 0x73, 0x70, 0x12, 0x2a, 0x0a, 0x04, 0x64, 0x61, 0x74, 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, 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, 0x2e, 0x65, 0x78, 0x68, - 0x69, 0x62, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x2e, 0x43, 0x68, 0x65, 0x63, 0x6b, 0x50, 0x68, 0x6f, - 0x6e, 0x65, 0x52, 0x65, 0x73, 0x70, 0x12, 0x52, 0x0a, 0x12, 0x53, 0x61, 0x76, 0x65, 0x52, 0x65, - 0x67, 0x69, 0x73, 0x74, 0x65, 0x72, 0x52, 0x65, 0x63, 0x6f, 0x72, 0x64, 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, 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, 0x12, 0x4b, 0x0a, 0x12, 0x52, 0x65, - 0x67, 0x69, 0x73, 0x74, 0x65, 0x72, 0x52, 0x65, 0x63, 0x6f, 0x72, 0x64, 0x4c, 0x69, 0x73, 0x74, - 0x12, 0x19, 0x2e, 0x65, 0x78, 0x68, 0x69, 0x62, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x2e, 0x52, 0x65, - 0x63, 0x6f, 0x72, 0x64, 0x4c, 0x69, 0x73, 0x74, 0x52, 0x65, 0x71, 0x1a, 0x1a, 0x2e, 0x65, 0x78, - 0x68, 0x69, 0x62, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x2e, 0x52, 0x65, 0x63, 0x6f, 0x72, 0x64, 0x4c, - 0x69, 0x73, 0x74, 0x52, 0x65, 0x73, 0x70, 0x12, 0x51, 0x0a, 0x14, 0x45, 0x78, 0x70, 0x6f, 0x72, - 0x74, 0x52, 0x65, 0x67, 0x69, 0x73, 0x74, 0x65, 0x72, 0x52, 0x65, 0x63, 0x6f, 0x72, 0x64, 0x12, - 0x1b, 0x2e, 0x65, 0x78, 0x68, 0x69, 0x62, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x2e, 0x45, 0x78, 0x70, - 0x6f, 0x72, 0x74, 0x52, 0x65, 0x63, 0x6f, 0x72, 0x64, 0x52, 0x65, 0x71, 0x1a, 0x1c, 0x2e, 0x65, - 0x78, 0x68, 0x69, 0x62, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x2e, 0x45, 0x78, 0x70, 0x6f, 0x72, 0x74, - 0x52, 0x65, 0x63, 0x6f, 0x72, 0x64, 0x52, 0x65, 0x73, 0x70, 0x12, 0x44, 0x0a, 0x0b, 0x43, 0x68, - 0x65, 0x63, 0x6b, 0x49, 0x64, 0x43, 0x61, 0x72, 0x64, 0x12, 0x18, 0x2e, 0x65, 0x78, 0x68, 0x69, + 0x28, 0x09, 0x52, 0x0b, 0x61, 0x72, 0x74, 0x77, 0x6f, 0x72, 0x6b, 0x4e, 0x61, 0x6d, 0x65, 0x12, + 0x30, 0x0a, 0x13, 0x50, 0x72, 0x65, 0x6c, 0x69, 0x6d, 0x69, 0x6e, 0x61, 0x72, 0x79, 0x52, 0x61, + 0x74, 0x69, 0x6e, 0x67, 0x4e, 0x6f, 0x18, 0x12, 0x20, 0x01, 0x28, 0x09, 0x52, 0x13, 0x50, 0x72, + 0x65, 0x6c, 0x69, 0x6d, 0x69, 0x6e, 0x61, 0x72, 0x79, 0x52, 0x61, 0x74, 0x69, 0x6e, 0x67, 0x4e, + 0x6f, 0x12, 0x1e, 0x0a, 0x0a, 0x52, 0x65, 0x52, 0x61, 0x74, 0x69, 0x6e, 0x67, 0x4e, 0x6f, 0x18, + 0x13, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0a, 0x52, 0x65, 0x52, 0x61, 0x74, 0x69, 0x6e, 0x67, 0x4e, + 0x6f, 0x12, 0x1a, 0x0a, 0x08, 0x70, 0x72, 0x6f, 0x76, 0x69, 0x6e, 0x63, 0x65, 0x18, 0x14, 0x20, + 0x01, 0x28, 0x09, 0x52, 0x08, 0x70, 0x72, 0x6f, 0x76, 0x69, 0x6e, 0x63, 0x65, 0x12, 0x20, 0x0a, + 0x0b, 0x61, 0x72, 0x74, 0x77, 0x6f, 0x72, 0x6b, 0x54, 0x79, 0x70, 0x65, 0x18, 0x15, 0x20, 0x01, + 0x28, 0x05, 0x52, 0x0b, 0x61, 0x72, 0x74, 0x77, 0x6f, 0x72, 0x6b, 0x54, 0x79, 0x70, 0x65, 0x12, + 0x20, 0x0a, 0x0b, 0x61, 0x72, 0x74, 0x77, 0x6f, 0x72, 0x6b, 0x53, 0x69, 0x7a, 0x65, 0x18, 0x16, + 0x20, 0x01, 0x28, 0x09, 0x52, 0x0b, 0x61, 0x72, 0x74, 0x77, 0x6f, 0x72, 0x6b, 0x53, 0x69, 0x7a, + 0x65, 0x22, 0x58, 0x0a, 0x16, 0x53, 0x61, 0x76, 0x65, 0x52, 0x65, 0x67, 0x69, 0x73, 0x74, 0x65, + 0x72, 0x52, 0x65, 0x63, 0x6f, 0x72, 0x64, 0x52, 0x65, 0x73, 0x70, 0x12, 0x2c, 0x0a, 0x04, 0x64, + 0x61, 0x74, 0x61, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 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, 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, - 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, + 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, 0x22, 0x6a, 0x0a, 0x0e, 0x43, + 0x68, 0x65, 0x63, 0x6b, 0x50, 0x68, 0x6f, 0x6e, 0x65, 0x52, 0x65, 0x73, 0x70, 0x12, 0x18, 0x0a, + 0x07, 0x69, 0x73, 0x45, 0x78, 0x69, 0x73, 0x74, 0x18, 0x01, 0x20, 0x01, 0x28, 0x08, 0x52, 0x07, + 0x69, 0x73, 0x45, 0x78, 0x69, 0x73, 0x74, 0x12, 0x10, 0x0a, 0x03, 0x6d, 0x73, 0x67, 0x18, 0x02, + 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x6d, 0x73, 0x67, 0x12, 0x2c, 0x0a, 0x04, 0x64, 0x61, 0x74, + 0x61, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0b, 0x32, 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, 0x52, 0x04, 0x64, 0x61, 0x74, 0x61, 0x22, 0x23, 0x0a, 0x0f, 0x43, 0x68, 0x65, 0x63, 0x6b, + 0x49, 0x64, 0x43, 0x61, 0x72, 0x64, 0x52, 0x65, 0x73, 0x70, 0x12, 0x10, 0x0a, 0x03, 0x6d, 0x73, + 0x67, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x6d, 0x73, 0x67, 0x22, 0x87, 0x01, 0x0a, + 0x0d, 0x52, 0x65, 0x63, 0x6f, 0x72, 0x64, 0x4c, 0x69, 0x73, 0x74, 0x52, 0x65, 0x71, 0x12, 0x18, + 0x0a, 0x07, 0x6b, 0x65, 0x79, 0x77, 0x6f, 0x72, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, + 0x07, 0x6b, 0x65, 0x79, 0x77, 0x6f, 0x72, 0x64, 0x12, 0x12, 0x0a, 0x04, 0x70, 0x61, 0x67, 0x65, + 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x04, 0x70, 0x61, 0x67, 0x65, 0x12, 0x1a, 0x0a, 0x08, + 0x70, 0x61, 0x67, 0x65, 0x53, 0x69, 0x7a, 0x65, 0x18, 0x03, 0x20, 0x01, 0x28, 0x05, 0x52, 0x08, + 0x70, 0x61, 0x67, 0x65, 0x53, 0x69, 0x7a, 0x65, 0x12, 0x18, 0x0a, 0x07, 0x73, 0x6f, 0x72, 0x74, + 0x4b, 0x65, 0x79, 0x18, 0x04, 0x20, 0x01, 0x28, 0x05, 0x52, 0x07, 0x73, 0x6f, 0x72, 0x74, 0x4b, + 0x65, 0x79, 0x12, 0x12, 0x0a, 0x04, 0x73, 0x6f, 0x72, 0x74, 0x18, 0x05, 0x20, 0x01, 0x28, 0x09, + 0x52, 0x04, 0x73, 0x6f, 0x72, 0x74, 0x22, 0x96, 0x01, 0x0a, 0x0e, 0x52, 0x65, 0x63, 0x6f, 0x72, + 0x64, 0x4c, 0x69, 0x73, 0x74, 0x52, 0x65, 0x73, 0x70, 0x12, 0x2c, 0x0a, 0x04, 0x64, 0x61, 0x74, + 0x61, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 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, 0x52, 0x04, 0x64, 0x61, 0x74, 0x61, 0x12, 0x14, 0x0a, 0x05, 0x63, 0x6f, 0x75, 0x6e, 0x74, + 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x12, 0x12, 0x0a, + 0x04, 0x70, 0x61, 0x67, 0x65, 0x18, 0x03, 0x20, 0x01, 0x28, 0x05, 0x52, 0x04, 0x70, 0x61, 0x67, + 0x65, 0x12, 0x1a, 0x0a, 0x08, 0x70, 0x61, 0x67, 0x65, 0x53, 0x69, 0x7a, 0x65, 0x18, 0x04, 0x20, + 0x01, 0x28, 0x05, 0x52, 0x08, 0x70, 0x61, 0x67, 0x65, 0x53, 0x69, 0x7a, 0x65, 0x12, 0x10, 0x0a, + 0x03, 0x6d, 0x73, 0x67, 0x18, 0x05, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x6d, 0x73, 0x67, 0x22, + 0x11, 0x0a, 0x0f, 0x45, 0x78, 0x70, 0x6f, 0x72, 0x74, 0x52, 0x65, 0x63, 0x6f, 0x72, 0x64, 0x52, + 0x65, 0x71, 0x22, 0x90, 0x04, 0x0a, 0x0a, 0x45, 0x78, 0x70, 0x6f, 0x72, 0x74, 0x49, 0x6e, 0x66, + 0x6f, 0x12, 0x1e, 0x0a, 0x0a, 0x61, 0x72, 0x74, 0x69, 0x73, 0x74, 0x4e, 0x61, 0x6d, 0x65, 0x18, + 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0a, 0x61, 0x72, 0x74, 0x69, 0x73, 0x74, 0x4e, 0x61, 0x6d, + 0x65, 0x12, 0x16, 0x0a, 0x06, 0x67, 0x65, 0x6e, 0x64, 0x65, 0x72, 0x18, 0x04, 0x20, 0x01, 0x28, + 0x05, 0x52, 0x06, 0x67, 0x65, 0x6e, 0x64, 0x65, 0x72, 0x12, 0x1a, 0x0a, 0x08, 0x70, 0x68, 0x6f, + 0x6e, 0x65, 0x4e, 0x75, 0x6d, 0x18, 0x05, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x70, 0x68, 0x6f, + 0x6e, 0x65, 0x4e, 0x75, 0x6d, 0x12, 0x16, 0x0a, 0x06, 0x69, 0x64, 0x43, 0x61, 0x72, 0x64, 0x18, + 0x06, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x69, 0x64, 0x43, 0x61, 0x72, 0x64, 0x12, 0x18, 0x0a, + 0x07, 0x61, 0x64, 0x64, 0x72, 0x65, 0x73, 0x73, 0x18, 0x07, 0x20, 0x01, 0x28, 0x09, 0x52, 0x07, + 0x61, 0x64, 0x64, 0x72, 0x65, 0x73, 0x73, 0x12, 0x20, 0x0a, 0x0b, 0x69, 0x64, 0x43, 0x61, 0x72, + 0x64, 0x50, 0x68, 0x6f, 0x74, 0x6f, 0x18, 0x08, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0b, 0x69, 0x64, + 0x43, 0x61, 0x72, 0x64, 0x50, 0x68, 0x6f, 0x74, 0x6f, 0x12, 0x28, 0x0a, 0x0f, 0x69, 0x64, 0x43, + 0x61, 0x72, 0x64, 0x42, 0x61, 0x63, 0x6b, 0x50, 0x68, 0x6f, 0x74, 0x6f, 0x18, 0x09, 0x20, 0x01, + 0x28, 0x09, 0x52, 0x0f, 0x69, 0x64, 0x43, 0x61, 0x72, 0x64, 0x42, 0x61, 0x63, 0x6b, 0x50, 0x68, + 0x6f, 0x74, 0x6f, 0x12, 0x20, 0x0a, 0x0b, 0x61, 0x72, 0x74, 0x69, 0x73, 0x74, 0x50, 0x68, 0x6f, + 0x74, 0x6f, 0x18, 0x0a, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0b, 0x61, 0x72, 0x74, 0x69, 0x73, 0x74, + 0x50, 0x68, 0x6f, 0x74, 0x6f, 0x12, 0x1c, 0x0a, 0x09, 0x63, 0x72, 0x65, 0x61, 0x74, 0x65, 0x64, + 0x41, 0x74, 0x18, 0x0b, 0x20, 0x01, 0x28, 0x09, 0x52, 0x09, 0x63, 0x72, 0x65, 0x61, 0x74, 0x65, + 0x64, 0x41, 0x74, 0x12, 0x1c, 0x0a, 0x09, 0x75, 0x70, 0x64, 0x61, 0x74, 0x65, 0x64, 0x41, 0x74, + 0x18, 0x0c, 0x20, 0x01, 0x28, 0x09, 0x52, 0x09, 0x75, 0x70, 0x64, 0x61, 0x74, 0x65, 0x64, 0x41, + 0x74, 0x12, 0x20, 0x0a, 0x0b, 0x61, 0x72, 0x74, 0x77, 0x6f, 0x72, 0x6b, 0x4e, 0x61, 0x6d, 0x65, + 0x18, 0x0d, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0b, 0x61, 0x72, 0x74, 0x77, 0x6f, 0x72, 0x6b, 0x4e, + 0x61, 0x6d, 0x65, 0x12, 0x30, 0x0a, 0x13, 0x50, 0x72, 0x65, 0x6c, 0x69, 0x6d, 0x69, 0x6e, 0x61, + 0x72, 0x79, 0x52, 0x61, 0x74, 0x69, 0x6e, 0x67, 0x4e, 0x6f, 0x18, 0x0e, 0x20, 0x01, 0x28, 0x09, + 0x52, 0x13, 0x50, 0x72, 0x65, 0x6c, 0x69, 0x6d, 0x69, 0x6e, 0x61, 0x72, 0x79, 0x52, 0x61, 0x74, + 0x69, 0x6e, 0x67, 0x4e, 0x6f, 0x12, 0x1e, 0x0a, 0x0a, 0x52, 0x65, 0x52, 0x61, 0x74, 0x69, 0x6e, + 0x67, 0x4e, 0x6f, 0x18, 0x0f, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0a, 0x52, 0x65, 0x52, 0x61, 0x74, + 0x69, 0x6e, 0x67, 0x4e, 0x6f, 0x12, 0x1a, 0x0a, 0x08, 0x70, 0x72, 0x6f, 0x76, 0x69, 0x6e, 0x63, + 0x65, 0x18, 0x10, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x70, 0x72, 0x6f, 0x76, 0x69, 0x6e, 0x63, + 0x65, 0x12, 0x20, 0x0a, 0x0b, 0x61, 0x72, 0x74, 0x77, 0x6f, 0x72, 0x6b, 0x54, 0x79, 0x70, 0x65, + 0x18, 0x11, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0b, 0x61, 0x72, 0x74, 0x77, 0x6f, 0x72, 0x6b, 0x54, + 0x79, 0x70, 0x65, 0x12, 0x20, 0x0a, 0x0b, 0x61, 0x72, 0x74, 0x77, 0x6f, 0x72, 0x6b, 0x53, 0x69, + 0x7a, 0x65, 0x18, 0x12, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0b, 0x61, 0x72, 0x74, 0x77, 0x6f, 0x72, + 0x6b, 0x53, 0x69, 0x7a, 0x65, 0x22, 0x50, 0x0a, 0x10, 0x45, 0x78, 0x70, 0x6f, 0x72, 0x74, 0x52, + 0x65, 0x63, 0x6f, 0x72, 0x64, 0x52, 0x65, 0x73, 0x70, 0x12, 0x2a, 0x0a, 0x04, 0x64, 0x61, 0x74, + 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, 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, + 0x2e, 0x65, 0x78, 0x68, 0x69, 0x62, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x2e, 0x43, 0x68, 0x65, 0x63, + 0x6b, 0x50, 0x68, 0x6f, 0x6e, 0x65, 0x52, 0x65, 0x73, 0x70, 0x12, 0x52, 0x0a, 0x12, 0x53, 0x61, + 0x76, 0x65, 0x52, 0x65, 0x67, 0x69, 0x73, 0x74, 0x65, 0x72, 0x52, 0x65, 0x63, 0x6f, 0x72, 0x64, + 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, 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, 0x12, 0x4b, + 0x0a, 0x12, 0x52, 0x65, 0x67, 0x69, 0x73, 0x74, 0x65, 0x72, 0x52, 0x65, 0x63, 0x6f, 0x72, 0x64, + 0x4c, 0x69, 0x73, 0x74, 0x12, 0x19, 0x2e, 0x65, 0x78, 0x68, 0x69, 0x62, 0x69, 0x74, 0x69, 0x6f, + 0x6e, 0x2e, 0x52, 0x65, 0x63, 0x6f, 0x72, 0x64, 0x4c, 0x69, 0x73, 0x74, 0x52, 0x65, 0x71, 0x1a, + 0x1a, 0x2e, 0x65, 0x78, 0x68, 0x69, 0x62, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x2e, 0x52, 0x65, 0x63, + 0x6f, 0x72, 0x64, 0x4c, 0x69, 0x73, 0x74, 0x52, 0x65, 0x73, 0x70, 0x12, 0x51, 0x0a, 0x14, 0x45, + 0x78, 0x70, 0x6f, 0x72, 0x74, 0x52, 0x65, 0x67, 0x69, 0x73, 0x74, 0x65, 0x72, 0x52, 0x65, 0x63, + 0x6f, 0x72, 0x64, 0x12, 0x1b, 0x2e, 0x65, 0x78, 0x68, 0x69, 0x62, 0x69, 0x74, 0x69, 0x6f, 0x6e, + 0x2e, 0x45, 0x78, 0x70, 0x6f, 0x72, 0x74, 0x52, 0x65, 0x63, 0x6f, 0x72, 0x64, 0x52, 0x65, 0x71, + 0x1a, 0x1c, 0x2e, 0x65, 0x78, 0x68, 0x69, 0x62, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x2e, 0x45, 0x78, + 0x70, 0x6f, 0x72, 0x74, 0x52, 0x65, 0x63, 0x6f, 0x72, 0x64, 0x52, 0x65, 0x73, 0x70, 0x12, 0x44, + 0x0a, 0x0b, 0x43, 0x68, 0x65, 0x63, 0x6b, 0x49, 0x64, 0x43, 0x61, 0x72, 0x64, 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, 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, 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 ( diff --git a/pkg/db/mysql.go b/pkg/db/mysql.go index d99b2b2..48629b9 100644 --- a/pkg/db/mysql.go +++ b/pkg/db/mysql.go @@ -2,12 +2,14 @@ package db import ( "exhibition-register/internal/model" + "fmt" + "time" + "github.com/gin-gonic/gin" "gorm.io/driver/mysql" "gorm.io/gorm" "gorm.io/gorm/logger" "gorm.io/gorm/schema" - "time" ) func loadMysqlConn(conn string) *gorm.DB { @@ -58,6 +60,11 @@ func addColumn(db *gorm.DB, dst interface{}, column string) { } func addTable(db *gorm.DB, dst interface{}) { - + if db.Migrator().HasTable(dst) == false { + if err := db.Migrator().CreateTable(dst); err != nil { + fmt.Println(err) + return + } + } return }