From e73efb4afc3bc91ddc49ac63f0f3db463d1f8cc1 Mon Sep 17 00:00:00 2001
From: 554325746@qq.com <554325746@qq.com>
Date: 星期五, 12 七月 2019 17:50:28 +0800
Subject: [PATCH] modify cam to Cam

---
 esutil/EsApi.go |   82 ++++++++++++++++++++++++++++++++++-------
 1 files changed, 68 insertions(+), 14 deletions(-)

diff --git a/esutil/EsApi.go b/esutil/EsApi.go
index 7893b16..7e7cbf1 100644
--- a/esutil/EsApi.go
+++ b/esutil/EsApi.go
@@ -2,9 +2,11 @@
 
 import (
         "errors"
-        "strconv"
+    "fmt"
+    "strconv"
+    "strings"
 
-        "basic.com/pubsub/protomsg.git"
+    "basic.com/pubsub/protomsg.git"
         )
 
 // 鏌ヨ搴曞簱浜哄憳淇℃伅
@@ -43,19 +45,71 @@
 }
 
 // 鏍规嵁搴曞簱id鏌ヨ搴曞簱淇℃伅
-//func Dbpersoninfosbyid (id string) (protomsg.Baseinfo, error) {
-//    var dbinfo protomsg.Baseinfo
-//
-//    url := fmt.Sprintf("http://192.168.1.182:9200/dbtablepersons/dbpersons/_search", id)
-//    buf, err := EsReq("POST", "http://192.168.1.182:9200/dbtablepersons/dbpersons/_search",[]byte(dbinfoRequest))
-//    if err != nil {
-//        return dbinfo, nil 
-//    }
-//
-//    sources, err := Sourcelist(buf)
-//    if err != nil {}
-//}
+func Dbtablefosbyid (id []string) ([]protomsg.Dbtable, error) {
+    var dbinfo []protomsg.Dbtable
+    dbtableId := strings.Replace(strings.Trim(fmt.Sprint(id), "[]"), " ", "\",\"", -1)
+        var dbinfoRequest = `
+            {
+            	"query": {
+            		"bool": {
+            			"filter": [{
+            				"terms": {
+            					"_id": [
+            						"`+ dbtableId +`"
+            					]
+            				}
+            			}]
+            		}
+            	}
+            }
+        `
+    buf, err := EsReq("POST", "http://192.168.1.182:9200/dbtables/_search",[]byte(dbinfoRequest))
+    if err != nil {
+        return dbinfo,  err
+    }
 
+    sources, err := Sourcelist(buf)
+    if err != nil {
+        return dbinfo , err
+    }
+
+    dbtable := Dbtablebyid(sources)
+    return dbtable, nil
+}
+
+// 鏍规嵁搴曞簱浜哄憳id鏌ヨ搴曞簱浜哄憳淇℃伅
+func Dbpersoninfosbyid (id []string) ([]protomsg.Dbperson, error) {
+    var dbinfo []protomsg.Dbperson
+    dbtablePersonId := strings.Replace(strings.Trim(fmt.Sprint(id), "[]"), " ", "\",\"", -1)
+    var dbinfoRequest = `
+            {
+            	"query": {
+            		"bool": {
+            			"filter": [{
+            				"terms": {
+            					"_id": [
+            						"`+ dbtablePersonId +`"
+            					]
+            				}
+            			}]
+            		}
+            	}
+            }
+        `
+    buf, err := EsReq("POST", "http://192.168.1.182:9200/dbtablepersons/_search",[]byte(dbinfoRequest))
+    if err != nil {
+        return dbinfo,  err
+    }
+
+    sources, err := Sourcelist(buf)
+    if err != nil {
+        return dbinfo , err
+    }
+
+    dbperson := Dbpersonbyid(sources)
+    println(dbperson)
+    return dbperson,nil
+}
 
 // 鏍规嵁tableid 鏌ヨtablename
 func Dbtablename(tableid string ) (tablename string, err error) {

--
Gitblit v1.8.0