From 805324d0ddac6215f8250c616c979c77a3a4f9f3 Mon Sep 17 00:00:00 2001
From: sunty <suntianyu0923@163.com>
Date: 星期五, 26 七月 2019 15:46:56 +0800
Subject: [PATCH] fix bug
---
controllers/dbtableperson.go | 2 +-
controllers/taglist.go | 7 +++++--
2 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/controllers/dbtableperson.go b/controllers/dbtableperson.go
index bce4198..6d7d5c7 100644
--- a/controllers/dbtableperson.go
+++ b/controllers/dbtableperson.go
@@ -149,7 +149,7 @@
bytes, _ := json.Marshal(uuids)
s := string(bytes)
url := "http://" + config.EsInfo.Masterip + ":" + config.EsInfo.Httpport +
- "/" + config.EsInfo.EsIndex.Dbtablepersons.IndexName + "/_update_by_query?refresh=wait_for" // + config.EsInfo.EsIndex.Dbtablepersons.IndexType + "/" + "/" + s
+ "/" + config.EsInfo.EsIndex.Dbtablepersons.IndexName + "/_update_by_query?refresh" // + config.EsInfo.EsIndex.Dbtablepersons.IndexType + "/" + "/" + s
params := "{\"script\":{\"lang\":\"painless\",\"inline\":\"ctx._source.isDelete = \\\"1\\\";" +
"ctx._source.updateTime = \\\"" + time.Now().Format("2006-01-02 15:04:05") + "\\\"\"},\"query\":{\"terms\":{\"_id\":" + s + "}}}"
logger.Debug("鍒犻櫎璇锋眰url:%s;\n 璇锋眰鍙傛暟params:%s", url, params)
diff --git a/controllers/taglist.go b/controllers/taglist.go
index 6ad4914..565ca95 100644
--- a/controllers/taglist.go
+++ b/controllers/taglist.go
@@ -8,6 +8,7 @@
"webserver/extend/config"
"webserver/extend/esutil"
"webserver/extend/util"
+ "strconv"
)
//鏍囩鍒楄〃
@@ -25,7 +26,7 @@
url := "http://" + config.EsInfo.Masterip + ":" + config.EsInfo.Httpport +
"/" + config.EsInfo.EsIndex.DbTables.IndexName + "/_search"
- prama := "{\"query\":{\"bool\":{\"filter\":[{\"term\":{\"isDelete\":0}}]}},\"_source\":[\"tableName\",\"id\"]}"
+ prama := "{\"query\":{\"bool\":{\"filter\":[]}},\"_source\":[\"tableName\",\"id\",\"isDelete\"]}"
tokenRes := esutil.GetEsDataReq(url, prama, true)
sources := make([]map[string]interface{}, 0)
@@ -35,7 +36,9 @@
tokenRes["key"] = value.(map[string]interface{})["id"].(string)
tokenRes["title"] = value.(map[string]interface{})["tableName"].(string)
tokenRes["value"] = value.(map[string]interface{})["id"].(string)
+ status = int(value.(map[string]interface{})["isDelete"].(float64))
+ tokenRes["status"] = strconv.Itoa(status)
sources = append(sources, tokenRes)
}
util.ResponseFormat(c, code.Success, sources)
-}
+}
\ No newline at end of file
--
Gitblit v1.8.0