Skip to content

X
xpkg
提交 1ab6fb03 authored 作者: mooncake's avatar mooncake
浏览文件
操作

update

上级 d7fe160a
全部展开 隐藏空白字符变更
内嵌 并排
正在显示 包含 155 行增加 和 274 行删除
application/init_app.go
浏览文件 @ 1ab6fb03
......@@ -18,7 +18,7 @@ import (
"gitlab.wanzhuangkj.com/tush/xpkg/pkg/xerrors/xerror"
"gitlab.wanzhuangkj.com/tush/xpkg/rd/nacos"
"gitlab.wanzhuangkj.com/tush/xpkg/utils/dxsf"
goutils "gitlab.wanzhuangkj.com/tush/xpkg/utils/go_utils"
goutils "gitlab.wanzhuangkj.com/tush/xpkg/utils/goutils"
"gitlab.wanzhuangkj.com/tush/xpkg/utils/sliceUtils"
"gitlab.wanzhuangkj.com/tush/xpkg/utils/xsf"
......
utils/sliceUtils/xslice.go
浏览文件 @ 1ab6fb03
......@@ -232,17 +232,27 @@ func GetIDMapSliceIDs[ID xtype.Key, T IID[ID]](m map[ID][]*T) []ID {
return st.Slice()
}
func CompareSlice[ID xtype.Key, T IIDTable[ID], BizSlice ~[]*T](ids []ID, bizSlice BizSlice, errCode *errcode.Error) error {
type ICode interface {
Code() int
}
func CompareSlice[ID xtype.Key, T IIDTable[ID], BizSlice ~[]*T](ids []ID, bizSlice BizSlice, errCode error) error {
if len(ids) == 0 {
return nil
}
if len(bizSlice) < len(ids) {
if len(bizSlice) == 0 {
return xerror.NewC(errCode.Code(), errCode.Msg())
if v, ok := errCode.(*errcode.Error); ok {
return xerror.NewC(v.Code(), v.Msg())
}
return xerror.New(errCode.Error())
}
deltaIDs := SetDifference(ids, GetIDs[ID](bizSlice))
if len(deltaIDs) > 0 {
return xerror.NewC(errCode.Code(), fmt.Sprintf("%s[ids:%s]", errCode.Msg(), Join(deltaIDs, ",")))
if v, ok := errCode.(*errcode.Error); ok {
return xerror.NewC(v.Code(), fmt.Sprintf("%s[ids:%s]", v.Msg(), Join(deltaIDs, ",")))
}
return xerror.New(errCode.Error())
}
}
return nil
......
xcommon/base/condition.go
浏览文件 @ 1ab6fb03
package base
import "strings"
// import "strings"
type Condition interface {
SetWhere(k string, v []interface{})
SetOr(k string, v []interface{})
SetOrder(k string)
SetJoinOn(t, on string) Condition
}
// type Condition interface {
// SetWhere(k string, v []interface{})
// SetOr(k string, v []interface{})
// SetOrder(k string)
// SetJoinOn(t, on string) Condition
// }
type GormCondition struct {
GormPublic
Join []*GormJoin
}
// type GormCondition struct {
// GormPublic
// Join []*GormJoin
// }
type GormPublic struct {
Where map[string][]interface{}
Order []string
Or map[string][]interface{}
}
// type GormPublic struct {
// Where map[string][]interface{}
// Order []string
// Or map[string][]interface{}
// }
type GormJoin struct {
Type string
JoinOn string
GormPublic
}
// type GormJoin struct {
// Type string
// JoinOn string
// GormPublic
// }
func (e *GormJoin) SetJoinOn(t, on string) Condition {
return nil
}
// func (e *GormJoin) SetJoinOn(t, on string) Condition {
// return nil
// }
func (e *GormPublic) SetWhere(k string, v []interface{}) {
if e.Where == nil {
e.Where = make(map[string][]interface{})
}
e.Where[k] = v
}
// func (e *GormPublic) SetWhere(k string, v []interface{}) {
// if e.Where == nil {
// e.Where = make(map[string][]interface{})
// }
// e.Where[k] = v
// }
func (e *GormPublic) SetOr(k string, v []interface{}) {
if e.Or == nil {
e.Or = make(map[string][]interface{})
}
e.Or[k] = v
}
// func (e *GormPublic) SetOr(k string, v []interface{}) {
// if e.Or == nil {
// e.Or = make(map[string][]interface{})
// }
// e.Or[k] = v
// }
func (e *GormPublic) SetOrder(k string) {
if e.Order == nil {
e.Order = make([]string, 0)
}
e.Order = append(e.Order, k)
}
// func (e *GormPublic) SetOrder(k string) {
// if e.Order == nil {
// e.Order = make([]string, 0)
// }
// e.Order = append(e.Order, k)
// }
func (e *GormCondition) SetJoinOn(t, on string) Condition {
if e.Join == nil {
e.Join = make([]*GormJoin, 0)
}
join := &GormJoin{
Type: t,
JoinOn: on,
GormPublic: GormPublic{},
}
e.Join = append(e.Join, join)
return join
}
// func (e *GormCondition) SetJoinOn(t, on string) Condition {
// if e.Join == nil {
// e.Join = make([]*GormJoin, 0)
// }
// join := &GormJoin{
// Type: t,
// JoinOn: on,
// GormPublic: GormPublic{},
// }
// e.Join = append(e.Join, join)
// return join
// }
type resolveSearchTag struct {
Type string
Column string
Table string
On []string
Join string
}
// type resolveSearchTag struct {
// Type string
// Column string
// Table string
// On []string
// Join string
// }
// makeTag 解析search的tag标签
func makeTag(tag string) *resolveSearchTag {
r := &resolveSearchTag{}
tags := strings.Split(tag, ";")
var ts []string
for _, t := range tags {
ts = strings.Split(t, ":")
if len(ts) == 0 {
continue
}
switch ts[0] {
case "type":
if len(ts) > 1 {
r.Type = ts[1]
}
case "column":
if len(ts) > 1 {
r.Column = ts[1]
}
case "table":
if len(ts) > 1 {
r.Table = ts[1]
}
case "on":
if len(ts) > 1 {
r.On = ts[1:]
}
case "join":
if len(ts) > 1 {
r.Join = ts[1]
}
}
}
return r
}
// // makeTag 解析search的tag标签
// func makeTag(tag string) *resolveSearchTag {
// r := &resolveSearchTag{}
// tags := strings.Split(tag, ";")
// var ts []string
// for _, t := range tags {
// ts = strings.Split(t, ":")
// if len(ts) == 0 {
// continue
// }
// switch ts[0] {
// case "type":
// if len(ts) > 1 {
// r.Type = ts[1]
// }
// case "column":
// if len(ts) > 1 {
// r.Column = ts[1]
// }
// case "table":
// if len(ts) > 1 {
// r.Table = ts[1]
// }
// case "on":
// if len(ts) > 1 {
// r.On = ts[1:]
// }
// case "join":
// if len(ts) > 1 {
// r.Join = ts[1]
// }
// }
// }
// return r
// }
xcommon/base/dao.go
浏览文件 @ 1ab6fb03
差异被折叠。
xcommon/base/query.go
浏览文件 @ 1ab6fb03
差异被折叠。
xcommon/controller.go
浏览文件 @ 1ab6fb03
......@@ -2,16 +2,17 @@ package xcommon
import (
"context"
vd "github.com/bytedance/go-tagexpr/v2/validator"
"net/http"
"os"
"testing"
"time"
vd "github.com/bytedance/go-tagexpr/v2/validator"
"github.com/gin-gonic/gin"
"gitlab.wanzhuangkj.com/tush/xpkg/gin/response"
"gitlab.wanzhuangkj.com/tush/xpkg/pkg/httpcli"
"gitlab.wanzhuangkj.com/tush/xpkg/utils/map_utils"
maputils "gitlab.wanzhuangkj.com/tush/xpkg/utils/maputils"
)
type IValid interface {
......@@ -104,7 +105,7 @@ func (x *ControllerTester) After(t *testing.T) {
func (x *ControllerTester) CommonHttp(method, URL string, in any, reply *response.Result) error {
if method == http.MethodDelete || method == http.MethodGet {
in = map_utils.StructToMapWithJsonTag(in)
in = maputils.StructToMapWithJsonTag(in)
}
if err := x.client.NewRequest().
SetHeaders(x.Headers).
......
xcron/biz/cron_job.go
浏览文件 @ 1ab6fb03
package biz
import (
"context"
"encoding/json"
"gitlab.wanzhuangkj.com/tush/xpkg/xcron/models"
......@@ -40,9 +39,6 @@ func (*CronJob) GetIDs(rs []*CronJob) []xsf.ID {
return sliceUtils.GetIDs(rs)
}
type CronJobOpts struct {
}
func (CronJob) NewFromModel(m *models.CronJob) *CronJob {
if m == nil {
return nil
......@@ -58,23 +54,3 @@ func (x *CronJob) ToModel() *models.CronJob {
}
return &x.CronJob
}
func (x CronJob) Valid(ctx context.Context, cronJob *CronJob, opts *CronJobOpts) error {
if cronJob == nil {
return nil
}
if opts == nil {
opts = &CronJobOpts{}
}
return nil
}
func (x CronJob) ValidSlice(ctx context.Context, cronJobBizSlice []*CronJob, opts *CronJobOpts) error {
if len(cronJobBizSlice) == 0 {
return nil
}
if opts == nil {
opts = &CronJobOpts{}
}
return nil
}
xcron/biz/cron_job_log.go
浏览文件 @ 1ab6fb03
package biz
import (
"context"
"gitlab.wanzhuangkj.com/tush/xpkg/utils/setUtils"
"gitlab.wanzhuangkj.com/tush/xpkg/utils/sliceUtils"
"gitlab.wanzhuangkj.com/tush/xpkg/utils/xsf"
......@@ -28,9 +26,6 @@ func (x *CronJobLog) GetJobIDs(rs []*CronJobLog) []xsf.ID {
return set.Slice()
}
type CronJobLogOpts struct {
}
func (CronJobLog) NewFromModel(m *models.CronJobLog) *CronJobLog {
if m == nil {
return nil
......@@ -46,23 +41,3 @@ func (x *CronJobLog) ToModel() *models.CronJobLog {
}
return &x.CronJobLog
}
func (x CronJobLog) Valid(ctx context.Context, cronJobLog *CronJobLog, opts *CronJobLogOpts) error {
if cronJobLog == nil {
return nil
}
if opts == nil {
opts = &CronJobLogOpts{}
}
return nil
}
func (x CronJobLog) ValidSlice(ctx context.Context, cronJobLogBizSlice []*CronJobLog, opts *CronJobLogOpts) error {
if len(cronJobLogBizSlice) == 0 {
return nil
}
if opts == nil {
opts = &CronJobLogOpts{}
}
return nil
}
xcron/biz/cron_job_record.go
浏览文件 @ 1ab6fb03
package biz
import (
"context"
"gitlab.wanzhuangkj.com/tush/xpkg/xcron/models"
"gitlab.wanzhuangkj.com/tush/xpkg/utils/setUtils"
......@@ -28,9 +27,6 @@ func (x *CronJobRecord) GetJobIDs(rs []*CronJobRecord) []xsf.ID {
return set.Slice()
}
type CronJobRecordOpts struct {
}
func (CronJobRecord) NewFromModel(m *models.CronJobRecord) *CronJobRecord {
if m == nil {
return nil
......@@ -46,23 +42,3 @@ func (x *CronJobRecord) ToModel() *models.CronJobRecord {
}
return &x.CronJobRecord
}
func (x CronJobRecord) Valid(ctx context.Context, cronJobRecord *CronJobRecord, opts *CronJobRecordOpts) error {
if cronJobRecord == nil {
return nil
}
if opts == nil {
opts = &CronJobRecordOpts{}
}
return nil
}
func (x CronJobRecord) ValidSlice(ctx context.Context, cronJobRecordBizSlice []*CronJobRecord, opts *CronJobRecordOpts) error {
if len(cronJobRecordBizSlice) == 0 {
return nil
}
if opts == nil {
opts = &CronJobRecordOpts{}
}
return nil
}
xcron/cron.sql
浏览文件 @ 1ab6fb03
......@@ -17,6 +17,7 @@ CREATE TABLE `cron_job_log` (
`job_id` bigint(20) unsigned NOT NULL COMMENT 'job ID eg[101]',
`info` text COLLATE utf8mb4_unicode_ci COMMENT '日志 eg[job occur error...]',
`created_at` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间 eg[2025-01-07 12:20:43]',
`updated_at` datetime DEFAULT NULL COMMENT '修改时间 eg[2025-01-07 12:20:43]',
PRIMARY KEY (`id`),
KEY `idx_jobid_time` (`job_id`,`created_at`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci ROW_FORMAT=DYNAMIC COMMENT='定时任务日志';
......
xcron/ecode/cron.go
浏览文件 @ 1ab6fb03
package ecode
import "gitlab.wanzhuangkj.com/tush/xpkg/pkg/errcode"
import (
"errors"
)
var (
ErrCronJobNotFound = errcode.NewError(12001, "未查询到任务")
ErrCronJobNotFound = errors.New("未查询到任务")
)
xcron/service/cron_job.go
浏览文件 @ 1ab6fb03
差异被折叠。
xcron/service/cron_job_log.go
浏览文件 @ 1ab6fb03
......@@ -23,7 +23,7 @@ func newCronJobLogService() *cronJobLogService {
}
}
func (x *cronJobLogService) GetByID(ctx context.Context, id xsf.ID, opts *biz.CronJobLogOpts) (cronJobLogBiz *biz.CronJobLog, err error) {
func (x *cronJobLogService) GetByID(ctx context.Context, id xsf.ID) (cronJobLogBiz *biz.CronJobLog, err error) {
if id <= 0 {
return nil, nil
}
......@@ -34,10 +34,10 @@ func (x *cronJobLogService) GetByID(ctx context.Context, id xsf.ID, opts *biz.Cr
if cronJobLog == nil {
return nil, nil
}
return x.ToBiz(ctx, cronJobLog, opts)
return x.ToBiz(ctx, cronJobLog)
}
func (x *cronJobLogService) GetSliceByIDs(ctx context.Context, ids []xsf.ID, opts *biz.CronJobLogOpts) ([]*biz.CronJobLog, error) {
func (x *cronJobLogService) GetSliceByIDs(ctx context.Context, ids []xsf.ID) ([]*biz.CronJobLog, error) {
if len(ids) == 0 {
return nil, nil
}
......@@ -48,14 +48,14 @@ func (x *cronJobLogService) GetSliceByIDs(ctx context.Context, ids []xsf.ID, opt
if len(cronJobLogs) == 0 {
return nil, nil
}
return x.ToSliceBiz(ctx, cronJobLogs, opts)
return x.ToSliceBiz(ctx, cronJobLogs)
}
func (x *cronJobLogService) GetMapByIDs(ctx context.Context, ids []xsf.ID, opts *biz.CronJobLogOpts) (map[xsf.ID]*biz.CronJobLog, error) {
func (x *cronJobLogService) GetMapByIDs(ctx context.Context, ids []xsf.ID) (map[xsf.ID]*biz.CronJobLog, error) {
if len(ids) == 0 {
return nil, nil
}
cronJobLogBizSlice, err := x.GetSliceByIDs(ctx, ids, opts)
cronJobLogBizSlice, err := x.GetSliceByIDs(ctx, ids)
if err != nil {
return nil, err
}
......@@ -66,7 +66,7 @@ func (x *cronJobLogService) GetMapByIDs(ctx context.Context, ids []xsf.ID, opts
return cronJobLogBizIDMap, nil
}
func (x *cronJobLogService) Page(ctx context.Context, req *types.CronJobLogPageReq, opts *biz.CronJobLogOpts) ([]*biz.CronJobLog, int64, error) {
func (x *cronJobLogService) Page(ctx context.Context, req *types.CronJobLogPageReq) ([]*biz.CronJobLog, int64, error) {
cronJobLogs, total, err := dao.CronJobLogDao.Page(ctx, req)
if err != nil {
return nil, 0, err
......@@ -74,13 +74,13 @@ func (x *cronJobLogService) Page(ctx context.Context, req *types.CronJobLogPageR
if len(cronJobLogs) == 0 {
return nil, total, nil
}
cronJobLogBizSlice, err := x.ToSliceBiz(ctx, cronJobLogs, opts)
cronJobLogBizSlice, err := x.ToSliceBiz(ctx, cronJobLogs)
if err != nil {
return nil, 0, err
}
return cronJobLogBizSlice, total, nil
}
func (x *cronJobLogService) GetSliceByJobID(ctx context.Context, jobID xsf.ID, opts *biz.CronJobLogOpts) ([]*biz.CronJobLog, error) {
func (x *cronJobLogService) GetSliceByJobID(ctx context.Context, jobID xsf.ID) ([]*biz.CronJobLog, error) {
if jobID == 0 {
return nil, nil
}
......@@ -91,10 +91,10 @@ func (x *cronJobLogService) GetSliceByJobID(ctx context.Context, jobID xsf.ID, o
if len(cronJobLogs) == 0 {
return nil, nil
}
return x.ToSliceBiz(ctx, cronJobLogs, opts)
return x.ToSliceBiz(ctx, cronJobLogs)
}
func (x *cronJobLogService) GetSliceByJobIDs(ctx context.Context, jobIDs []xsf.ID, opts *biz.CronJobLogOpts) ([]*biz.CronJobLog, error) {
func (x *cronJobLogService) GetSliceByJobIDs(ctx context.Context, jobIDs []xsf.ID) ([]*biz.CronJobLog, error) {
if len(jobIDs) == 0 {
return nil, nil
}
......@@ -105,14 +105,14 @@ func (x *cronJobLogService) GetSliceByJobIDs(ctx context.Context, jobIDs []xsf.I
if len(cronJobLogs) == 0 {
return nil, nil
}
return x.ToSliceBiz(ctx, cronJobLogs, opts)
return x.ToSliceBiz(ctx, cronJobLogs)
}
func (x *cronJobLogService) GetMapSliceByJobIDs(ctx context.Context, jobIDs []xsf.ID, opts *biz.CronJobLogOpts) (map[xsf.ID][]*biz.CronJobLog, int, error) {
func (x *cronJobLogService) GetMapSliceByJobIDs(ctx context.Context, jobIDs []xsf.ID) (map[xsf.ID][]*biz.CronJobLog, int, error) {
if len(jobIDs) == 0 {
return nil, 0, nil
}
cronJobLogBizSlice, err := x.GetSliceByJobIDs(ctx, jobIDs, opts)
cronJobLogBizSlice, err := x.GetSliceByJobIDs(ctx, jobIDs)
if err != nil {
return nil, 0, err
}
......@@ -126,53 +126,23 @@ func (x *cronJobLogService) GetMapSliceByJobIDs(ctx context.Context, jobIDs []xs
return ret, len(cronJobLogBizSlice), nil
}
func (x *cronJobLogService) ToBiz(ctx context.Context, cronJobLog *models.CronJobLog, opts *biz.CronJobLogOpts) (cronJobLogBiz *biz.CronJobLog, err error) {
func (x *cronJobLogService) ToBiz(ctx context.Context, cronJobLog *models.CronJobLog) (cronJobLogBiz *biz.CronJobLog, err error) {
if cronJobLog == nil {
return nil, nil
}
cronJobLogBiz = biz.CronJobLogTool.NewFromModel(cronJobLog)
if err = x.Fill(ctx, cronJobLogBiz, opts); err != nil {
return nil, err
}
if err = biz.CronJobLogTool.Valid(ctx, cronJobLogBiz, opts); err != nil {
return nil, err
}
return cronJobLogBiz, nil
}
func (x *cronJobLogService) ToSliceBiz(ctx context.Context, cronJobLogs []*models.CronJobLog, opts *biz.CronJobLogOpts) (cronJobLogBizSlice []*biz.CronJobLog, err error) {
func (x *cronJobLogService) ToSliceBiz(ctx context.Context, cronJobLogs []*models.CronJobLog) (cronJobLogBizSlice []*biz.CronJobLog, err error) {
if len(cronJobLogs) == 0 {
return nil, nil
}
cronJobLogBizSlice = biz.CronJobLogTool.NewSliceFromModelsBiz(cronJobLogs)
if err = x.SliceFill(ctx, cronJobLogBizSlice, opts); err != nil {
return nil, err
}
if err = biz.CronJobLogTool.ValidSlice(ctx, cronJobLogBizSlice, opts); err != nil {
return nil, err
}
return cronJobLogBizSlice, nil
}
func (x *cronJobLogService) Fill(ctx context.Context, cronJobLogBiz *biz.CronJobLog, opts *biz.CronJobLogOpts) error {
if cronJobLogBiz == nil {
return nil
}
if opts != nil {
}
return nil
}
func (x *cronJobLogService) SliceFill(ctx context.Context, cronJobLogBizSlice []*biz.CronJobLog, opts *biz.CronJobLogOpts) error {
if len(cronJobLogBizSlice) == 0 {
return nil
}
if opts != nil {
}
return nil
}
func (x *cronJobLogService) GetAll(ctx context.Context, opts *biz.CronJobLogOpts) ([]*biz.CronJobLog, error) {
func (x *cronJobLogService) GetAll(ctx context.Context) ([]*biz.CronJobLog, error) {
cronJobLogs, err := dao.CronJobLogDao.GetAll(ctx)
if err != nil {
return nil, err
......@@ -180,5 +150,5 @@ func (x *cronJobLogService) GetAll(ctx context.Context, opts *biz.CronJobLogOpts
if len(cronJobLogs) == 0 {
return nil, nil
}
return x.ToSliceBiz(ctx, cronJobLogs, opts)
return x.ToSliceBiz(ctx, cronJobLogs)
}
xcron/service/cron_job_record.go
浏览文件 @ 1ab6fb03
......@@ -23,7 +23,7 @@ func newCronJobRecordService() *cronJobRecordService {
}
}
func (x *cronJobRecordService) GetByID(ctx context.Context, id xsf.ID, opts *biz.CronJobRecordOpts) (cronJobRecordBiz *biz.CronJobRecord, err error) {
func (x *cronJobRecordService) GetByID(ctx context.Context, id xsf.ID) (cronJobRecordBiz *biz.CronJobRecord, err error) {
if id <= 0 {
return nil, nil
}
......@@ -31,10 +31,10 @@ func (x *cronJobRecordService) GetByID(ctx context.Context, id xsf.ID, opts *biz
if err != nil {
return nil, err
}
return x.ToBiz(ctx, cronJobRecord, opts)
return x.ToBiz(ctx, cronJobRecord)
}
func (x *cronJobRecordService) GetSliceByIDs(ctx context.Context, ids []xsf.ID, opts *biz.CronJobRecordOpts) ([]*biz.CronJobRecord, error) {
func (x *cronJobRecordService) GetSliceByIDs(ctx context.Context, ids []xsf.ID) ([]*biz.CronJobRecord, error) {
if len(ids) == 0 {
return nil, nil
}
......@@ -45,14 +45,14 @@ func (x *cronJobRecordService) GetSliceByIDs(ctx context.Context, ids []xsf.ID,
if len(cronJobRecords) == 0 {
return nil, nil
}
return x.ToSliceBiz(ctx, cronJobRecords, opts)
return x.ToSliceBiz(ctx, cronJobRecords)
}
func (x *cronJobRecordService) GetMapByIDs(ctx context.Context, ids []xsf.ID, opts *biz.CronJobRecordOpts) (map[xsf.ID]*biz.CronJobRecord, error) {
func (x *cronJobRecordService) GetMapByIDs(ctx context.Context, ids []xsf.ID) (map[xsf.ID]*biz.CronJobRecord, error) {
if len(ids) == 0 {
return nil, nil
}
cronJobRecordBizSlice, err := x.GetSliceByIDs(ctx, ids, opts)
cronJobRecordBizSlice, err := x.GetSliceByIDs(ctx, ids)
if err != nil {
return nil, err
}
......@@ -63,7 +63,7 @@ func (x *cronJobRecordService) GetMapByIDs(ctx context.Context, ids []xsf.ID, op
return cronJobRecordBizIDMap, nil
}
func (x *cronJobRecordService) Page(ctx context.Context, req *types.CronJobRecordPageReq, opts *biz.CronJobRecordOpts) ([]*biz.CronJobRecord, int64, error) {
func (x *cronJobRecordService) Page(ctx context.Context, req *types.CronJobRecordPageReq) ([]*biz.CronJobRecord, int64, error) {
cronJobRecords, total, err := dao.CronJobRecordDao.Page(ctx, req)
if err != nil {
return nil, 0, err
......@@ -71,13 +71,13 @@ func (x *cronJobRecordService) Page(ctx context.Context, req *types.CronJobRecor
if len(cronJobRecords) == 0 {
return nil, total, nil
}
cronJobRecordBizSlice, err := x.ToSliceBiz(ctx, cronJobRecords, opts)
cronJobRecordBizSlice, err := x.ToSliceBiz(ctx, cronJobRecords)
if err != nil {
return nil, 0, err
}
return cronJobRecordBizSlice, total, nil
}
func (x *cronJobRecordService) GetSliceByJobID(ctx context.Context, jobID xsf.ID, opts *biz.CronJobRecordOpts) ([]*biz.CronJobRecord, error) {
func (x *cronJobRecordService) GetSliceByJobID(ctx context.Context, jobID xsf.ID) ([]*biz.CronJobRecord, error) {
if jobID == 0 {
return nil, nil
}
......@@ -88,10 +88,10 @@ func (x *cronJobRecordService) GetSliceByJobID(ctx context.Context, jobID xsf.ID
if len(cronJobRecords) == 0 {
return nil, nil
}
return x.ToSliceBiz(ctx, cronJobRecords, opts)
return x.ToSliceBiz(ctx, cronJobRecords)
}
func (x *cronJobRecordService) GetSliceByJobIDs(ctx context.Context, jobIDs []xsf.ID, opts *biz.CronJobRecordOpts) ([]*biz.CronJobRecord, error) {
func (x *cronJobRecordService) GetSliceByJobIDs(ctx context.Context, jobIDs []xsf.ID) ([]*biz.CronJobRecord, error) {
if len(jobIDs) == 0 {
return nil, nil
}
......@@ -102,14 +102,14 @@ func (x *cronJobRecordService) GetSliceByJobIDs(ctx context.Context, jobIDs []xs
if len(cronJobRecords) == 0 {
return nil, nil
}
return x.ToSliceBiz(ctx, cronJobRecords, opts)
return x.ToSliceBiz(ctx, cronJobRecords)
}
func (x *cronJobRecordService) GetMapSliceByJobIDs(ctx context.Context, jobIDs []xsf.ID, opts *biz.CronJobRecordOpts) (map[xsf.ID][]*biz.CronJobRecord, int, error) {
func (x *cronJobRecordService) GetMapSliceByJobIDs(ctx context.Context, jobIDs []xsf.ID) (map[xsf.ID][]*biz.CronJobRecord, int, error) {
if len(jobIDs) == 0 {
return nil, 0, nil
}
cronJobRecordBizSlice, err := x.GetSliceByJobIDs(ctx, jobIDs, opts)
cronJobRecordBizSlice, err := x.GetSliceByJobIDs(ctx, jobIDs)
if err != nil {
return nil, 0, err
}
......@@ -123,53 +123,23 @@ func (x *cronJobRecordService) GetMapSliceByJobIDs(ctx context.Context, jobIDs [
return ret, len(cronJobRecordBizSlice), nil
}
func (x *cronJobRecordService) ToBiz(ctx context.Context, cronJobRecord *models.CronJobRecord, opts *biz.CronJobRecordOpts) (cronJobRecordBiz *biz.CronJobRecord, err error) {
func (x *cronJobRecordService) ToBiz(ctx context.Context, cronJobRecord *models.CronJobRecord) (cronJobRecordBiz *biz.CronJobRecord, err error) {
if cronJobRecord == nil {
return nil, nil
}
cronJobRecordBiz = biz.CronJobRecordTool.NewFromModel(cronJobRecord)
if err = x.Fill(ctx, cronJobRecordBiz, opts); err != nil {
return nil, err
}
if err = biz.CronJobRecordTool.Valid(ctx, cronJobRecordBiz, opts); err != nil {
return nil, err
}
return cronJobRecordBiz, nil
}
func (x *cronJobRecordService) ToSliceBiz(ctx context.Context, cronJobRecords []*models.CronJobRecord, opts *biz.CronJobRecordOpts) (cronJobRecordBizSlice []*biz.CronJobRecord, err error) {
func (x *cronJobRecordService) ToSliceBiz(ctx context.Context, cronJobRecords []*models.CronJobRecord) (cronJobRecordBizSlice []*biz.CronJobRecord, err error) {
if len(cronJobRecords) == 0 {
return nil, nil
}
cronJobRecordBizSlice = biz.CronJobRecordTool.NewSliceFromModelsBiz(cronJobRecords)
if err = x.SliceFill(ctx, cronJobRecordBizSlice, opts); err != nil {
return nil, err
}
if err = biz.CronJobRecordTool.ValidSlice(ctx, cronJobRecordBizSlice, opts); err != nil {
return nil, err
}
return cronJobRecordBizSlice, nil
}
func (x *cronJobRecordService) Fill(ctx context.Context, cronJobRecordBiz *biz.CronJobRecord, opts *biz.CronJobRecordOpts) error {
if cronJobRecordBiz == nil {
return nil
}
if opts != nil {
}
return nil
}
func (x *cronJobRecordService) SliceFill(ctx context.Context, cronJobRecordBizSlice []*biz.CronJobRecord, opts *biz.CronJobRecordOpts) error {
if len(cronJobRecordBizSlice) == 0 {
return nil
}
if opts != nil {
}
return nil
}
func (x *cronJobRecordService) GetAll(ctx context.Context, opts *biz.CronJobRecordOpts) ([]*biz.CronJobRecord, error) {
func (x *cronJobRecordService) GetAll(ctx context.Context) ([]*biz.CronJobRecord, error) {
cronJobRecords, err := dao.CronJobRecordDao.GetAll(ctx)
if err != nil {
return nil, err
......@@ -177,5 +147,5 @@ func (x *cronJobRecordService) GetAll(ctx context.Context, opts *biz.CronJobReco
if len(cronJobRecords) == 0 {
return nil, nil
}
return x.ToSliceBiz(ctx, cronJobRecords, opts)
return x.ToSliceBiz(ctx, cronJobRecords)
}
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论