From a260203541b44e81de619ea5cc1ec46da0280342 Mon Sep 17 00:00:00 2001
From: liuxiaolong <736321739@qq.com>
Date: 星期三, 06 十一月 2019 11:05:19 +0800
Subject: [PATCH] fix getDevInfo

---
 dbpersonApi.go |  111 ++++++++++++++++++++++++++++++++++++++++++++++++++-----
 1 files changed, 101 insertions(+), 10 deletions(-)

diff --git a/dbpersonApi.go b/dbpersonApi.go
index e1a07f0..84256f5 100644
--- a/dbpersonApi.go
+++ b/dbpersonApi.go
@@ -7,11 +7,25 @@
 )
 
 type DbPersonApi struct {
+	Ip string
+	Port int
+}
 
+func (api DbPersonApi) getBasicUrl() string {
+	if api.Ip == "" {
+		return BASIC_URL
+	}
+	if api.Ip == "" {
+		api.Ip = DEFAULT_IP
+	}
+	if api.Port == 0 {
+		api.Port = DEFAULT_PORT
+	}
+	return "http://"+api.Ip+":"+strconv.Itoa(api.Port)
 }
 
 func (api DbPersonApi) QueryDbPersonsByTbId(paramBody map[string]interface{}) (bool,interface{}) {
-	url := BASIC_URL + DATA_URL_PREFIX + "/dbperson/queryDbPersonsByTbId"
+	url := api.getBasicUrl() + DATA_URL_PREFIX + "/dbperson/queryDbPersonsByTbId"
 	client := NewClient()
 	body,err := client.DoPostRequest(url,CONTENT_TYPE_JSON, paramBody,nil,nil)
 	if err != nil {
@@ -27,7 +41,7 @@
 }
 
 func (api DbPersonApi) UpdateDbPerson(paramBody map[string]interface{}) (bool,interface{}) {
-	url := BASIC_URL + DATA_URL_PREFIX + "/dbperson/updateDbPerson"
+	url := api.getBasicUrl() + DATA_URL_PREFIX + "/dbperson/updateDbPerson"
 	client := NewClient()
 	body,err := client.DoPostRequest(url,CONTENT_TYPE_JSON, paramBody,nil,nil)
 	if err != nil {
@@ -43,7 +57,7 @@
 }
 
 func (api DbPersonApi) UpdateFace(id string,faceFeature string, pic string) (bool,interface{}) {
-	url := BASIC_URL + DATA_URL_PREFIX + "/dbperson/updateFace"
+	url := api.getBasicUrl() + DATA_URL_PREFIX + "/dbperson/updateFace"
 	client := NewClient()
 	paramBody := map[string]interface{}{
 		"id": id,
@@ -64,7 +78,7 @@
 }
 
 func (api DbPersonApi) AddDbPerson(paramBody map[string]interface{}) (bool,interface{}) {
-	url := BASIC_URL + DATA_URL_PREFIX + "/dbperson/addDbPerson"
+	url := api.getBasicUrl() + DATA_URL_PREFIX + "/dbperson/addDbPerson"
 	client := NewClient()
 	body,err := client.DoPutRequest(url,CONTENT_TYPE_JSON, paramBody,nil)
 	if err != nil {
@@ -80,7 +94,7 @@
 }
 
 func (api DbPersonApi) DeleteDbPerson(id string) (bool,interface{}) {
-	url := BASIC_URL + DATA_URL_PREFIX + "/dbperson/deleteDbPersonById/"+id
+	url := api.getBasicUrl() + DATA_URL_PREFIX + "/dbperson/deleteDbPersonById/"+id
 	client := NewClient()
 	body,err := client.DoPostRequest(url,CONTENT_TYPE_JSON, nil,nil,nil)
 	if err != nil {
@@ -96,7 +110,7 @@
 }
 
 func (api DbPersonApi) DeleteMoreDbPerson(paramBody map[string]interface{}) (bool,interface{}) {
-	url := BASIC_URL + DATA_URL_PREFIX + "/dbperson/deleteMoreDbPerson"
+	url := api.getBasicUrl() + DATA_URL_PREFIX + "/dbperson/deleteMoreDbPerson"
 	client := NewClient()
 	body,err := client.DoPostRequest(url,CONTENT_TYPE_JSON, paramBody,nil,nil)
 	if err != nil {
@@ -112,7 +126,7 @@
 }
 
 func (api DbPersonApi) DeletePersonsByTbId(tableId string) (bool,interface{}) {
-	url := BASIC_URL + DATA_URL_PREFIX + "/dbperson/deletePersonsByTbId/"+tableId
+	url := api.getBasicUrl() + DATA_URL_PREFIX + "/dbperson/deletePersonsByTbId/"+tableId
 	client := NewClient()
 	body,err := client.DoPostRequest(url,CONTENT_TYPE_JSON, nil,nil,nil)
 	if err != nil {
@@ -129,7 +143,7 @@
 
 //鏍规嵁搴曞簱浜哄憳id鏌ヨ浜哄憳淇℃伅璇︽儏
 func (api DbPersonApi) Dbpersoninfosbyid (ids []string) (persons []protomsg.Dbperson,err error) {
-	url := BASIC_URL + DATA_URL_PREFIX + "/dbperson/dbPersonInfoByIds"
+	url := api.getBasicUrl() + DATA_URL_PREFIX + "/dbperson/dbPersonInfoByIds"
 	client := NewClient()
 	paramBody := map[string]interface{}{
 		"ids": ids,
@@ -151,7 +165,7 @@
 }
 
 func (api DbPersonApi) GetPersonTotal (tableId string) (total int64,err error) {
-	url := BASIC_URL + DATA_URL_PREFIX + "/dbperson/getPersonTotal"
+	url := api.getBasicUrl() + DATA_URL_PREFIX + "/dbperson/getPersonTotal"
 	client := NewClient()
 	paramBody := map[string]string{
 		"tableId": tableId,
@@ -170,7 +184,7 @@
 }
 
 func (api DbPersonApi) GetPersonsCompareCacheBase (from int,size int) (persons []*protomsg.Esinfo,err error) {
-	url := BASIC_URL + DATA_URL_PREFIX + "/dbperson/getPersonsCompareCacheBase"
+	url := api.getBasicUrl() + DATA_URL_PREFIX + "/dbperson/getPersonsCompareCacheBase"
 	client := NewClient()
 	paramBody := map[string]string{
 		"from": strconv.Itoa(from),
@@ -200,4 +214,81 @@
 		})
 	}
 	return persons,nil
+}
+
+func (api DbPersonApi) FindLikePersonIds (tableIds  []string,inputValue string) (interface{},error) {
+	url := api.getBasicUrl() + DATA_URL_PREFIX + "/dbperson/findLikePersonIds"
+	client := NewClient()
+	paramBody := map[string]interface{}{
+		"tableIds": tableIds,
+		"inputValue": inputValue,
+	}
+	body,err := client.DoPostRequest(url,CONTENT_TYPE_JSON, paramBody,nil,nil)
+	if err != nil {
+		return nil,err
+	}
+
+	var res Result
+	if err = json.Unmarshal(body, &res); err != nil {
+		return nil,err
+	}
+	return res.Data,nil
+}
+
+func (api DbPersonApi) JoinDbTable (tableIds  []string,faceFeature string, personPicUrl string) (bool,interface{}) {
+	url := api.getBasicUrl() + DATA_URL_PREFIX + "/dbperson/joinDbTable"
+	client := NewClient()
+	paramBody := map[string]interface{}{
+		"tableIds": tableIds,
+		"faceFeature": faceFeature,
+		"personPicUrl": personPicUrl,
+	}
+	body,err := client.DoPostRequest(url,CONTENT_TYPE_JSON, paramBody,nil,nil)
+	if err != nil {
+		return false,nil
+	}
+
+	var res Result
+	if err = json.Unmarshal(body, &res); err != nil {
+		return false,nil
+	}
+	return res.Success,res.Data
+}
+
+func (api DbPersonApi) Move (personId string,tableIds []string) (bool,interface{}) {
+	url := api.getBasicUrl() + DATA_URL_PREFIX + "/dbperson/move"
+	client := NewClient()
+	paramBody := map[string]interface{}{
+		"personId": personId,
+		"tableIds": tableIds,
+	}
+	body,err := client.DoPostRequest(url,CONTENT_TYPE_JSON, paramBody,nil,nil)
+	if err != nil {
+		return false,nil
+	}
+
+	var res Result
+	if err = json.Unmarshal(body, &res); err != nil {
+		return false,nil
+	}
+	return res.Success,res.Data
+}
+
+func (api DbPersonApi) Copy (personId string,tableIds []string) (bool,interface{}) {
+	url := api.getBasicUrl() + DATA_URL_PREFIX + "/dbperson/copy"
+	client := NewClient()
+	paramBody := map[string]interface{}{
+		"personId": personId,
+		"tableIds": tableIds,
+	}
+	body,err := client.DoPostRequest(url,CONTENT_TYPE_JSON, paramBody,nil,nil)
+	if err != nil {
+		return false,nil
+	}
+
+	var res Result
+	if err = json.Unmarshal(body, &res); err != nil {
+		return false,nil
+	}
+	return res.Success,res.Data
 }
\ No newline at end of file

--
Gitblit v1.8.0