BaseSystem
/
Cron_Admin
12
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/main' into main

This commit is contained in:
renzhiyuan 2024-11-27 19:08:40 +08:00
parent 9cd39b6c17 d4692a912f
commit 59a80fd64f
14 changed files with 272 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
app/http/controllers/backend/cron_func_logs_controller.go Normal file
View File

@ -0,0 +1,23 @@
package backend
import (
"cron_admin/app/constants/errorcode"
"cron_admin/app/http/controllers"
"cron_admin/app/http/entities/backend"
"cron_admin/app/services"
"cron_admin/app/utils/helper"
"cron_admin/app/utils/mapstructure"
"github.com/gin-gonic/gin"
)
func CronFuncLogsList(c *gin.Context) {
request := controllers.GetRequest(c).(*backend.CronFuncLogsListRequest)
count, DbListInfo, err := services.CronFuncLogsList(request, request.Page, request.Limit)
if err != nil {
controllers.HandRes(c, nil, errorcode.ParamError)
} else {
var DbListResponse []backend.CronFuncLogsListResponse
_ = mapstructure.DecodeWithTime(DbListInfo, &DbListResponse, helper.DefaultFormatLayout)
controllers.HandRes(c, gin.H{"data": DbListResponse, "count": count}, err)
}
}

15
app/http/controllers/backend/cron_report_channel_controller.go
View File

@ -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)
controllers.HandRes(c, req, err)
total, err := services.ReportChannelUpdate(&reportChannel)
controllers.HandRes(c, total, err)
}
func ReportChannelDelete(c *gin.Context) {
req, _ := controllers.GetRequest(c).(*entities.IdRequest)
err := services.ReportChannelDelete(*req)
controllers.HandRes(c, req, err)
total, err := services.ReportChannelDelete(*req)
controllers.HandRes(c, total, err)
}

59
app/http/entities/backend/corn_report_channel.go
View File

