From f3863b12653fc47996073710b56e792de0be4c8d Mon Sep 17 00:00:00 2001
From: sunty <1172534965@qq.com>
Date: 星期二, 25 六月 2019 17:57:05 +0800
Subject: [PATCH] 根据新索引结构修改算法和接口
---
controllers/dbtablesCon.go | 26 +++++++++++---------------
1 files changed, 11 insertions(+), 15 deletions(-)
diff --git a/controllers/dbtablesCon.go b/controllers/dbtablesCon.go
index 973a343..f6bf747 100644
--- a/controllers/dbtablesCon.go
+++ b/controllers/dbtablesCon.go
@@ -4,13 +4,13 @@
"encoding/json"
"fmt"
"github.com/gin-gonic/gin"
+ "github.com/satori/go.uuid"
+ "log"
"webserver/extend/code"
"webserver/extend/config"
"webserver/extend/esutil"
"webserver/extend/util"
"webserver/models"
- "github.com/satori/go.uuid"
- "log"
)
type DbTableController struct {
@@ -31,13 +31,13 @@
isSync := c.Params.ByName("isSync")
syncTerm := ""
if isSync == "1" {
- syncTerm = ",{\"term\":{\"syncType\":\"1\"}}" // 鍚屾搴�
+ syncTerm = ",{\"term\":{\"isSync\":\"1\"}}" // 鍚屾搴�
} else if isSync == "2" {
- syncTerm = ",{\"term\":{\"syncType\":\"2\"}}" // / 鏈湴搴�
+ syncTerm = ",{\"term\":{\"isSync\":\"2\"}}" // / 鏈湴搴�
}
params := "{\"query\":{\"bool\":{\"must\":[" +
- "{\"term\":{\"del_flag\":\"0\"}}" + syncTerm + "]}}," +
- "\"from\":0,\"size\":100,\"sort\":{\"uuid\":{\"order\":\"asc\"}}}"
+ "{\"term\":{\"isDelete\":\"0\"}}" + syncTerm + "]}}," +
+ "\"from\":0,\"size\":100,\"sort\":{\"id\":{\"order\":\"asc\"}}}"
fmt.Print("璇锋眰url:%s;\n 璇锋眰鍙傛暟params:%s", url, params)
data := esutil.GetEsDataReq(url, params, true)
@@ -46,17 +46,13 @@
}
// 渚濇嵁搴曞簱id 鏌ヨ鏁版嵁
-func QueryDbTableInfo(tableId string) map[string]interface{} {
+func QueryDbTableInfo(tableId string) map[string]interface{} {
url := "http://" + config.EsInfo.Masterip + ":" + config.EsInfo.Httpport +
- "/" + config.EsInfo.EsIndex.DbTables.IndexName +"/" + config.EsInfo.EsIndex.DbTables.IndexName + "/"+tableId
+ "/" + config.EsInfo.EsIndex.DbTables.IndexName + "/" + config.EsInfo.EsIndex.DbTables.IndexName + "/" + tableId
fmt.Print("璇锋眰url:%s;", url)
data := esutil.GetEsDataInfo(url, true)
return data
- }
-
-
-
-
+}
// @Summary 淇敼搴曞簱
// @Description 淇敼鍚屾鎴栨湰鍦板簱
@@ -121,7 +117,7 @@
//fmt.Printf("%s\n", dbTableByte)
params := string(dbTableByte)
fmt.Print("璇锋眰url:%s;\n 璇锋眰鍙傛暟params:%s", url, params)
- data,_ := esutil.PutEsDataReq(url, params)
+ data, _ := esutil.PutEsDataReq(url, params)
//c.JSON(200, changeEsRespData(data, "娣诲姞鎴愬姛"))
result := changeEsRespData(data, "娣诲姞鎴愬姛")
if result["success"].(bool) {
@@ -146,7 +142,7 @@
uuid := c.Params.ByName("uuid")
url := "http://" + config.EsInfo.Masterip + ":" + config.EsInfo.Httpport +
"/" + config.EsInfo.EsIndex.DbTables.IndexName + "/" + config.EsInfo.EsIndex.DbTables.IndexType + "/" + uuid + "/_update"
- params := "{\"doc\":{\"del_flag\":\"1\"}}"
+ params := "{\"doc\":{\"isDelete\":\"1\"}}"
fmt.Print("鍒犻櫎璇锋眰url:%s;\n 璇锋眰鍙傛暟params:%s", url, params)
data := esutil.GetEsDataReq(url, params, false)
//c.JSON(200, changeEsRespData(data, "鍒犻櫎鎴愬姛"))
--
Gitblit v1.8.0