From 5a1127aca977be5f0b853fa436e1bd0aacb0fb28 Mon Sep 17 00:00:00 2001
From: liuxiaolong <736321739@qq.com>
Date: 星期五, 28 六月 2019 19:36:22 +0800
Subject: [PATCH] fix dbtable and person uuid

---
 controllers/dbtablesCon.go   |    6 +++---
 controllers/dbtableperson.go |    4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/controllers/dbtableperson.go b/controllers/dbtableperson.go
index 86caa20..0ab08be 100644
--- a/controllers/dbtableperson.go
+++ b/controllers/dbtableperson.go
@@ -49,7 +49,7 @@
 func addDbPerson(dbperson *models.Dbtablepersons) (result map[string]interface{}) {
 
 	personId := uuid.NewV4().String() //  浠ュ悗鏇夸唬 渚濇嵁鐢熸垚瑙勫垯
-	dbperson.Uuid = personId
+	dbperson.Id = personId
 	dbperson.PriInsert()
 	url := "http://" + config.EsInfo.Masterip + ":" + config.EsInfo.Httpport +
 		"/" + config.EsInfo.EsIndex.Dbtablepersons.IndexName + "/" + config.EsInfo.EsIndex.Dbtablepersons.IndexType + "/" + personId + "?refresh=wait_for"
@@ -77,7 +77,7 @@
 func (dbc DbPersonController) UpdateDbPerson(c *gin.Context) {
 	var dbperson models.Dbtablepersons
 	c.BindJSON(&dbperson)
-	personid := dbperson.Uuid
+	personid := dbperson.Id
 	if personid == "" {
 		util.ResponseFormat(c, code.RequestParamError, nil)
 		return
diff --git a/controllers/dbtablesCon.go b/controllers/dbtablesCon.go
index f6bf747..ee094e3 100644
--- a/controllers/dbtablesCon.go
+++ b/controllers/dbtablesCon.go
@@ -68,8 +68,8 @@
 	c.BindJSON(&dbtable)
 	uuid := c.Params.ByName("uuid")
 	if uuid == "" {
-		uuid = dbtable.Uuid
-		fmt.Println("body涓幏鍙栧簳搴搖uid")
+		uuid = dbtable.Id
+		fmt.Println("body涓幏鍙栧簳搴搃d")
 	}
 	url := "http://" + config.EsInfo.Masterip + ":" + config.EsInfo.Httpport +
 		"/" + config.EsInfo.EsIndex.DbTables.IndexName + "/" + config.EsInfo.EsIndex.DbTables.IndexType + "/" + uuid + "/_update"
@@ -106,7 +106,7 @@
 	dbtable := new(models.Dbtables)
 	c.BindJSON(&dbtable)
 	tableId := uuid.NewV4().String()
-	dbtable.Uuid = tableId
+	dbtable.Id = tableId
 	url := "http://" + config.EsInfo.Masterip + ":" + config.EsInfo.Httpport +
 		"/" + config.EsInfo.EsIndex.DbTables.IndexName + "/" + config.EsInfo.EsIndex.DbTables.IndexType + "/" + tableId
 	dbtable.PriInsert() // 娣诲姞鏃堕棿鍜屽垱寤轰汉

--
Gitblit v1.8.0