@ -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"`
Status int `json:"status" form:"status"`
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 []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"`
ClientKey string `json:"client_key" validate:"required" label:"配置key"`
ClientSecret string `json:"client_secret" validate:"required" label:"配置密钥"`
Config string `json:"config" validate:"required" label:"配置"`
Status int `json:"status" validate:"required" label:"状态"`
ReportChannelId uint `json:"report_channel_id" validate:"required" `
ClientKey string `json:"client_key" label:"配置key"`
ClientSecret string `json:"client_secret" label:"配置密钥"`
Config string `json:"config" label:"配置"`
Status int `json:"status" label:"状态"`
}
func (this *ReportChannelUpdateRequest) Request2DB() (db cronreportchannelmodel.CronReportChannel) {

21
app/http/entities/backend/cron_func_logs.go Normal file
View File

@ -0,0 +1,21 @@
package backend
import "cron_admin/app/http/entities"
type CronFuncLogsListRequest struct {
entities.PageRequest
CmdId int64 `json:"cmd_id"`
Status int `json:"status"`
}
type CronFuncLogsListResponse struct {
LogId int64 `json:"log_id"`
CmdId int64 `json:"cmd_id"`
CmdName string `json:"cmd_name"`
ReadExecute string `json:"read_execute"`
WriteExecute string `json:"write_execute"`
FailReason string `json:"fail_reason"`
CreateTime string `json:"create_time"`
UpdateTime string `json:"update_time"`
Status int `json:"status"`
}

2
app/http/entities/common.go
View File

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

3
app/http/requestmapping/backend.go
View File

@ -28,4 +28,7 @@ var BackendRequestMap = map[string]func() interface{}{
common.ADMIN_OAUTH_V1 + "/channel/list": func() interface{} { return new(backend.ReportChannelListRequest) },
common.ADMIN_OAUTH_V1 + "/channel/update": func() interface{} { return new(backend.ReportChannelUpdateRequest) },
common.ADMIN_OAUTH_V1 + "/channel/delete": func() interface{} { return new(entities.IdRequest) },
// 日志
common.ADMIN_OAUTH_V1 + "/log/cmd/list": func() interface{} { return new(backend.CronFuncLogsListRequest) },
}

8
app/http/routes/admin.go
View File

@ -56,10 +56,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.POST("/update", backend.ReportChannelUpdate)
mes.DELETE("/delete", backend.ReportChannelDelete)
mes.PUT("/update", backend.ReportChannelUpdate)
}
//日志
@ -68,7 +68,7 @@ func RegisterAdminRoute(router *gin.Engine) {
//任务日志
cmdLog := log.Group("/cmd")
{
cmdLog.GET("/list", backend.Empty)
cmdLog.POST("/list", backend.CronFuncLogsList)
}
//消息日志
mesLog := log.Group("/mes")

43
app/models/cronfunclogsmodel/cron_func_logs.go Normal file
View File

@ -0,0 +1,43 @@
package cronfunclogsmodel
import (
"github.com/qit-team/snow-core/db"
"sync"
"time"
)
var (
once sync.Once
m *CronFuncLogsModel
)
// 实体
type CronFuncLogs struct {
LogId int64 `xorm:"'log_id' UNSIGNED INT"`
CmdId int64 `xorm:"'cmd_id' INT"`
ReadExecute string `xorm:"'read_execute' json"`
WriteExecute string `xorm:"'write_execute' text"`
FailReason string `xorm:"'fail_reason' text"`
CreateTime time.Time `xorm:"'create_time' datetime"`
UpdateTime time.Time `xorm:"'update_time' timestamp"`
Status int `xorm:"'status' tinyint"`
}
// 表名
func (m *CronFuncLogs) TableName() string {
return "cron_func_logs"
}
// 私有化，防止被外部new
type CronFuncLogsModel struct {
db.Model //组合基础Model，集成基础Model的属性和方法
}
// 单例模式
func GetInstance() *CronFuncLogsModel {
once.Do(func() {
m = new(CronFuncLogsModel)
//m.DiName = "" //设置数据库实例连接，默认db.SingletonMain
})
return m
}

44
app/models/cronreportlogsmodel/cron_report_logs.go Normal file
View File

@ -0,0 +1,44 @@
package crondbmodel
import (
"github.com/qit-team/snow-core/db"
"sync"
"time"
)
var (
once sync.Once
m *CronReportLogsModel
)
// 实体
type CronReportLogs struct {
ReportId int64 `xorm:"'report_id' UNSIGNED INT"`
FuncLogId int64 `xorm:"'func_log_id' INT"`
CmdId int64 `xorm:"'cmd_id' INT"`
UserId string `xorm:"'user_id' varchar(100)"`
Data string `xorm:"'data' json"`
FailReason string `xorm:"'fail_reason' varchar(200)"`
CreateTime time.Time `xorm:"'create_time' datetime"`
UpdateTime time.Time `xorm:"'update_time' timestamp"`
Status int `xorm:"'status' tinyint"`
}
// 表名
func (m *CronReportLogs) TableName() string {
return "cron_report_logs"
}
// 私有化，防止被外部new
type CronReportLogsModel struct {
db.Model //组合基础Model，集成基础Model的属性和方法
}
// 单例模式
func GetInstance() *CronReportLogsModel {
once.Do(func() {
m = new(CronReportLogsModel)
//m.DiName = "" //设置数据库实例连接，默认db.SingletonMain
})
return m
}

5
app/repository/common.go
View File

@ -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] {

6
app/repository/common_opt.go
View File

@ -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)

18
app/repository/cron_report_channel.go
View File

@ -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+"%")
}
}

26
app/services/cron_func_logs_service.go Normal file
View File

@ -0,0 +1,26 @@
package services
import (
"cron_admin/app/http/entities/backend"
"cron_admin/app/models/cronfunclogsmodel"
"xorm.io/builder"
)
func CronFuncLogsList(request *backend.CronFuncLogsListRequest, page int, limit int) (count int64, listInfo []cronfunclogsmodel.CronFuncLogs, err error) {
conn := builder.NewCond()
if request.CmdId != 0 {
conn = conn.And(builder.Eq{"CmdId": request.CmdId})
}
if request.Status != 0 {
conn = conn.And(builder.Eq{"Status": request.Status})
}
session := cronfunclogsmodel.GetInstance().GetDb().Where(conn)
if page != 0 && limit != 0 {
session = session.Limit(limit, (page-1)*limit)
}
count, err = session.FindAndCount(&listInfo)
if err != nil {
return
}
return
}

29
app/services/cron_report_channel_service.go
View File

@ -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) (err error) {
func ReportChannelUpdate(param *cronreportchannelmodel.CronReportChannel) (total int64, 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
}