|
@@ -3,7 +3,6 @@ package service
|
|
|
import (
|
|
import (
|
|
|
"app.yhyue.com/moapp/jybase/common"
|
|
"app.yhyue.com/moapp/jybase/common"
|
|
|
ME "app.yhyue.com/moapp/jybase/encrypt"
|
|
ME "app.yhyue.com/moapp/jybase/encrypt"
|
|
|
- elastic "app.yhyue.com/moapp/jybase/es"
|
|
|
|
|
"app.yhyue.com/moapp/jybase/mongodb"
|
|
"app.yhyue.com/moapp/jybase/mongodb"
|
|
|
"app.yhyue.com/moapp/jybase/redis"
|
|
"app.yhyue.com/moapp/jybase/redis"
|
|
|
IC "bp.jydev.jianyu360.cn/BaseService/jyMicroservices/jyBXCore/rpc/init"
|
|
IC "bp.jydev.jianyu360.cn/BaseService/jyMicroservices/jyBXCore/rpc/init"
|
|
@@ -894,11 +893,11 @@ func SearchList(operator Operator) (int64, *[]map[string]interface{}, int64) {
|
|
|
fmt.Println(start1)
|
|
fmt.Println(start1)
|
|
|
var count int64
|
|
var count int64
|
|
|
var data *[]map[string]interface{}
|
|
var data *[]map[string]interface{}
|
|
|
- count, data = elastic.GetWithCount(yysIndex, yysType, "", queryStr)
|
|
|
|
|
|
|
+ count, data = IC.FreeEs.GetWithCount(yysIndex, yysType, "", queryStr)
|
|
|
end1 := time.Now().Unix()
|
|
end1 := time.Now().Unix()
|
|
|
fmt.Println(end1)
|
|
fmt.Println(end1)
|
|
|
fmt.Println("时差", end1-start1)
|
|
fmt.Println("时差", end1-start1)
|
|
|
- if len(*data) > 0 {
|
|
|
|
|
|
|
+ if data != nil && len(*data) > 0 {
|
|
|
//查询tidb真实数据
|
|
//查询tidb真实数据
|
|
|
idArr := []interface{}{}
|
|
idArr := []interface{}{}
|
|
|
wh := []string{}
|
|
wh := []string{}
|
