From aaa7697d6ec77e03d96ce36ca66abcbbcf2bb7a3 Mon Sep 17 00:00:00 2001
From: liuxiaolong <liuxiaolong@aiotlink.com>
Date: 星期二, 14 七月 2020 12:03:33 +0800
Subject: [PATCH] add ruleSo
---
controllers/clearData.go | 17 ++++++++++-------
1 files changed, 10 insertions(+), 7 deletions(-)
diff --git a/controllers/clearData.go b/controllers/clearData.go
index 297dc19..697d0b0 100644
--- a/controllers/clearData.go
+++ b/controllers/clearData.go
@@ -3,6 +3,7 @@
import (
"basic.com/pubsub/esutil.git"
"basic.com/valib/logger.git"
+ "fmt"
"github.com/gin-gonic/gin"
"strconv"
"webserver/cache"
@@ -11,15 +12,15 @@
"webserver/extend/util"
)
-type ClearDataController struct{}
+type DeleteDataController struct{}
-type clearParams struct {
+type deleteParams struct {
StartTime string `json:"startTime"`
EndTime string `json:"endTime"`
}
-func (cdc *ClearDataController) ClearEsData(c *gin.Context) {
- var cp clearParams
+func (cdc *DeleteDataController) DeleteEsData(c *gin.Context) {
+ var cp deleteParams
localConf, err := cache.GetServerInfo()
if err != nil || localConf.AlarmIp == "" || localConf.ServerId == "" {
logger.Debug("localConfig is wrong!!!")
@@ -41,18 +42,20 @@
util.ResponseFormat(c, code.InvalidRequest, "鏁版嵁宸插垹闄ゆ垨璇ユ椂闂存鏃犳暟鎹�")
return
}
+ fmt.Println("asgdasgdjhas: ", ip, port, config.BasicFS.IndexName, startTime, endTime, analyServerId)
addRes, addErr := esutil.AddDelTask(ip, port, config.BasicFS.IndexName, startTime, endTime, analyServerId)
if addErr != nil {
- util.ResponseFormat(c, code.InvalidRequest, "杩藉姞浠诲姟澶辫触")
+ fmt.Println("閿欒涓簎锛� ", addErr)
+ util.ResponseFormat(c, code.InvalidRequest, "杩藉姞浠诲姟鍑洪敊")
return
}
if addRes != true {
util.ResponseFormat(c, code.InvalidRequest, "杩藉姞浠诲姟澶辫触")
return
}
- deleteRes, deleteErr := esutil.DeleteAnalyServerData(ip, port, config.BasicFS.IndexName, startTime, endTime, analyServerId)
+ deleteRes, deleteErr := esutil.DeleteAnalyServerData(ip, port, config.EsInfo.EsIndex.AiOcean.IndexName, startTime, endTime, analyServerId)
if deleteErr != nil {
- util.ResponseFormat(c, code.InvalidRequest, "鏁版嵁鍒犻櫎澶辫触")
+ util.ResponseFormat(c, code.InvalidRequest, "鏁版嵁鍒犻櫎鍑洪敊")
return
}
if deleteRes != true {
--
Gitblit v1.8.0