liulei/jx-callback
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

- 去掉dao对于jxutils的依赖

Browse Source
This commit is contained in:
gazebo
2019-03-25 18:28:00 +08:00
parent 2a6f8b9120
commit 344b17d8ca
7 changed files with 128 additions and 125 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
business/model/dao/dao_bz.go
View File

@@ -5,9 +5,9 @@ import (
"time"
"git.rosy.net.cn/baseapi/utils"
"git.rosy.net.cn/jx-callback/business/jxutils"
"git.rosy.net.cn/jx-callback/business/model"
"git.rosy.net.cn/jx-callback/globals"
"git.rosy.net.cn/jx-callback/globals/refutil"
"github.com/astaxie/beego/orm"
)
@@ -44,7 +44,7 @@ func UpdateEntityByKV(db *DaoDB, item interface{}, kvs map[string]interface{}, c
}
qs := db.db.QueryTable(item)
if conditions == nil {
qs = qs.Filter(model.FieldID, jxutils.GetObjFieldByName(item, model.FieldID))
qs = qs.Filter(model.FieldID, refutil.GetObjFieldByName(item, model.FieldID))
} else {
for k, v := range conditions {
qs = qs.Filter(k, v)
@@ -77,7 +77,7 @@ func UpdateEntityLogicallyAndUpdateSyncStatus(db *DaoDB, item interface{}, kvs m
})
} else {
conditions = map[string]interface{}{
model.FieldID: jxutils.GetObjFieldByName(item, model.FieldID),
model.FieldID: refutil.GetObjFieldByName(item, model.FieldID),
}
}
typeInfo := reflect.TypeOf(item)

12
business/model/dao/dao_utils.go
View File

@@ -7,13 +7,13 @@ import (
"time"
"git.rosy.net.cn/baseapi/utils"
"git.rosy.net.cn/jx-callback/business/jxutils"
"git.rosy.net.cn/jx-callback/business/model"
"git.rosy.net.cn/jx-callback/globals/refutil"
)
func IDCULDFilterMapByStructObject(mapData map[string]interface{}, obj interface{}, isCheckValue bool) (valid map[string]interface{}, invalid map[string]interface{}) {
// 这里必须用首字母小写，因为是用于访问map，是用于访问map，是需要完全匹配的
return jxutils.FilterMapByStructObject(mapData, obj, []string{"id", "createdAt", "updatedAt", "finishedAt", "deletedAt", "syncStatus", "lastOperator"}, isCheckValue)
return refutil.FilterMapByStructObject(mapData, obj, []string{"id", "createdAt", "updatedAt", "finishedAt", "deletedAt", "syncStatus", "lastOperator"}, isCheckValue)
}
func NormalMakeMapByStructObject(mapData map[string]interface{}, obj interface{}, userName string) (retVal map[string]interface{}) {
@@ -27,7 +27,7 @@ func StrictMakeMapByStructObject(mapData map[string]interface{}, obj interface{}
}
func NormalMakeMapByFieldList(mapData map[string]interface{}, fields []string, userName string) (retVal map[string]interface{}) {
retVal, _ = jxutils.FilterMapByFieldList(mapData, fields)
retVal, _ = refutil.FilterMapByFieldList(mapData, fields)
return retVal
}
@@ -39,7 +39,7 @@ func WrapAddIDCULEntity(item interface{}, lastOperator string) interface{} {
mapData[model.FieldUpdatedAt] = now
mapData[model.FieldLastOperator] = lastOperator
} else {
value := jxutils.CheckAndGetStructValue(item)
value := refutil.CheckAndGetStructValue(item)
nowValue := reflect.ValueOf(now)
value.FieldByName(model.FieldID).SetInt(0)
value.FieldByName(model.FieldCreatedAt).Set(nowValue)
@@ -53,7 +53,7 @@ func WrapAddIDCULDEntity(item interface{}, lastOperator string) interface{} {
if mapData, ok := item.(map[string]interface{}); ok {
mapData[model.FieldDeletedAt] = utils.DefaultTimeValue
} else {
value := jxutils.CheckAndGetStructValue(item)
value := refutil.CheckAndGetStructValue(item)
value.FieldByName(model.FieldDeletedAt).Set(reflect.ValueOf(utils.DefaultTimeValue))
}
return WrapAddIDCULEntity(item, lastOperator)
@@ -65,7 +65,7 @@ func WrapUpdateULEntity(item interface{}, lastOperator string) interface{} {
mapData[model.FieldUpdatedAt] = now
mapData[model.FieldLastOperator] = lastOperator
} else {
value := jxutils.CheckAndGetStructValue(item)
value := refutil.CheckAndGetStructValue(item)
nowValue := reflect.ValueOf(now)
value.FieldByName(model.FieldUpdatedAt).Set(nowValue)
value.FieldByName(model.FieldLastOperator).SetString(lastOperator)