From 9b87d1601197734943861a7f989e1ad57cfe3e1d Mon Sep 17 00:00:00 2001 From: dorlolo <428192774@qq.com> Date: Fri, 17 Mar 2023 11:42:13 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=A7=86=E9=A2=91=E8=A1=A5?= =?UTF-8?q?=E5=85=85=E5=88=97=E8=A1=A8=E7=9A=84=E5=AD=97=E6=AE=B5=E7=B1=BB?= =?UTF-8?q?=E5=9E=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- cmd/internal/logic/artistinfo_artshowVideo.go | 6 ++++-- pb/artistinfoArtshow.proto | 4 ++-- pb/artistinfoArtshow/artistinfoArtshow.pb.go | 16 ++++++++-------- 3 files changed, 14 insertions(+), 12 deletions(-) diff --git a/cmd/internal/logic/artistinfo_artshowVideo.go b/cmd/internal/logic/artistinfo_artshowVideo.go index 110a001..6d6ebf5 100644 --- a/cmd/internal/logic/artistinfo_artshowVideo.go +++ b/cmd/internal/logic/artistinfo_artshowVideo.go @@ -8,9 +8,11 @@ package logic import ( "errors" + "github.com/fonchain/fonchain-artistinfo/cmd/internal/dao" "github.com/fonchain/fonchain-artistinfo/cmd/model" "github.com/fonchain/fonchain-artistinfo/pb/artistinfoArtshow" + "github.com/fonchain/fonchain-artistinfo/pkg/util/stime" "google.golang.org/protobuf/types/known/emptypb" "gorm.io/gorm" ) @@ -91,8 +93,8 @@ func (a ArtshowVideoLogic) GetArtshowVideoList(request *artistinfoArtshow.GetArt AuditStatus: int64(v.AuditStatus), AuditMark1: v.AuditMark1, AuditMark2: v.AuditMark2, - CreatedAt: v.CreatedAt.Unix(), - UpdatedAt: v.UpdatedAt.Unix(), + CreatedAt: stime.TimeToString(v.CreatedAt, stime.Format_Normal_YMDhms), + UpdatedAt: stime.TimeToString(v.UpdatedAt, stime.Format_Normal_YMDhms), DeletedAt: int64(v.DeletedAt), Status: v.Status, ArtistName: v.ArtistName, diff --git a/pb/artistinfoArtshow.proto b/pb/artistinfoArtshow.proto index 3e95e9f..801e869 100644 --- a/pb/artistinfoArtshow.proto +++ b/pb/artistinfoArtshow.proto @@ -68,8 +68,8 @@ message ArtshowVideoInfo { int64 auditStatus =5; string auditMark1 =6; string auditMark2 =7; - int64 createdAt=8; - int64 updatedAt=9; + string createdAt=8; + string updatedAt=9; int64 deletedAt=10; string artistName=11; int64 status=12;//锁定状态 diff --git a/pb/artistinfoArtshow/artistinfoArtshow.pb.go b/pb/artistinfoArtshow/artistinfoArtshow.pb.go index acc1169..619197b 100644 --- a/pb/artistinfoArtshow/artistinfoArtshow.pb.go +++ b/pb/artistinfoArtshow/artistinfoArtshow.pb.go @@ -259,8 +259,8 @@ type ArtshowVideoInfo struct { AuditStatus int64 `protobuf:"varint,5,opt,name=auditStatus,proto3" json:"auditStatus,omitempty"` AuditMark1 string `protobuf:"bytes,6,opt,name=auditMark1,proto3" json:"auditMark1,omitempty"` AuditMark2 string `protobuf:"bytes,7,opt,name=auditMark2,proto3" json:"auditMark2,omitempty"` - CreatedAt int64 `protobuf:"varint,8,opt,name=createdAt,proto3" json:"createdAt,omitempty"` - UpdatedAt int64 `protobuf:"varint,9,opt,name=updatedAt,proto3" json:"updatedAt,omitempty"` + CreatedAt string `protobuf:"bytes,8,opt,name=createdAt,proto3" json:"createdAt,omitempty"` + UpdatedAt string `protobuf:"bytes,9,opt,name=updatedAt,proto3" json:"updatedAt,omitempty"` DeletedAt int64 `protobuf:"varint,10,opt,name=deletedAt,proto3" json:"deletedAt,omitempty"` ArtistName string `protobuf:"bytes,11,opt,name=artistName,proto3" json:"artistName,omitempty"` Status int64 `protobuf:"varint,12,opt,name=status,proto3" json:"status,omitempty"` //锁定状态 @@ -348,18 +348,18 @@ func (x *ArtshowVideoInfo) GetAuditMark2() string { return "" } -func (x *ArtshowVideoInfo) GetCreatedAt() int64 { +func (x *ArtshowVideoInfo) GetCreatedAt() string { if x != nil { return x.CreatedAt } - return 0 + return "" } -func (x *ArtshowVideoInfo) GetUpdatedAt() int64 { +func (x *ArtshowVideoInfo) GetUpdatedAt() string { if x != nil { return x.UpdatedAt } - return 0 + return "" } func (x *ArtshowVideoInfo) GetDeletedAt() int64 { @@ -2968,9 +2968,9 @@ var file_pb_artistinfoArtshow_proto_rawDesc = []byte{ 0x72, 0x6b, 0x31, 0x12, 0x1e, 0x0a, 0x0a, 0x61, 0x75, 0x64, 0x69, 0x74, 0x4d, 0x61, 0x72, 0x6b, 0x32, 0x18, 0x07, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0a, 0x61, 0x75, 0x64, 0x69, 0x74, 0x4d, 0x61, 0x72, 0x6b, 0x32, 0x12, 0x1c, 0x0a, 0x09, 0x63, 0x72, 0x65, 0x61, 0x74, 0x65, 0x64, 0x41, 0x74, - 0x18, 0x08, 0x20, 0x01, 0x28, 0x03, 0x52, 0x09, 0x63, 0x72, 0x65, 0x61, 0x74, 0x65, 0x64, 0x41, + 0x18, 0x08, 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, 0x09, - 0x20, 0x01, 0x28, 0x03, 0x52, 0x09, 0x75, 0x70, 0x64, 0x61, 0x74, 0x65, 0x64, 0x41, 0x74, 0x12, + 0x20, 0x01, 0x28, 0x09, 0x52, 0x09, 0x75, 0x70, 0x64, 0x61, 0x74, 0x65, 0x64, 0x41, 0x74, 0x12, 0x1c, 0x0a, 0x09, 0x64, 0x65, 0x6c, 0x65, 0x74, 0x65, 0x64, 0x41, 0x74, 0x18, 0x0a, 0x20, 0x01, 0x28, 0x03, 0x52, 0x09, 0x64, 0x65, 0x6c, 0x65, 0x74, 0x65, 0x64, 0x41, 0x74, 0x12, 0x1e, 0x0a, 0x0a, 0x61, 0x72, 0x74, 0x69, 0x73, 0x74, 0x4e, 0x61, 0x6d, 0x65, 0x18, 0x0b, 0x20, 0x01, 0x28,