From f26a0cab5bca17b7eab57f6330e576271e17a17f Mon Sep 17 00:00:00 2001
From: liuxiaolong <736321739@qq.com>
Date: 星期三, 13 十一月 2019 19:12:08 +0800
Subject: [PATCH] update ynSwagger,sync to master
---
controllers/dbtablesCon.go | 107 ++++++++++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 100 insertions(+), 7 deletions(-)
diff --git a/controllers/dbtablesCon.go b/controllers/dbtablesCon.go
index fd8ddd0..917923e 100644
--- a/controllers/dbtablesCon.go
+++ b/controllers/dbtablesCon.go
@@ -18,14 +18,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")
@@ -33,6 +34,30 @@
b, data := tApi.QueryDbTables(isSync)
if b{
util.ResponseFormat(c, code.Success, data)
+ } else {
+ util.ResponseFormat(c,code.ComError,[]interface{}{})
+ }
+}
+
+// @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{}{})
}
@@ -47,6 +72,7 @@
return data
}
+// @Security ApiKeyAuth
// @Summary 淇敼搴曞簱
// @Description 淇敼鍚屾鎴栨湰鍦板簱
// @Accept json
@@ -59,10 +85,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
}
+
paramBody := util.Struct2Map(dbtable)
var tApi dbapi.DbTableApi
b, data := tApi.UpdateDbTables(paramBody)
@@ -87,6 +114,66 @@
//} else {
// util.ResponseFormat(c, code.ServiceInsideError, result["data"])
//}
+}
+
+type DbTStatusVo struct {
+ Id string `json:"id"`
+ Enable int `json:"enable"`
+}
+
+// @Security ApiKeyAuth
+// @Summary 淇敼搴曞簱鐘舵��
+// @Description 淇敼鍚屾鎴栨湰鍦板簱搴曞簱鐘舵��
+// @Accept json
+// @Produce json
+// @Tags dbtable
+// @Param obj body controllers.DbTStatusVo true "搴曞簱鐘舵�佷慨鏀瑰弬鏁�"
+// @Success 200 {string} json "{"code":200, msg:"鐩綍缁撴瀯鏁版嵁", success:true}"
+// @Failure 500 {string} json "{"code":500, msg:"杩斿洖閿欒淇℃伅", success:false}"
+// @Router /data/api-v/dbtable/updateDbTableStatus [POST]
+func (dbt DbTableController) UpdateDbTableStatus(c *gin.Context) {
+ var ds DbTStatusVo
+ err := c.BindJSON(&ds)
+ if err !=nil || ds.Id == "" || (ds.Enable !=0 && ds.Enable !=1) {
+ util.ResponseFormat(c,code.RequestParamError,"鍙傛暟鏈夎")
+ return
+ }
+
+ var dtApi dbapi.DbTableApi
+ dts, err := dtApi.DbtablesById([]string{ds.Id})
+ if err !=nil || dts == nil {
+ util.ResponseFormat(c,code.RequestParamError,"搴曞簱涓嶅瓨鍦�")
+ return
+ }
+ if ds.Enable == 1 {
+ str := dts[0].StartTime
+ etr := dts[0].EndTime
+ ct := time.Now()
+ st, _ := time.ParseInLocation("2006-01-02 15:04:05", str, time.Local)
+ b := false
+ if etr != "" {
+ et,_ := time.ParseInLocation("2006-01-02 15:04:05", etr, time.Local)
+ if et.After(ct) && st.Before(ct) {
+ b = true
+ }
+ } else {
+ if st.Before(ct) {
+ b = true
+ }
+ }
+ //b 涓簍rue鎵嶅厑璁稿紑鍚�
+ if !b {
+ util.ResponseFormat(c,code.UpdateFail,"褰撳墠涓嶅厑璁稿惎鐢�")
+ return
+ }
+ }
+
+ b,_ := dtApi.UpdateDbTableStatus(ds.Id, ds.Enable)
+ if b {
+ util.ResponseFormat(c,code.UpdateSuccess,"鏇存柊鎴愬姛")
+ } else {
+ util.ResponseFormat(c,code.ComError,"鏇存柊澶辫触")
+ }
}
func UpdateEndTime(id string) (flag bool) {
@@ -117,6 +204,7 @@
return flag
}
+// @Security ApiKeyAuth
// @Summary 娣诲姞搴曞簱
// @Description 娣诲姞鍚屾鎴栨湰鍦板簱
// @Accept json
@@ -163,11 +251,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
@@ -175,10 +267,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