From 63645d248c765244488cd34dbc1bb6528ca6b7c7 Mon Sep 17 00:00:00 2001
From: zhangzengfei <zhangzengfei@smartai.com>
Date: 星期二, 05 九月 2023 09:58:13 +0800
Subject: [PATCH] 修复编译
---
system-service/controllers/clearData.go | 132 ++++++++++++++++++++++----------------------
1 files changed, 66 insertions(+), 66 deletions(-)
diff --git a/system-service/controllers/clearData.go b/system-service/controllers/clearData.go
index 200ab23..e99cfb6 100644
--- a/system-service/controllers/clearData.go
+++ b/system-service/controllers/clearData.go
@@ -1,67 +1,67 @@
-package controllers
-
-import (
- "basic.com/pubsub/esutil.git"
- "basic.com/valib/bhomeclient.git"
- "basic.com/valib/bhomedbapi.git"
- "basic.com/valib/logger.git"
- "strconv"
- "vamicro/config"
-)
-
-type DeleteDataController struct{}
-
-type DeleteParams struct {
- StartTime string `json:"startTime"`
- EndTime string `json:"endTime"`
-}
-
-// @Security ApiKeyAuth
-// @Summary 鎸夋椂闂磋寖鍥存竻鐞嗘暟鎹�
-// @Description 鎸夋椂闂磋寖鍥存竻鐞嗘暟鎹�
-// @Accept json
-// @Produce json
-// @Tags 鏁版嵁娓呯悊
-// @Param reqBody body controllers.DeleteParams true "鏃堕棿鑼冨洿"
-// @Success 200 {string} json "{"code":200, msg:"", success:true}"
-// @Failure 500 {string} json "{"code":500, msg:"", success:false}"
-// @Router /data/api-v/clearData/deleteEsData [POST]
-func (cdc *DeleteDataController) DeleteEsData(h *bhomeclient.WrapperHandler, c *bhomeclient.Request) *bhomeclient.Reply {
- var cp DeleteParams
- var sysApi bhomedbapi.SysSetApi
- flag,localConf := sysApi.GetServerInfo()
- if !flag || localConf.AlarmIp == "" || localConf.ServerId == "" {
- logger.Debug("localConfig is wrong!!!")
- return &bhomeclient.Reply{ Msg: "GetServerInfo err"}
- }
- ip := localConf.AlarmIp
- port := strconv.Itoa(int(localConf.AlarmPort))
- analyServerId := localConf.ServerId
- c.BindJSON(&cp)
- startTime := cp.StartTime
- endTime := cp.EndTime
- queryRes, queryErr := esutil.QueryAnalyServerData(ip, port, config.EsInfo.EsIndex.AiOcean.IndexName, startTime, endTime, analyServerId)
- if queryErr != nil {
- return &bhomeclient.Reply{ Msg: "鏍￠獙鏁版嵁澶辫触"}
- }
- if queryRes != true {
- return &bhomeclient.Reply{ Msg: "璇ユ椂闂磋寖鍥存棤鏁版嵁鍙竻鐞�"}
- }
- logger.Debug("asgdasgdjhas: ", ip, port, config.BasicFS.IndexName, startTime, endTime, analyServerId)
- addRes, addErr := esutil.AddDelTask(ip, port, config.BasicFS.IndexName, startTime, endTime, analyServerId)
- if addErr != nil {
- logger.Debug("閿欒涓簎锛� ", addErr)
- return &bhomeclient.Reply{ Msg: "杩藉姞浠诲姟鍑洪敊"}
- }
- if addRes != true {
- return &bhomeclient.Reply{ Msg: "杩藉姞浠诲姟澶辫触"}
- }
- deleteRes, deleteErr := esutil.DeleteAnalyServerData(ip, port, config.EsInfo.EsIndex.AiOcean.IndexName, startTime, endTime, analyServerId)
- if deleteErr != nil {
- return &bhomeclient.Reply{ Msg: "鏁版嵁鍒犻櫎鍑洪敊"}
- }
- if deleteRes <= 0 {
- return &bhomeclient.Reply{ Msg: "鏁版嵁鍒犻櫎澶辫触"}
- }
- return &bhomeclient.Reply{ Success:true, Data: deleteRes}
+package controllers
+
+import (
+ "basic.com/pubsub/esutil.git"
+ "basic.com/valib/bhomeclient.git"
+ "basic.com/valib/bhomedbapi.git"
+ "basic.com/valib/logger.git"
+ "strconv"
+ "vamicro/config"
+)
+
+type DeleteDataController struct{}
+
+type DeleteParams struct {
+ StartTime string `json:"startTime"`
+ EndTime string `json:"endTime"`
+}
+
+// @Security ApiKeyAuth
+// @Summary 鎸夋椂闂磋寖鍥存竻鐞嗘暟鎹�
+// @Description 鎸夋椂闂磋寖鍥存竻鐞嗘暟鎹�
+// @Accept json
+// @Produce json
+// @Tags 鏁版嵁娓呯悊
+// @Param reqBody body controllers.DeleteParams true "鏃堕棿鑼冨洿"
+// @Success 200 {string} json "{"code":200, msg:"", success:true}"
+// @Failure 500 {string} json "{"code":500, msg:"", success:false}"
+// @Router /data/api-v/clearData/deleteEsData [POST]
+func (cdc *DeleteDataController) DeleteEsData(h *bhomeclient.WrapperHandler, c *bhomeclient.Request) *bhomeclient.Reply {
+ var cp DeleteParams
+ var sysApi bhomedbapi.SysSetApi
+ flag,localConf := sysApi.GetServerInfo()
+ if !flag || localConf.AlarmIp == "" || localConf.ServerId == "" {
+ logger.Debug("localConfig is wrong!!!")
+ return &bhomeclient.Reply{ Msg: "GetServerInfo err"}
+ }
+ ip := localConf.AlarmIp
+ port := strconv.Itoa(int(localConf.AlarmPort))
+ analyServerId := localConf.ServerId
+ c.BindJSON(&cp)
+ startTime := cp.StartTime
+ endTime := cp.EndTime
+ queryRes, queryErr := esutil.QueryAnalyServerData(ip, port, config.EsInfo.EsIndex.AiOcean.IndexName, startTime, endTime, analyServerId)
+ if queryErr != nil {
+ return &bhomeclient.Reply{ Msg: "鏍￠獙鏁版嵁澶辫触"}
+ }
+ if queryRes != true {
+ return &bhomeclient.Reply{ Msg: "璇ユ椂闂磋寖鍥存棤鏁版嵁鍙竻鐞�"}
+ }
+ logger.Debug("asgdasgdjhas: ", ip, port, config.BasicFS.IndexName, startTime, endTime, analyServerId)
+ addRes, addErr := esutil.AddDelTask(ip, port, config.BasicFS.IndexName, startTime, endTime, analyServerId)
+ if addErr != nil {
+ logger.Debug("閿欒涓簎锛� ", addErr)
+ return &bhomeclient.Reply{ Msg: "杩藉姞浠诲姟鍑洪敊"}
+ }
+ if addRes != true {
+ return &bhomeclient.Reply{ Msg: "杩藉姞浠诲姟澶辫触"}
+ }
+ deleteRes, deleteErr := esutil.DeleteAnalyServerData(ip, port, config.EsInfo.EsIndex.AiOcean.IndexName, startTime, endTime, analyServerId)
+ if deleteErr != nil {
+ return &bhomeclient.Reply{ Msg: "鏁版嵁鍒犻櫎鍑洪敊"}
+ }
+ if deleteRes <= 0 {
+ return &bhomeclient.Reply{ Msg: "鏁版嵁鍒犻櫎澶辫触"}
+ }
+ return &bhomeclient.Reply{ Success:true, Data: deleteRes}
}
\ No newline at end of file
--
Gitblit v1.8.0