|
|
@@ -7,7 +7,7 @@ import (
|
|
|
"git.sxidc.com/go-framework/baize/framework/core/tag/sql/sql_mapping"
|
|
|
"git.sxidc.com/go-tools/utils/reflectutils"
|
|
|
"git.sxidc.com/go-tools/utils/strutils"
|
|
|
- "git.sxidc.com/service-supports/fserr"
|
|
|
+ "github.com/pkg/errors"
|
|
|
"reflect"
|
|
|
"strings"
|
|
|
"time"
|
|
|
@@ -54,11 +54,11 @@ func Transaction(executor Executor, txFunc func(tx Executor) error) error {
|
|
|
|
|
|
func InsertEntity(executor Executor, tableName string, e any) error {
|
|
|
if executor == nil {
|
|
|
- return fserr.New("没有传递执行器")
|
|
|
+ return errors.New("没有传递执行器")
|
|
|
}
|
|
|
|
|
|
if strutils.IsStringEmpty(tableName) {
|
|
|
- return fserr.New("没有传递表名")
|
|
|
+ return errors.New("没有传递表名")
|
|
|
}
|
|
|
|
|
|
if e == nil {
|
|
|
@@ -67,7 +67,7 @@ func InsertEntity(executor Executor, tableName string, e any) error {
|
|
|
|
|
|
entityType := reflect.TypeOf(e)
|
|
|
if !reflectutils.IsTypeStructOrStructPointer(entityType) {
|
|
|
- return fserr.New("实体参数不是结构或结构指针")
|
|
|
+ return errors.New("实体参数不是结构或结构指针")
|
|
|
}
|
|
|
|
|
|
fields, err := sql_mapping.DefaultUsage(e)
|
|
|
@@ -97,11 +97,11 @@ func InsertEntity(executor Executor, tableName string, e any) error {
|
|
|
|
|
|
func InsertEntityBatch(executor Executor, tableName string, es []any) error {
|
|
|
if executor == nil {
|
|
|
- return fserr.New("没有传递执行器")
|
|
|
+ return errors.New("没有传递执行器")
|
|
|
}
|
|
|
|
|
|
if strutils.IsStringEmpty(tableName) {
|
|
|
- return fserr.New("没有传递表名")
|
|
|
+ return errors.New("没有传递表名")
|
|
|
}
|
|
|
|
|
|
tableRowBatch := make([]sql.TableRow, 0)
|
|
|
@@ -113,7 +113,7 @@ func InsertEntityBatch(executor Executor, tableName string, es []any) error {
|
|
|
|
|
|
entityType := reflect.TypeOf(e)
|
|
|
if !reflectutils.IsTypeStructOrStructPointer(entityType) {
|
|
|
- return fserr.New("实体参数不是结构或结构指针")
|
|
|
+ return errors.New("实体参数不是结构或结构指针")
|
|
|
}
|
|
|
|
|
|
fields, err := sql_mapping.DefaultUsage(e)
|
|
|
@@ -163,11 +163,11 @@ func formInsertTableRow(fields []sql_mapping.Field) *sql.TableRow {
|
|
|
|
|
|
func DeleteEntity(executor Executor, tableName string, e any) error {
|
|
|
if executor == nil {
|
|
|
- return fserr.New("没有传递执行器")
|
|
|
+ return errors.New("没有传递执行器")
|
|
|
}
|
|
|
|
|
|
if strutils.IsStringEmpty(tableName) {
|
|
|
- return fserr.New("没有传递表名")
|
|
|
+ return errors.New("没有传递表名")
|
|
|
}
|
|
|
|
|
|
if e == nil {
|
|
|
@@ -176,7 +176,7 @@ func DeleteEntity(executor Executor, tableName string, e any) error {
|
|
|
|
|
|
entityType := reflect.TypeOf(e)
|
|
|
if !reflectutils.IsTypeStructOrStructPointer(entityType) {
|
|
|
- return fserr.New("实体参数不是结构或结构指针")
|
|
|
+ return errors.New("实体参数不是结构或结构指针")
|
|
|
}
|
|
|
|
|
|
fields, err := sql_mapping.DefaultUsage(e)
|
|
|
@@ -212,11 +212,11 @@ func DeleteEntity(executor Executor, tableName string, e any) error {
|
|
|
|
|
|
func UpdateEntity(executor Executor, tableName string, e any) error {
|
|
|
if executor == nil {
|
|
|
- return fserr.New("没有传递执行器")
|
|
|
+ return errors.New("没有传递执行器")
|
|
|
}
|
|
|
|
|
|
if strutils.IsStringEmpty(tableName) {
|
|
|
- return fserr.New("没有传递表名")
|
|
|
+ return errors.New("没有传递表名")
|
|
|
}
|
|
|
|
|
|
if e == nil {
|
|
|
@@ -225,7 +225,7 @@ func UpdateEntity(executor Executor, tableName string, e any) error {
|
|
|
|
|
|
entityType := reflect.TypeOf(e)
|
|
|
if !reflectutils.IsTypeStructOrStructPointer(entityType) {
|
|
|
- return fserr.New("实体参数不是结构或结构指针")
|
|
|
+ return errors.New("实体参数不是结构或结构指针")
|
|
|
}
|
|
|
|
|
|
fields, err := sql_mapping.DefaultUsage(e)
|
|
|
@@ -282,11 +282,11 @@ func UpdateEntity(executor Executor, tableName string, e any) error {
|
|
|
|
|
|
func Insert(executor Executor, executeParams *sql.InsertExecuteParams) error {
|
|
|
if executor == nil {
|
|
|
- return fserr.New("没有传递执行器")
|
|
|
+ return errors.New("没有传递执行器")
|
|
|
}
|
|
|
|
|
|
if executeParams == nil {
|
|
|
- return fserr.New("没有传递执行参数")
|
|
|
+ return errors.New("没有传递执行参数")
|
|
|
}
|
|
|
|
|
|
executeParamsMap, err := executeParams.Map()
|
|
|
@@ -304,11 +304,11 @@ func Insert(executor Executor, executeParams *sql.InsertExecuteParams) error {
|
|
|
|
|
|
func InsertBatch(executor Executor, executeParams *sql.InsertBatchExecuteParams) error {
|
|
|
if executor == nil {
|
|
|
- return fserr.New("没有传递执行器")
|
|
|
+ return errors.New("没有传递执行器")
|
|
|
}
|
|
|
|
|
|
if executeParams == nil {
|
|
|
- return fserr.New("没有传递执行参数")
|
|
|
+ return errors.New("没有传递执行参数")
|
|
|
}
|
|
|
|
|
|
executeParamsMap, err := executeParams.Map()
|
|
|
@@ -326,11 +326,11 @@ func InsertBatch(executor Executor, executeParams *sql.InsertBatchExecuteParams)
|
|
|
|
|
|
func Delete(executor Executor, executeParams *sql.DeleteExecuteParams) error {
|
|
|
if executor == nil {
|
|
|
- return fserr.New("没有传递执行器")
|
|
|
+ return errors.New("没有传递执行器")
|
|
|
}
|
|
|
|
|
|
if executeParams == nil {
|
|
|
- return fserr.New("没有传递执行参数")
|
|
|
+ return errors.New("没有传递执行参数")
|
|
|
}
|
|
|
|
|
|
executeParamsMap, err := executeParams.Map()
|
|
|
@@ -348,11 +348,11 @@ func Delete(executor Executor, executeParams *sql.DeleteExecuteParams) error {
|
|
|
|
|
|
func Update(executor Executor, executeParams *sql.UpdateExecuteParams) error {
|
|
|
if executor == nil {
|
|
|
- return fserr.New("没有传递执行器")
|
|
|
+ return errors.New("没有传递执行器")
|
|
|
}
|
|
|
|
|
|
if executeParams == nil {
|
|
|
- return fserr.New("没有传递执行参数")
|
|
|
+ return errors.New("没有传递执行参数")
|
|
|
}
|
|
|
|
|
|
executeParamsMap, err := executeParams.Map()
|
|
|
@@ -370,11 +370,11 @@ func Update(executor Executor, executeParams *sql.UpdateExecuteParams) error {
|
|
|
|
|
|
func Query(executor Executor, executeParams *sql.QueryExecuteParams) ([]sql.Result, int64, error) {
|
|
|
if executor == nil {
|
|
|
- return nil, 0, fserr.New("没有传递执行器")
|
|
|
+ return nil, 0, errors.New("没有传递执行器")
|
|
|
}
|
|
|
|
|
|
if executeParams == nil {
|
|
|
- return nil, 0, fserr.New("没有传递执行参数")
|
|
|
+ return nil, 0, errors.New("没有传递执行参数")
|
|
|
}
|
|
|
|
|
|
queryExecuteParamsMap, err := executeParams.Map()
|
|
|
@@ -410,11 +410,11 @@ func Query(executor Executor, executeParams *sql.QueryExecuteParams) ([]sql.Resu
|
|
|
|
|
|
func QueryOne(executor Executor, executeParams *sql.QueryOneExecuteParams) (sql.Result, error) {
|
|
|
if executor == nil {
|
|
|
- return nil, fserr.New("没有传递执行器")
|
|
|
+ return nil, errors.New("没有传递执行器")
|
|
|
}
|
|
|
|
|
|
if executeParams == nil {
|
|
|
- return nil, fserr.New("没有传递执行参数")
|
|
|
+ return nil, errors.New("没有传递执行参数")
|
|
|
}
|
|
|
|
|
|
executeParamsMap, err := executeParams.Map()
|
|
|
@@ -436,11 +436,11 @@ func QueryOne(executor Executor, executeParams *sql.QueryOneExecuteParams) (sql.
|
|
|
|
|
|
func Count(executor Executor, executeParams *sql.CountExecuteParams) (int64, error) {
|
|
|
if executor == nil {
|
|
|
- return 0, fserr.New("没有传递执行器")
|
|
|
+ return 0, errors.New("没有传递执行器")
|
|
|
}
|
|
|
|
|
|
if executeParams == nil {
|
|
|
- return 0, fserr.New("没有传递执行参数")
|
|
|
+ return 0, errors.New("没有传递执行参数")
|
|
|
}
|
|
|
|
|
|
executeParamsMap, err := executeParams.Map()
|
|
|
@@ -458,11 +458,11 @@ func Count(executor Executor, executeParams *sql.CountExecuteParams) (int64, err
|
|
|
|
|
|
func CheckExist(executor Executor, executeParams *sql.CheckExistExecuteParams) (bool, error) {
|
|
|
if executor == nil {
|
|
|
- return false, fserr.New("没有传递执行器")
|
|
|
+ return false, errors.New("没有传递执行器")
|
|
|
}
|
|
|
|
|
|
if executeParams == nil {
|
|
|
- return false, fserr.New("没有传递执行参数")
|
|
|
+ return false, errors.New("没有传递执行参数")
|
|
|
}
|
|
|
|
|
|
executeParamsMap, err := executeParams.Map()
|
|
|
@@ -480,11 +480,11 @@ func CheckExist(executor Executor, executeParams *sql.CheckExistExecuteParams) (
|
|
|
|
|
|
func CheckHasOnlyOne(executor Executor, executeParams *sql.CheckHasOnlyOneExecuteParams) (bool, error) {
|
|
|
if executor == nil {
|
|
|
- return false, fserr.New("没有传递执行器")
|
|
|
+ return false, errors.New("没有传递执行器")
|
|
|
}
|
|
|
|
|
|
if executeParams == nil {
|
|
|
- return false, fserr.New("没有传递执行参数")
|
|
|
+ return false, errors.New("没有传递执行参数")
|
|
|
}
|
|
|
|
|
|
executeParamsMap, err := executeParams.Map()
|
|
|
@@ -502,11 +502,11 @@ func CheckHasOnlyOne(executor Executor, executeParams *sql.CheckHasOnlyOneExecut
|
|
|
|
|
|
func ExecuteRawSql(executor Executor, sql string, executeParams map[string]any) ([]sql.Result, error) {
|
|
|
if executor == nil {
|
|
|
- return nil, fserr.New("没有传递执行器")
|
|
|
+ return nil, errors.New("没有传递执行器")
|
|
|
}
|
|
|
|
|
|
if strutils.IsStringEmpty(sql) {
|
|
|
- return nil, fserr.New("没有sql")
|
|
|
+ return nil, errors.New("没有sql")
|
|
|
}
|
|
|
|
|
|
tableRows, err := executor.ExecuteRawSql(sql, executeParams)
|
|
|
@@ -519,11 +519,11 @@ func ExecuteRawSql(executor Executor, sql string, executeParams map[string]any)
|
|
|
|
|
|
func ExecuteSql(executor Executor, name string, executeParams map[string]any) ([]sql.Result, error) {
|
|
|
if executor == nil {
|
|
|
- return nil, fserr.New("没有传递执行器")
|
|
|
+ return nil, errors.New("没有传递执行器")
|
|
|
}
|
|
|
|
|
|
if strutils.IsStringEmpty(name) {
|
|
|
- return nil, fserr.New("没有sql资源名称")
|
|
|
+ return nil, errors.New("没有sql资源名称")
|
|
|
}
|
|
|
|
|
|
tableRows, err := executor.ExecuteSql(name, executeParams)
|