feat: 消息渠道2

app/http/controllers/backend/cron_report_channel_controller.go

@@ -20,8 +20,13 @@ func ReportChannelCreate(c *gin.Context) {
 
 func ReportChannelList(c *gin.Context) {
 	req, _ := controllers.GetRequest(c).(*backend.ReportChannelListRequest)
+	param, err := req.Request2DB()
+	if err != nil {
+		controllers.HandRes(c, nil, err)
+		return
+	}
 
-	data, total, err := services.ReportChannelList(*req)
+	data, total, err := services.ReportChannelList(param)
 	if err != nil {
 		controllers.HandRes(c, nil, err)
 		return
@@ -42,12 +47,12 @@ func ReportChannelList(c *gin.Context) {
 func ReportChannelUpdate(c *gin.Context) {
 	req, _ := controllers.GetRequest(c).(*backend.ReportChannelUpdateRequest)
 	reportChannel := req.Request2DB()
-	err := services.ReportChannelUpdate(&reportChannel)
+	total, err := services.ReportChannelUpdate(&reportChannel)
-	controllers.HandRes(c, req, err)
+	controllers.HandRes(c, total, err)
 }
 
 func ReportChannelDelete(c *gin.Context) {
 	req, _ := controllers.GetRequest(c).(*entities.IdRequest)
-	err := services.ReportChannelDelete(*req)
+	total, err := services.ReportChannelDelete(*req)
-	controllers.HandRes(c, req, err)
+	controllers.HandRes(c, total, err)
 }

app/http/entities/backend/corn_report_channel.go

@@ -3,12 +3,57 @@ package backend
 import (
 	"cron_admin/app/http/entities"
 	"cron_admin/app/models/cronreportchannelmodel"
+	"cron_admin/app/utils"
+	"time"
 )
 
 type ReportChannelListRequest struct {
 	entities.PageRequest
-	ReportChannelId int `json:"report_channel_id" form:"report_channel_id" validate:"min=0"`
+	ReportChannelId uint     `json:"report_channel_id" form:"report_channel_id" validate:"min=0"`
-	Status          int `json:"status" form:"status"`
+	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"`
+}
+
+type ReportChannelList struct {
+	entities.PageRequest
+	ReportChannelId uint        `json:"report_channel_id" form:"report_channel_id" validate:"min=0"`
+	Status          int         `json:"status" form:"status"`
+	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"`
+	UpdateTime      []time.Time `json:"update_time" form:"update_time"`
+}
+
+func (this *ReportChannelListRequest) Request2DB() (db ReportChannelList, err error) {
+	db.ReportChannelId = this.ReportChannelId
+	db.ClientKey = this.ClientKey
+	db.ClientSecret = this.ClientSecret
+	db.Status = this.Status
+	db.CreateTime = []time.Time{}
+	var t time.Time
+	if len(this.CreateTime) == 2 {
+		t, err = utils.StrToTimeShanghai(this.CreateTime[0])
+		db.CreateTime = append(db.CreateTime, t)
+		t, err = utils.StrToTimeShanghai(this.CreateTime[1])
+		db.CreateTime = append(db.CreateTime, t)
+		if err != nil {
+			return
+		}
+	}
+	db.UpdateTime = []time.Time{}
+	if len(this.UpdateTime) == 2 {
+		t, err = utils.StrToTimeShanghai(this.UpdateTime[0])
+		db.UpdateTime = append(db.UpdateTime, t)
+		t, err = utils.StrToTimeShanghai(this.UpdateTime[1])
+		db.UpdateTime = append(db.UpdateTime, t)
+		if err != nil {
+			return
+		}
+	}
+	return
 }
 
 type ReportChannelListResponse struct {
@@ -45,11 +90,11 @@ func (this *ReportChannelCreateRequest) Request2DB() (db cronreportchannelmodel.
 }
 
 type ReportChannelUpdateRequest struct {
-	ReportChannelId uint   `json:"report_channel_id"`
+	ReportChannelId uint   `json:"report_channel_id"  validate:"required" `
-	ClientKey       string `json:"client_key" validate:"required" label:"配置key"`
+	ClientKey       string `json:"client_key" label:"配置key"`
-	ClientSecret    string `json:"client_secret" validate:"required" label:"配置密钥"`
+	ClientSecret    string `json:"client_secret"  label:"配置密钥"`
-	Config          string `json:"config" validate:"required" label:"配置"`
+	Config          string `json:"config"  label:"配置"`
-	Status          int    `json:"status" validate:"required" label:"状态"`
+	Status          int    `json:"status"  label:"状态"`
 }
 
 func (this *ReportChannelUpdateRequest) Request2DB() (db cronreportchannelmodel.CronReportChannel) {

app/http/entities/common.go

@@ -1,7 +1,7 @@
 package entities
 
 type IdRequest struct {
-	Id uint `json:"id"`
+	Id uint `json:"id" form:"id"`
 }
 
 type PageRequest struct {

app/http/routes/admin.go

@@ -55,10 +55,10 @@ func RegisterAdminRoute(router *gin.Engine) {
 				//消息管理
 				mes := v1.Group("/channel")
 				{
-					mes.GET("/list", backend.ReportChannelList)
+					mes.POST("/list", backend.ReportChannelList)
 					mes.POST("/create", backend.ReportChannelCreate)
-					mes.POST("/delete", backend.ReportChannelDelete)
+					mes.DELETE("/delete", backend.ReportChannelDelete)
-					mes.POST("/update", backend.ReportChannelUpdate)
+					mes.PUT("/update", backend.ReportChannelUpdate)
 				}
 
 				//日志

app/repository/common.go

@@ -26,17 +26,14 @@ type ICommonRepo[P models.PO] interface {
 
 	WithSession(session *xorm.Session) ICommonRepo[P]
 	WithByID(id uint) DBOption
-	WithByUserId(userId uint) DBOption
-	WithByBrandId(id int) DBOption
 	WithByDate(startTime, endTime time.Time) DBOption
+	WithByUpdateDate(startTime, endTime time.Time) DBOption
 	WithByStartDate(startTime time.Time) DBOption
 	WithByEndDate(startTime time.Time) DBOption
 	WithDesc(orderStr string) DBOption
 	WithByStatus(status int) DBOption
 	WithIdsIn(ids []uint) DBOption
 	WithPage(pageFilter entities.PageRequest) DBOption
-	WithByCouponId(couponId uint) DBOption
-	WithByProductId(productId uint) DBOption
 }
 
 func NewCommonRepo[P models.PO]() ICommonRepo[P] {

app/repository/common_opt.go

@@ -32,6 +32,12 @@ func (c *CommonRepo[P]) WithByDate(startTime, endTime time.Time) DBOption {
 	}
 }
 
+func (c *CommonRepo[P]) WithByUpdateDate(startTime, endTime time.Time) DBOption {
+	return func(g *xorm.Session) *xorm.Session {
+		return g.Where("update_time > ? AND update_time < ?", startTime, endTime)
+	}
+}
+
 func (c *CommonRepo[P]) WithByStartDate(startTime time.Time) DBOption {
 	return func(g *xorm.Session) *xorm.Session {
 		return g.Where("create_time > ?", startTime)

app/repository/cron_report_channel.go

@@ -20,3 +20,21 @@ func (c *ReportChannel) WithByID(id uint) DBOption {
 		return g.Where("report_channel_id = ?", id)
 	}
 }
+
+func (c *ReportChannel) WithLikeClientKey(ClientKey string) DBOption {
+	return func(g *xorm.Session) *xorm.Session {
+		return g.Where("client_key like ?", "%"+ClientKey+"%")
+	}
+}
+
+func (c *ReportChannel) WithLikeClientSecret(ClientSecret string) DBOption {
+	return func(g *xorm.Session) *xorm.Session {
+		return g.Where("client_secret like ?", "%"+ClientSecret+"%")
+	}
+}
+
+func (c *ReportChannel) WithLikeConfig(config string) DBOption {
+	return func(g *xorm.Session) *xorm.Session {
+		return g.Where("config like ?", "%"+config+"%")
+	}
+}

app/services/cron_report_channel_service.go

@@ -17,7 +17,7 @@ func ReportChannelCreate(param *cronreportchannelmodel.CronReportChannel) (err e
 
 }
 
-func ReportChannelList(param backend.ReportChannelListRequest) (list []cronreportchannelmodel.CronReportChannel, total int64, err error) {
+func ReportChannelList(param backend.ReportChannelList) (list []cronreportchannelmodel.CronReportChannel, total int64, err error) {
 	var (
 		repo = repository.NewReportChannelRepo()
 		opts = make([]repository.DBOption, 0)
@@ -32,35 +32,46 @@ func ReportChannelList(param backend.ReportChannelListRequest) (list []cronrepor
 	if param.Page > 0 || param.Limit > 0 {
 		opts = append(opts, repo.WithPage(param.PageRequest))
 	}
+	if param.ClientKey != "" {
+		opts = append(opts, repo.WithLikeClientKey(param.ClientKey))
+	}
+	if param.ClientSecret != "" {
+		opts = append(opts, repo.WithLikeClientSecret(param.ClientSecret))
+	}
+	if len(param.UpdateTime) == 2 {
+		opts = append(opts, repo.WithByUpdateDate(param.UpdateTime[0], param.UpdateTime[1]))
+	}
+	if len(param.CreateTime) == 2 {
+		opts = append(opts, repo.WithByDate(param.CreateTime[0], param.CreateTime[1]))
 
+	}
 	total, err = repo.FindAndCount(&list, opts...)
 	return
 }
-
+func ReportChannelUpdate(param *cronreportchannelmodel.CronReportChannel) (total int64, err error) {
-func ReportChannelUpdate(param *cronreportchannelmodel.CronReportChannel) (err error) {
 	var (
-		repo = repository.NewCommonRepo[cronreportchannelmodel.CronReportChannel]()
+		repo = repository.NewReportChannelRepo()
 		opts = make([]repository.DBOption, 0)
 	)
 	if param.ReportChannelId > 0 {
 		opts = append(opts, repo.WithByID(param.ReportChannelId))
 	}
 
-	_, err = repo.Update(param, opts...)
+	total, err = repo.Update(param, opts...)
 	return
 }
 
-func ReportChannelDelete(param entities.IdRequest) (err error) {
+func ReportChannelDelete(param entities.IdRequest) (total int64, err error) {
 	var (
-		repo = repository.NewCommonRepo[cronreportchannelmodel.CronReportChannel]()
+		repo = repository.NewReportChannelRepo()
 		opts = make([]repository.DBOption, 0)
 	)
 	if param.Id > 0 {
 		opts = append(opts, repo.WithByID(param.Id))
 	} else {
-		return errorcode.ReportChannelNotfound
+		return 0, errorcode.ReportChannelNotfound
 	}
 
-	_, err = repo.Delete(new(cronreportchannelmodel.CronReportChannel), opts...)
+	total, err = repo.Delete(new(cronreportchannelmodel.CronReportChannel), opts...)
 	return
 }