From 1fd2f1033656fe2d670d7e8871899804502cb9f1 Mon Sep 17 00:00:00 2001 From: dorlolo <428192774@qq.com> Date: Sat, 25 Feb 2023 11:07:51 +0800 Subject: [PATCH] =?UTF-8?q?1.=20=E5=AE=8C=E6=88=90=E7=94=BB=E4=BD=9C?= =?UTF-8?q?=E7=9A=84=E5=88=9B=E5=BB=BA=E3=80=81=E6=9B=B4=E6=96=B0=E3=80=81?= =?UTF-8?q?=E5=88=A0=E9=99=A4=E4=B8=8E=E7=94=BB=E5=AE=B6=E9=94=81=E5=AE=9A?= =?UTF-8?q?=E5=8A=9F=E8=83=BD=E7=9A=84=E8=81=94=E5=8A=A8=202.=20=E4=BF=AE?= =?UTF-8?q?=E5=A4=8D=E9=83=A8=E5=88=86bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- cmd/internal/controller/artistInfo_artwork.go | 2 +- cmd/internal/dao/artistinfo_artwork.go | 15 ++++++++++++--- cmd/model/artworkLockRecord.go | 6 +++--- conf/dubbogo.yaml | 9 ++++++--- pkg/db/init.go | 1 + 5 files changed, 23 insertions(+), 10 deletions(-) diff --git a/cmd/internal/controller/artistInfo_artwork.go b/cmd/internal/controller/artistInfo_artwork.go index fe981ba..6e320fb 100644 --- a/cmd/internal/controller/artistInfo_artwork.go +++ b/cmd/internal/controller/artistInfo_artwork.go @@ -17,7 +17,7 @@ var _ artistInfoArtwork.ArtistInfoArtworkServer = new(ArtistInfoArtworkProvider) type ArtistInfoArtworkProvider struct { artistInfoArtwork.UnimplementedArtistInfoArtworkServer - artistInfoLogic *logic.ArtistInfoArtworkLogic + artistInfoLogic logic.ArtistInfoArtworkLogic } // CreateArtworkLockRecord 创建画作锁定记录 diff --git a/cmd/internal/dao/artistinfo_artwork.go b/cmd/internal/dao/artistinfo_artwork.go index ea63daf..6ad9e67 100644 --- a/cmd/internal/dao/artistinfo_artwork.go +++ b/cmd/internal/dao/artistinfo_artwork.go @@ -47,9 +47,9 @@ func DeletedArtworkLockRecord(artworkUid ...string) error { if len(artworkUid) == 0 { return nil } else if len(artworkUid) == 1 { - return db.DB.Where("artwork_uid = ? AND status ! = 2 ", artworkUid[0]).Delete(&model.ArtworkLockRecord{}).Error + return db.DB.Where("artwork_uid = ? AND status != 2 ", artworkUid[0]).Delete(&model.ArtworkLockRecord{}).Error } else { - return db.DB.Where("artwork_uid in ? AND status ! = 2 ", artworkUid).Delete(&model.ArtworkLockRecord{}).Error + return db.DB.Where("artwork_uid in ? AND status != 2 ", artworkUid).Delete(&model.ArtworkLockRecord{}).Error } } @@ -83,9 +83,10 @@ func BatchUnlockArtworks(artistUid string) error { func GetArtworkLockRecords(req *artistInfoArtwork.GetArtworkLockRecordsRequest) (resp *artistInfoArtwork.ArtworkLockList, err error) { var ( - datas = model.ArtworkLockRecord{} + datas = []model.ArtworkLockRecord{} tx = db.DB.Model(model.ArtworkLockRecord{}).Where("artist_uid = ?", req.ArtistUid) ) + resp = &artistInfoArtwork.ArtworkLockList{} switch req.QueryType { case artistInfoArtwork.ArtworkQueryMode_NowPreSaveArtwork: //当前暂存的画作 @@ -100,6 +101,14 @@ func GetArtworkLockRecords(req *artistInfoArtwork.GetArtworkLockRecordsRequest) // tx = tx.Where("status > 1") } err = tx.Find(&datas).Error + for _, v := range datas { + resp.Data = append(resp.Data, &artistInfoArtwork.ArtistLockInfo{ + ArtistUid: v.ArtistUid, + ArtworkUid: v.ArtworkUid, + Status: v.Status, + LockTime: v.LockTime, + }) + } return } func HasBeenLocked(artistUid string) bool { diff --git a/cmd/model/artworkLockRecord.go b/cmd/model/artworkLockRecord.go index 701121f..6241972 100644 --- a/cmd/model/artworkLockRecord.go +++ b/cmd/model/artworkLockRecord.go @@ -2,12 +2,12 @@ package model type ArtworkLockRecord struct { Model - ArtistUid string `json:"artistUid" gorm:"column:artist_uid;comment:画家uid"` - ArtworkUid string `json:"artworkUid" gorm:"column:artwork_uid;comment:画作uid"` + ArtistUid string `json:"artistUid" gorm:"column:artist_uid;type:varchar(191);comment:画家uid"` + ArtworkUid string `json:"artworkUid" gorm:"column:artwork_uid;type:varchar(191);comment:画作uid"` Status int64 `json:"status" gorm:"column:status;default:1;comment:1=准备/暂存 2=锁定 3=解锁"` LockTime string `json:"lockTime" gorm:"column:lock_time;锁定时间"` - UserInfo User `gorm:"foreignKey:ArtistUid;reference:MgmtArtistUid"` + //UserInfo User `gorm:"foreignKey:ArtistUid;reference:MgmtArtistUid"` } func (a ArtworkLockRecord) TableName() string { diff --git a/conf/dubbogo.yaml b/conf/dubbogo.yaml index 5eaa932..fda8bdb 100644 --- a/conf/dubbogo.yaml +++ b/conf/dubbogo.yaml @@ -19,9 +19,12 @@ dubbo: port: 20050 provider: services: - ArtistInfoProvider: - interface: com.fontree.microservices.common.ArtistInfo - # retries: 100 + ArtistInfoUserProvider: + interface: com.fontree.microservices.common.ArtistInfoUser + retries: 100 + ArtistInfoArtworkProvider: + interface: com.fontree.microservices.common.ArtistInfoArtwork + retries: 100 #ContractProvider: # interface: com.fontree.microservices.common.Contract # retries: 0 diff --git a/pkg/db/init.go b/pkg/db/init.go index 126ded8..60bf5de 100644 --- a/pkg/db/init.go +++ b/pkg/db/init.go @@ -99,6 +99,7 @@ func migration() { &model.ArtworkState{}, &model.ArtworkBatch{}, &model.TempArtistInfo{}, + &model.ArtworkLockRecord{}, ) if err != nil { fmt.Println("register table fail")