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 |  145 ++++++++++++++++++++++++++++++++++++++++--------
 1 files changed, 120 insertions(+), 25 deletions(-)

diff --git a/esutil/EsApi.go b/esutil/EsApi.go
index 046647c..7e7cbf1 100644
--- a/esutil/EsApi.go
+++ b/esutil/EsApi.go
@@ -2,12 +2,16 @@
 
 import (
         "errors"
-        "strconv"
+    "fmt"
+    "strconv"
+    "strings"
 
-        "basic.com/pubsub/protomsg.git"
+    "basic.com/pubsub/protomsg.git"
         )
 
-func DbPersoninfos( queryindex int, querynums int ) (dbpersoninfos []protomsg.Baseinfo, err error){
+// 鏌ヨ搴曞簱浜哄憳淇℃伅
+func DbPersoninfos( queryindex int, querynums int ) ([]*protomsg.Esinfo, error){
+            var dbinfos []*protomsg.Esinfo
             point   := strconv.Itoa(queryindex)
             number   := strconv.Itoa(querynums)
 
@@ -16,39 +20,130 @@
                     "query": {
                         "match_all": {}
                     },
-                        "size":`+ number +`,
-                        "_source": [
+                     "size":`+ number +`,
+                     "_source": [
+                       "id",
                        "tableId",
-                       "tableName",
-                       "compareScore",
-                       "personId",
-                       "personName",
-                       "personPicUrl",
-                       "phoneNum",
-                       "sex",
-                       "idCard",
-                       "monitorLevel",
-                       "faceFeature",
-                       "content",
-                       "id"
+                       "faceFeature"
                        ]
-                }`
+                    }`
 
-      // 杩斿洖璇锋眰鐨刡uf
-      buf, err := GetDbinfo(dbinfoRequest )
-      if err != nil {
-        return nil ,errors.New("http request get dbperson info is err!")
-      }
+    buf, err := EsReq("POST", "http://192.168.1.182:9200/dbtablepersons/dbpersons/_search",[]byte(dbinfoRequest))
+    if err != nil {
+        return dbinfos ,errors.New("http request dbtablename info is err!")
+    }
 
       // 杩斿洖 _source 鏁扮粍
       sources, err := Sourcelist(buf)
       if err != nil {
-            return nil,err 
+            return dbinfos,err 
       }
 
       // 杩斿洖鎵�鏈夋煡璇㈢殑鏁版嵁
-      dbpersoninfos =  Parsesources(sources)
+     dbpersoninfos :=  Parsesources(sources)
       return dbpersoninfos, nil
 }
 
+// 鏍规嵁搴曞簱id鏌ヨ搴曞簱淇℃伅
+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) {
+    var dbinfotable =` {
+        "query": {
+            "bool": {
+                "filter": [
+                {
+                    "term": {
+                        "id":"`+tableid+`"
+                    }
+                }
+                ]
+            }
+        },
+        "_source": [
+            "tableName"
+        ]
+    }
+    `
+    buf, err := EsReq("POST", "http://192.168.1.182:9200/dbtables/_search",[]byte(dbinfotable))
+    if err != nil {
+        return "" ,errors.New("http request dbtablename info is err!")
+    }
+    sources, err := Sourcelist(buf)
+    if err != nil {
+          return "",err 
+    }
+
+    for _, source := range sources {
+        if name, ok := source["tableName"].(string); ok {
+            tablename = name
+            break
+        }
+    }
+    return tablename, nil 
+}

--
Gitblit v1.8.0