From 590c075d30a61f9ecb380a908860d6c827526e09 Mon Sep 17 00:00:00 2001
From: panlei <2799247126@qq.com>
Date: 星期四, 22 八月 2019 16:08:24 +0800
Subject: [PATCH] Merge branch 'master' of https://192.168.1.14/r/dbapi

---
 dbpersonApi.go |   20 ++++++++++++++------
 1 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/dbpersonApi.go b/dbpersonApi.go
index af6c848..ec27bc3 100644
--- a/dbpersonApi.go
+++ b/dbpersonApi.go
@@ -129,11 +129,13 @@
 	return persons,nil
 }
 
-func (api DbPersonApi) GetPersonTotal () (total int64,err error) {
+func (api DbPersonApi) GetPersonTotal (tableId string) (total int64,err error) {
 	url := BASIC_URL + DATA_URL_PREFIX + "/dbperson/getPersonTotal"
 	client := NewClient()
-
-	body,err := client.DoPostRequest(url,CONTENT_TYPE_JSON, nil,nil,nil)
+	paramBody := map[string]string{
+		"tableId": tableId,
+	}
+	body,err := client.DoGetRequest(url, paramBody,nil)
 	if err != nil {
 		return 0,err
 	}
@@ -143,11 +145,11 @@
 		return 0,err
 	}
 
-	return res.Data.(int64),nil
+	return int64(res.Data.(float64)),nil
 }
 
 func (api DbPersonApi) GetPersonsCompareCacheBase (from int,size int) (persons []*protomsg.Esinfo,err error) {
-	url := BASIC_URL + DATA_URL_PREFIX + "/dbperson/dbPersonInfoByIds"
+	url := BASIC_URL + DATA_URL_PREFIX + "/dbperson/getPersonsCompareCacheBase"
 	client := NewClient()
 	paramBody := map[string]string{
 		"from": strconv.Itoa(from),
@@ -163,12 +165,18 @@
 		return nil,err
 	}
 	dataBytes, _ := json.Marshal(res.Data)
+
 	var arr []protomsg.Esinfo
 	if err = json.Unmarshal(dataBytes, &arr);err !=nil {
 		return nil,err
 	}
 	for _,ei :=range arr {
-		persons = append(persons,&ei)
+		persons = append(persons,&protomsg.Esinfo{
+			Id: ei.Id,
+			Tableid: ei.Tableid,
+			FaceFeature: ei.FaceFeature,
+			Enable: ei.Enable,
+		})
 	}
 	return persons,nil
 }
\ No newline at end of file

--
Gitblit v1.8.0