v1.1
This commit is contained in:
@@ -8,33 +8,34 @@ import (
|
||||
"fmt"
|
||||
"strings"
|
||||
|
||||
"reflect"
|
||||
"time"
|
||||
|
||||
"ycc-server/common/globalkey"
|
||||
|
||||
"github.com/Masterminds/squirrel"
|
||||
"github.com/google/uuid"
|
||||
"github.com/pkg/errors"
|
||||
"github.com/zeromicro/go-zero/core/stores/builder"
|
||||
"github.com/zeromicro/go-zero/core/stores/cache"
|
||||
"github.com/zeromicro/go-zero/core/stores/sqlc"
|
||||
"github.com/zeromicro/go-zero/core/stores/sqlx"
|
||||
"github.com/zeromicro/go-zero/core/stringx"
|
||||
"ycc-server/common/globalkey"
|
||||
)
|
||||
|
||||
var (
|
||||
adminApiFieldNames = builder.RawFieldNames(&AdminApi{})
|
||||
adminApiRows = strings.Join(adminApiFieldNames, ",")
|
||||
adminApiRowsExpectAutoSet = strings.Join(stringx.Remove(adminApiFieldNames, "`id`", "`create_time`", "`update_time`"), ",")
|
||||
adminApiRowsExpectAutoSet = strings.Join(stringx.Remove(adminApiFieldNames, "`create_time`", "`update_time`"), ",")
|
||||
adminApiRowsWithPlaceHolder = strings.Join(stringx.Remove(adminApiFieldNames, "`id`", "`create_time`", "`update_time`"), "=?,") + "=?"
|
||||
|
||||
cacheHmAdminApiIdPrefix = "cache:ycc:adminApi:id:"
|
||||
cacheHmAdminApiApiCodePrefix = "cache:ycc:adminApi:apiCode:"
|
||||
cacheYccAdminApiIdPrefix = "cache:ycc:adminApi:id:"
|
||||
cacheYccAdminApiApiCodePrefix = "cache:ycc:adminApi:apiCode:"
|
||||
)
|
||||
|
||||
type (
|
||||
adminApiModel interface {
|
||||
Insert(ctx context.Context, session sqlx.Session, data *AdminApi) (sql.Result, error)
|
||||
FindOne(ctx context.Context, id int64) (*AdminApi, error)
|
||||
FindOne(ctx context.Context, id string) (*AdminApi, error)
|
||||
FindOneByApiCode(ctx context.Context, apiCode string) (*AdminApi, error)
|
||||
Update(ctx context.Context, session sqlx.Session, data *AdminApi) (sql.Result, error)
|
||||
UpdateWithVersion(ctx context.Context, session sqlx.Session, data *AdminApi) error
|
||||
@@ -48,7 +49,7 @@ type (
|
||||
FindPageListByPageWithTotal(ctx context.Context, rowBuilder squirrel.SelectBuilder, page, pageSize int64, orderBy string) ([]*AdminApi, int64, error)
|
||||
FindPageListByIdDESC(ctx context.Context, rowBuilder squirrel.SelectBuilder, preMinId, pageSize int64) ([]*AdminApi, error)
|
||||
FindPageListByIdASC(ctx context.Context, rowBuilder squirrel.SelectBuilder, preMaxId, pageSize int64) ([]*AdminApi, error)
|
||||
Delete(ctx context.Context, session sqlx.Session, id int64) error
|
||||
Delete(ctx context.Context, session sqlx.Session, id string) error
|
||||
}
|
||||
|
||||
defaultAdminApiModel struct {
|
||||
@@ -57,7 +58,7 @@ type (
|
||||
}
|
||||
|
||||
AdminApi struct {
|
||||
Id int64 `db:"id"`
|
||||
Id string `db:"id"`
|
||||
CreateTime time.Time `db:"create_time"`
|
||||
UpdateTime time.Time `db:"update_time"`
|
||||
DeleteTime sql.NullTime `db:"delete_time"` // 删除时间
|
||||
@@ -81,21 +82,38 @@ func newAdminApiModel(conn sqlx.SqlConn, c cache.CacheConf) *defaultAdminApiMode
|
||||
|
||||
func (m *defaultAdminApiModel) Insert(ctx context.Context, session sqlx.Session, data *AdminApi) (sql.Result, error) {
|
||||
data.DelState = globalkey.DelStateNo
|
||||
hmAdminApiApiCodeKey := fmt.Sprintf("%s%v", cacheHmAdminApiApiCodePrefix, data.ApiCode)
|
||||
hmAdminApiIdKey := fmt.Sprintf("%s%v", cacheHmAdminApiIdPrefix, data.Id)
|
||||
m.insertUUID(data)
|
||||
yccAdminApiApiCodeKey := fmt.Sprintf("%s%v", cacheYccAdminApiApiCodePrefix, data.ApiCode)
|
||||
yccAdminApiIdKey := fmt.Sprintf("%s%v", cacheYccAdminApiIdPrefix, data.Id)
|
||||
return m.ExecCtx(ctx, func(ctx context.Context, conn sqlx.SqlConn) (result sql.Result, err error) {
|
||||
query := fmt.Sprintf("insert into %s (%s) values (?, ?, ?, ?, ?, ?, ?, ?, ?)", m.table, adminApiRowsExpectAutoSet)
|
||||
query := fmt.Sprintf("insert into %s (%s) values (?, ?, ?, ?, ?, ?, ?, ?, ?, ?)", m.table, adminApiRowsExpectAutoSet)
|
||||
if session != nil {
|
||||
return session.ExecCtx(ctx, query, data.DeleteTime, data.DelState, data.Version, data.ApiName, data.ApiCode, data.Method, data.Url, data.Status, data.Description)
|
||||
return session.ExecCtx(ctx, query, data.Id, data.DeleteTime, data.DelState, data.Version, data.ApiName, data.ApiCode, data.Method, data.Url, data.Status, data.Description)
|
||||
}
|
||||
return conn.ExecCtx(ctx, query, data.DeleteTime, data.DelState, data.Version, data.ApiName, data.ApiCode, data.Method, data.Url, data.Status, data.Description)
|
||||
}, hmAdminApiApiCodeKey, hmAdminApiIdKey)
|
||||
return conn.ExecCtx(ctx, query, data.Id, data.DeleteTime, data.DelState, data.Version, data.ApiName, data.ApiCode, data.Method, data.Url, data.Status, data.Description)
|
||||
}, yccAdminApiApiCodeKey, yccAdminApiIdKey)
|
||||
}
|
||||
func (m *defaultAdminApiModel) insertUUID(data *AdminApi) {
|
||||
t := reflect.TypeOf(data).Elem()
|
||||
v := reflect.ValueOf(data).Elem()
|
||||
for i := 0; i < t.NumField(); i++ {
|
||||
sf := t.Field(i)
|
||||
if sf.Tag.Get("db") == "id" {
|
||||
f := v.Field(i)
|
||||
if f.IsValid() && f.CanSet() && f.Kind() == reflect.String {
|
||||
if f.String() == "" {
|
||||
f.SetString(uuid.NewString())
|
||||
}
|
||||
}
|
||||
break
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
func (m *defaultAdminApiModel) FindOne(ctx context.Context, id int64) (*AdminApi, error) {
|
||||
hmAdminApiIdKey := fmt.Sprintf("%s%v", cacheHmAdminApiIdPrefix, id)
|
||||
func (m *defaultAdminApiModel) FindOne(ctx context.Context, id string) (*AdminApi, error) {
|
||||
yccAdminApiIdKey := fmt.Sprintf("%s%v", cacheYccAdminApiIdPrefix, id)
|
||||
var resp AdminApi
|
||||
err := m.QueryRowCtx(ctx, &resp, hmAdminApiIdKey, func(ctx context.Context, conn sqlx.SqlConn, v interface{}) error {
|
||||
err := m.QueryRowCtx(ctx, &resp, yccAdminApiIdKey, func(ctx context.Context, conn sqlx.SqlConn, v interface{}) error {
|
||||
query := fmt.Sprintf("select %s from %s where `id` = ? and del_state = ? limit 1", adminApiRows, m.table)
|
||||
return conn.QueryRowCtx(ctx, v, query, id, globalkey.DelStateNo)
|
||||
})
|
||||
@@ -110,9 +128,9 @@ func (m *defaultAdminApiModel) FindOne(ctx context.Context, id int64) (*AdminApi
|
||||
}
|
||||
|
||||
func (m *defaultAdminApiModel) FindOneByApiCode(ctx context.Context, apiCode string) (*AdminApi, error) {
|
||||
hmAdminApiApiCodeKey := fmt.Sprintf("%s%v", cacheHmAdminApiApiCodePrefix, apiCode)
|
||||
yccAdminApiApiCodeKey := fmt.Sprintf("%s%v", cacheYccAdminApiApiCodePrefix, apiCode)
|
||||
var resp AdminApi
|
||||
err := m.QueryRowIndexCtx(ctx, &resp, hmAdminApiApiCodeKey, m.formatPrimary, func(ctx context.Context, conn sqlx.SqlConn, v interface{}) (i interface{}, e error) {
|
||||
err := m.QueryRowIndexCtx(ctx, &resp, yccAdminApiApiCodeKey, m.formatPrimary, func(ctx context.Context, conn sqlx.SqlConn, v interface{}) (i interface{}, e error) {
|
||||
query := fmt.Sprintf("select %s from %s where `api_code` = ? and del_state = ? limit 1", adminApiRows, m.table)
|
||||
if err := conn.QueryRowCtx(ctx, &resp, query, apiCode, globalkey.DelStateNo); err != nil {
|
||||
return nil, err
|
||||
@@ -134,15 +152,15 @@ func (m *defaultAdminApiModel) Update(ctx context.Context, session sqlx.Session,
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
hmAdminApiApiCodeKey := fmt.Sprintf("%s%v", cacheHmAdminApiApiCodePrefix, data.ApiCode)
|
||||
hmAdminApiIdKey := fmt.Sprintf("%s%v", cacheHmAdminApiIdPrefix, data.Id)
|
||||
yccAdminApiApiCodeKey := fmt.Sprintf("%s%v", cacheYccAdminApiApiCodePrefix, data.ApiCode)
|
||||
yccAdminApiIdKey := fmt.Sprintf("%s%v", cacheYccAdminApiIdPrefix, data.Id)
|
||||
return m.ExecCtx(ctx, func(ctx context.Context, conn sqlx.SqlConn) (result sql.Result, err error) {
|
||||
query := fmt.Sprintf("update %s set %s where `id` = ?", m.table, adminApiRowsWithPlaceHolder)
|
||||
if session != nil {
|
||||
return session.ExecCtx(ctx, query, newData.DeleteTime, newData.DelState, newData.Version, newData.ApiName, newData.ApiCode, newData.Method, newData.Url, newData.Status, newData.Description, newData.Id)
|
||||
}
|
||||
return conn.ExecCtx(ctx, query, newData.DeleteTime, newData.DelState, newData.Version, newData.ApiName, newData.ApiCode, newData.Method, newData.Url, newData.Status, newData.Description, newData.Id)
|
||||
}, hmAdminApiApiCodeKey, hmAdminApiIdKey)
|
||||
}, yccAdminApiApiCodeKey, yccAdminApiIdKey)
|
||||
}
|
||||
|
||||
func (m *defaultAdminApiModel) UpdateWithVersion(ctx context.Context, session sqlx.Session, newData *AdminApi) error {
|
||||
@@ -157,15 +175,15 @@ func (m *defaultAdminApiModel) UpdateWithVersion(ctx context.Context, session sq
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
hmAdminApiApiCodeKey := fmt.Sprintf("%s%v", cacheHmAdminApiApiCodePrefix, data.ApiCode)
|
||||
hmAdminApiIdKey := fmt.Sprintf("%s%v", cacheHmAdminApiIdPrefix, data.Id)
|
||||
yccAdminApiApiCodeKey := fmt.Sprintf("%s%v", cacheYccAdminApiApiCodePrefix, data.ApiCode)
|
||||
yccAdminApiIdKey := fmt.Sprintf("%s%v", cacheYccAdminApiIdPrefix, data.Id)
|
||||
sqlResult, err = m.ExecCtx(ctx, func(ctx context.Context, conn sqlx.SqlConn) (result sql.Result, err error) {
|
||||
query := fmt.Sprintf("update %s set %s where `id` = ? and version = ? ", m.table, adminApiRowsWithPlaceHolder)
|
||||
if session != nil {
|
||||
return session.ExecCtx(ctx, query, newData.DeleteTime, newData.DelState, newData.Version, newData.ApiName, newData.ApiCode, newData.Method, newData.Url, newData.Status, newData.Description, newData.Id, oldVersion)
|
||||
}
|
||||
return conn.ExecCtx(ctx, query, newData.DeleteTime, newData.DelState, newData.Version, newData.ApiName, newData.ApiCode, newData.Method, newData.Url, newData.Status, newData.Description, newData.Id, oldVersion)
|
||||
}, hmAdminApiApiCodeKey, hmAdminApiIdKey)
|
||||
}, yccAdminApiApiCodeKey, yccAdminApiIdKey)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
@@ -382,25 +400,25 @@ func (m *defaultAdminApiModel) Trans(ctx context.Context, fn func(ctx context.Co
|
||||
func (m *defaultAdminApiModel) SelectBuilder() squirrel.SelectBuilder {
|
||||
return squirrel.Select().From(m.table)
|
||||
}
|
||||
func (m *defaultAdminApiModel) Delete(ctx context.Context, session sqlx.Session, id int64) error {
|
||||
func (m *defaultAdminApiModel) Delete(ctx context.Context, session sqlx.Session, id string) error {
|
||||
data, err := m.FindOne(ctx, id)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
hmAdminApiApiCodeKey := fmt.Sprintf("%s%v", cacheHmAdminApiApiCodePrefix, data.ApiCode)
|
||||
hmAdminApiIdKey := fmt.Sprintf("%s%v", cacheHmAdminApiIdPrefix, id)
|
||||
yccAdminApiApiCodeKey := fmt.Sprintf("%s%v", cacheYccAdminApiApiCodePrefix, data.ApiCode)
|
||||
yccAdminApiIdKey := fmt.Sprintf("%s%v", cacheYccAdminApiIdPrefix, id)
|
||||
_, err = m.ExecCtx(ctx, func(ctx context.Context, conn sqlx.SqlConn) (result sql.Result, err error) {
|
||||
query := fmt.Sprintf("delete from %s where `id` = ?", m.table)
|
||||
if session != nil {
|
||||
return session.ExecCtx(ctx, query, id)
|
||||
}
|
||||
return conn.ExecCtx(ctx, query, id)
|
||||
}, hmAdminApiApiCodeKey, hmAdminApiIdKey)
|
||||
}, yccAdminApiApiCodeKey, yccAdminApiIdKey)
|
||||
return err
|
||||
}
|
||||
func (m *defaultAdminApiModel) formatPrimary(primary interface{}) string {
|
||||
return fmt.Sprintf("%s%v", cacheHmAdminApiIdPrefix, primary)
|
||||
return fmt.Sprintf("%s%v", cacheYccAdminApiIdPrefix, primary)
|
||||
}
|
||||
func (m *defaultAdminApiModel) queryPrimary(ctx context.Context, conn sqlx.SqlConn, v, primary interface{}) error {
|
||||
query := fmt.Sprintf("select %s from %s where `id` = ? and del_state = ? limit 1", adminApiRows, m.table)
|
||||
|
||||
Reference in New Issue
Block a user