From d9e01c51a525adf4f2393a95f87604e3b6e79ad2 Mon Sep 17 00:00:00 2001
From: sunty <1172534965@qq.com>
Date: 星期二, 19 十一月 2019 15:57:19 +0800
Subject: [PATCH] fix all
---
controllers/dbtablesCon.go | 85 ++++++++++++++++++++++++++++--------------
1 files changed, 56 insertions(+), 29 deletions(-)
diff --git a/controllers/dbtablesCon.go b/controllers/dbtablesCon.go
index e1e75bf..30c1625 100644
--- a/controllers/dbtablesCon.go
+++ b/controllers/dbtablesCon.go
@@ -6,11 +6,13 @@
"fmt"
"github.com/gin-gonic/gin"
"github.com/satori/go.uuid"
+ "strconv"
"time"
+ "webserver/cache"
"webserver/extend/code"
"webserver/extend/config"
"webserver/extend/esutil"
- "webserver/extend/logger"
+ "basic.com/valib/logger.git"
"webserver/extend/util"
"webserver/models"
)
@@ -18,14 +20,15 @@
type DbTableController struct {
}
+// @Security ApiKeyAuth
// @Summary 鏄剧ず搴曞簱鍒楄〃
// @Description 鏄剧ず鍚屾鎴栨湰鍦板簱鍒楄〃
// @Accept x-www-form-urlencoded
// @Produce json
// @Tags dbtable
// @Param isSync path string true "鏄惁鍚屾搴� 1 鍚屾搴� 2鏈湴搴� qita 鍏ㄩ儴搴�"
-// @Success 200 {string} json "{"code":200, msg:"鐩綍缁撴瀯鏁版嵁", success:true}"
-// @Failure 500 {string} json "{"code":500, msg:"杩斿洖閿欒淇℃伅", success:false}"
+// @Success 200 {string} json "{"code":200, msg:"", success:true}"
+// @Failure 500 {string} json "{"code":500, msg:"", success:false}"
// @Router /data/api-v/dbtable/queryDbTables/{isSync} [POST]
func (dbt DbTableController) QueryDbTables(c *gin.Context) {
isSync := c.Params.ByName("isSync")
@@ -38,15 +41,45 @@
}
}
+// @Security ApiKeyAuth
+// @Summary 鏌ヨ鏈満鎵�鏈夊簳搴撳垪琛�
+// @Description 鏌ヨ鏈満鎵�鏈夊簳搴撳垪琛�
+// @Accept x-www-form-urlencoded
+// @Produce json
+// @Tags dbtable
+// @Param isDelete query string true "0锛氭煡鏈垹闄わ紝1锛氭煡宸插垹闄わ紝鍏朵粬锛氭煡鎵�鏈�"
+// @Success 200 {string} json "{"code":200, msg:"", success:true}"
+// @Failure 500 {string} json "{"code":500, msg:"", success:false}"
+// @Router /data/api-v/dbtable/findAllDbTablesByCurServer [GET]
+func (dbt DbTableController) FindAllDbTablesByCurServer(c *gin.Context) {
+ var api dbapi.DbTableApi
+ isDeleteStr := c.Query("isDelete")
+ if isDeleteStr == "" {
+ isDeleteStr = "0"
+ }
+ arr,e := api.FindAllDbTablesByCurServer(isDeleteStr)
+ if e == nil {
+ util.ResponseFormat(c,code.Success, arr)
+ } else {
+ util.ResponseFormat(c,code.ComError,[]interface{}{})
+ }
+}
+
// 渚濇嵁搴曞簱id 鏌ヨ鏁版嵁
func QueryDbTableInfo(tableId string) map[string]interface{} {
- url := "http://" + config.EsInfo.Masterip + ":" + config.EsInfo.Httpport +
+ localConf, err2 := cache.GetServerInfo()
+ if err2 !=nil || localConf.AlarmIp == "" || localConf.ServerId == "" {
+ logger.Debug("localConfig is wrong!!!")
+ return nil
+ }
+ url := "http://" + localConf.AlarmIp + ":" + strconv.Itoa(int(localConf.AlarmPort)) +
"/" + config.EsInfo.EsIndex.DbTables.IndexName + "/" + config.EsInfo.EsIndex.DbTables.IndexName + "/" + tableId
logger.Debug("璇锋眰url:%s;", url)
data := esutil.GetEsDataInfo(url, true)
return data
}
+// @Security ApiKeyAuth
// @Summary 淇敼搴曞簱
// @Description 淇敼鍚屾鎴栨湰鍦板簱
// @Accept json
@@ -59,29 +92,11 @@
func (dbt DbTableController) UpdateDbTables(c *gin.Context) {
dbtable := new(models.Dbtables)
err := c.BindJSON(&dbtable)
- if err !=nil || dbtable.Id == "" || dbtable.TableName == "" {
+ if err !=nil || dbtable.Id == "" || dbtable.TableName == "" || (dbtable.Enable !=0 && dbtable.Enable !=1) {
util.ResponseFormat(c,code.RequestParamError,"鍙傛暟鏈夎")
return
}
- currentTime := time.Now()
- startTime := dbtable.StartTime
- endTime := ""
- if dbtable.EndTime != "" {
- endTime = dbtable.EndTime
- }
- st, _ := time.ParseInLocation("2006-01-02 15:04:05", startTime, time.Local)
- if endTime != "" {
- et, _ := time.ParseInLocation("2006-01-02 15:04:05", endTime, time.Local)
- if et.After(currentTime) && st.Before(currentTime) {
- dbtable.Enable = 1
- } else {
- dbtable.Enable = 0
- }
- } else if st.Before(currentTime) && endTime == "" {
- dbtable.Enable = 1
- } else {
- dbtable.Enable = 0
- }
+
paramBody := util.Struct2Map(dbtable)
var tApi dbapi.DbTableApi
b, data := tApi.UpdateDbTables(paramBody)
@@ -113,6 +128,7 @@
Enable int `json:"enable"`
}
+// @Security ApiKeyAuth
// @Summary 淇敼搴曞簱鐘舵��
// @Description 淇敼鍚屾鎴栨湰鍦板簱搴曞簱鐘舵��
// @Accept json
@@ -169,7 +185,12 @@
func UpdateEndTime(id string) (flag bool) {
flag = false
- url := "http://" + config.EsInfo.Masterip + ":" + config.EsInfo.Httpport +
+ localConf, err2 := cache.GetServerInfo()
+ if err2 !=nil || localConf.AlarmIp == "" || localConf.ServerId == "" {
+ logger.Debug("localConfig is wrong!!!")
+ return false
+ }
+ url := "http://" + localConf.AlarmIp + ":" + strconv.Itoa(int(localConf.AlarmPort)) +
"/" + config.EsInfo.EsIndex.DbTables.IndexName + "/" + config.EsInfo.EsIndex.DbTables.IndexType + "/" + id + "/_update?refresh=wait_for"
prama := "{\"script\":\"ctx._source.remove(\\\"endTime\\\")\"}"
buf, err := esutil.EsReq("POST", url, []byte(prama))
@@ -195,6 +216,7 @@
return flag
}
+// @Security ApiKeyAuth
// @Summary 娣诲姞搴曞簱
// @Description 娣诲姞鍚屾鎴栨湰鍦板簱
// @Accept json
@@ -241,11 +263,15 @@
} else {
dbtable.Enable = 0
}
- } else if st.Before(currentTime) && endTime == "" {
- dbtable.Enable = 1
} else {
- dbtable.Enable = 0
+ if st.Before(currentTime) {
+ dbtable.Enable = 1
+ } else {
+ dbtable.Enable = 0
+ }
}
+
+ logger.Debug("AddDbTableInfo dbtable.Enable:",dbtable.Enable,",startTime:",startTime,",endTime:",endTime,",st:",st,",curTime:",currentTime)
paramBody := util.Struct2Map(dbtable)
var tApi dbapi.DbTableApi
@@ -253,10 +279,11 @@
if b {
util.ResponseFormat(c,code.AddSuccess, data)
} else {
- util.ResponseFormat(c,code.ComError,"鏂板澶辫触")
+ util.ResponseFormat(c,code.ComError, data)
}
}
+// @Security ApiKeyAuth
// @Summary 鍒犻櫎搴曞簱
// @Description 鍒犻櫎鍚屾鎴栨湰鍦板簱
// @Accept x-www-form-urlencoded
--
Gitblit v1.8.0