- 去掉dao对于jxutils的依赖

business/jxutils/jxutils.go

@@ -9,8 +9,6 @@ import (
 	"sync"
 	"time"
 
-	"github.com/fatih/structs"
-
 	"git.rosy.net.cn/baseapi/platformapi/autonavi"
 	"git.rosy.net.cn/baseapi/utils"
 	"git.rosy.net.cn/baseapi/utils/routinepool"
@@ -343,63 +341,6 @@ func SplitSkuName(skuName string) (prefix, name, comment, specUnit, unit string,
 	return prefix, name, comment, specUnit, unit, specQuality
 }
 
-func FlatMap(in map[string]interface{}) map[string]interface{} {
-	keys := []string{}
-	maps := []map[string]interface{}{}
-	for k, v := range in {
-		if vMap, ok := v.(map[string]interface{}); ok {
-			vMap = FlatMap(vMap)
-			maps = append(maps, vMap)
-			keys = append(keys, k)
-		}
-	}
-	if len(maps) > 0 {
-		retVal := utils.MergeMaps(in, maps...)
-		for _, v := range keys {
-			delete(retVal, v)
-		}
-		return retVal
-	}
-	return in
-}
-
-func Struct2FlatMap(obj interface{}) map[string]interface{} {
-	m := structs.Map(obj)
-	return FlatMap(m)
-}
-
-// todo 这里看是否需要将key值转换成标准格式（即字母大写），因为beego orm不区分，不转换也可以
-func FilterMapByStructObject(mapData map[string]interface{}, obj interface{}, excludedFields []string, isCheckValue bool) (valid map[string]interface{}, invalid map[string]interface{}) {
-	excludedMap := make(map[string]int)
-	for _, v := range excludedFields {
-		excludedMap[v] = 1
-	}
-	m := Struct2FlatMap(obj)
-	valid = make(map[string]interface{})
-	invalid = make(map[string]interface{})
-	for k, v := range mapData {
-		if m[k] != nil && excludedMap[k] == 0 && v != nil && (!isCheckValue || !IsValueEqual(m[k], v)) {
-			valid[k] = v
-		} else {
-			invalid[k] = v
-		}
-	}
-	return valid, invalid
-}
-
-func FilterMapByFieldList(mapData map[string]interface{}, fields []string) (valid map[string]interface{}, invalid map[string]interface{}) {
-	valid = make(map[string]interface{})
-	invalid = make(map[string]interface{})
-	for _, field := range fields {
-		if mapData[field] != nil {
-			valid[field] = mapData[field]
-		} else {
-			invalid[field] = mapData[field]
-		}
-	}
-	return valid, invalid
-}
-
 func MakeValidationMapFromSlice(validValues []string, flag int) map[string]int {
 	retVal := make(map[string]int)
 	for _, v := range validValues {
@@ -452,7 +393,3 @@ func Strings2Objs(strAndObjAddPairs ...interface{}) (err error) {
 	}
 	return nil
 }
-
-func IsValueEqual(value1, value2 interface{}) bool {
-	return fmt.Sprint(value1) == fmt.Sprint(value2)
-}