From 46bcfec6a08f96405b7b2059f3f3e53fe2cd5211 Mon Sep 17 00:00:00 2001 From: renzhiyuan <465386466@qq.com> Date: Thu, 5 Dec 2024 17:23:12 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8Dentry=5Fid=E4=B8=8D=E5=B1=95?= =?UTF-8?q?=E7=A4=BA=E9=97=AE=E9=A2=98=EF=BC=8C=E5=8E=BB=E6=8E=89channel?= =?UTF-8?q?=E9=87=8C=E9=9D=A2=E7=9A=84=E5=AF=86=E9=92=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/http/entities/backend/corn_report_channel.go | 14 +++++++++++--- .../cronreportchannelmodel/cron_report_channel.go | 1 + app/repository/cron_report_channel.go | 6 ++++++ app/services/cron_report_channel_service.go | 4 ++++ 4 files changed, 22 insertions(+), 3 deletions(-) diff --git a/app/http/entities/backend/corn_report_channel.go b/app/http/entities/backend/corn_report_channel.go index dc259c9..8840745 100644 --- a/app/http/entities/backend/corn_report_channel.go +++ b/app/http/entities/backend/corn_report_channel.go @@ -13,14 +13,16 @@ type ReportChannelListRequest struct { Status int `json:"status" form:"status"` ClientKey string `json:"client_key" form:"client_key"` //ClientSecret string `json:"client_secret" form:"client_secret"` - CreateTime []string `json:"create_time" form:"create_time"` - UpdateTime []string `json:"update_time" form:"update_time"` + CreateTime []string `json:"create_time" form:"create_time"` + UpdateTime []string `json:"update_time" form:"update_time"` + ChannelName string `json:"channel_name" form:"channel_name"` } type ReportChannelList struct { entities.PageRequest ReportChannelId int `json:"report_channel_id" form:"report_channel_id" validate:"min=0"` Status int `json:"status" form:"status"` + ChannelName string `json:"channel_name" form:"channel_name"` ClientKey string `json:"client_key" form:"client_key"` //ClientSecret string `json:"client_secret" form:"client_secret"` CreateTime []time.Time `json:"create_time" form:"create_time"` @@ -31,6 +33,7 @@ func (this *ReportChannelListRequest) Request2DB() (filter ReportChannelList, er filter.PageRequest = this.PageRequest filter.ReportChannelId = this.ReportChannelId filter.ClientKey = this.ClientKey + filter.ChannelName = this.ChannelName //filter.ClientSecret = this.ClientSecret filter.Status = this.Status filter.CreateTime = []time.Time{} @@ -59,6 +62,7 @@ func (this *ReportChannelListRequest) Request2DB() (filter ReportChannelList, er type ReportChannelListResponse struct { ReportChannelId int `json:"report_channel_id"` + ChannelName string `json:"channel_name"` ClientKey string `json:"client_key"` //ClientSecret string `json:"client_secret"` Config string `json:"config"` @@ -70,7 +74,7 @@ type ReportChannelListResponse struct { func (this *ReportChannelListResponse) FromDb(in cronreportchannelmodel.CronReportChannel) { this.ReportChannelId = in.ReportChannelId this.ClientKey = in.ClientKey - //this.ClientSecret = in.ClientSecret + this.ChannelName = in.ChannelName this.Config = in.Config this.CreateTime = in.CreateTime.Format("2006-01-02 15:04:05") this.Status = in.Status @@ -78,6 +82,7 @@ func (this *ReportChannelListResponse) FromDb(in cronreportchannelmodel.CronRepo } type ReportChannelCreateRequest struct { + ChannelName string `json:"channel_name" validate:"required" label:"名称"` ClientKey string `json:"client_key" validate:"required" label:"服务key"` ClientSecret string `json:"client_secret" validate:"required" label:"服务secret"` Config string `json:"config" validate:"required" label:"服务配置"` @@ -85,6 +90,7 @@ type ReportChannelCreateRequest struct { } func (this *ReportChannelCreateRequest) Request2DB() (db cronreportchannelmodel.CronReportChannel) { + db.ChannelName = this.ChannelName db.ClientKey = this.ClientKey db.ClientSecret = this.ClientSecret db.Config = this.Config @@ -94,6 +100,7 @@ func (this *ReportChannelCreateRequest) Request2DB() (db cronreportchannelmodel. type ReportChannelUpdateRequest struct { ReportChannelId int `json:"report_channel_id" validate:"required" ` + ChannelName string `json:"channel_name" label:"名称"` ClientKey string `json:"client_key" label:"配置key"` ClientSecret string `json:"client_secret" label:"配置密钥"` Config string `json:"config" label:"配置"` @@ -103,6 +110,7 @@ type ReportChannelUpdateRequest struct { func (this *ReportChannelUpdateRequest) Request2DB() (db cronreportchannelmodel.CronReportChannel) { db.ReportChannelId = this.ReportChannelId db.ClientKey = this.ClientKey + db.ChannelName = this.ChannelName db.ClientSecret = this.ClientSecret db.Config = this.Config db.Status = this.Status diff --git a/app/models/cronreportchannelmodel/cron_report_channel.go b/app/models/cronreportchannelmodel/cron_report_channel.go index 5895dbf..88b3928 100644 --- a/app/models/cronreportchannelmodel/cron_report_channel.go +++ b/app/models/cronreportchannelmodel/cron_report_channel.go @@ -14,6 +14,7 @@ var ( // 实体 type CronReportChannel struct { ReportChannelId int `xorm:"'report_channel_id' UNSIGNED INT pk autoincr"` + ChannelName string `xorm:"'channel_name' varchar(20)"` ClientKey string `xorm:"'client_key' varchar(20)"` ClientSecret string `xorm:"'client_secret' varchar(50)"` Config string `xorm:"'config' JSON"` diff --git a/app/repository/cron_report_channel.go b/app/repository/cron_report_channel.go index 77800ec..fc96c82 100644 --- a/app/repository/cron_report_channel.go +++ b/app/repository/cron_report_channel.go @@ -21,6 +21,12 @@ func (c *ReportChannel) WithByID(id int) DBOption { } } +func (c *ReportChannel) WithByName(name string) DBOption { + return func(g *xorm.Session) *xorm.Session { + return g.Where("channel_name like '%?%'", name) + } +} + func (c *ReportChannel) WithLikeClientKey(ClientKey string) DBOption { return func(g *xorm.Session) *xorm.Session { return g.Where("client_key like ?", "%"+ClientKey+"%") diff --git a/app/services/cron_report_channel_service.go b/app/services/cron_report_channel_service.go index c709a2c..25c2583 100644 --- a/app/services/cron_report_channel_service.go +++ b/app/services/cron_report_channel_service.go @@ -44,6 +44,10 @@ func ReportChannelList(param backend.ReportChannelList) (list []cronreportchanne if len(param.CreateTime) == 2 { opts = append(opts, repo.WithByDate(param.CreateTime[0], param.CreateTime[1])) + } + if param.ChannelName != "" { + opts = append(opts, repo.WithByName(param.ChannelName)) + } total, err = repo.FindAndCount(&list, opts...) return