From 2bd2068c999cda5bda8c0787ed0dcaac6cb7afdb Mon Sep 17 00:00:00 2001
From: zhangzengfei <zhangzengfei@iotlink.com>
Date: 星期四, 31 十月 2019 13:27:46 +0800
Subject: [PATCH] feat: add system reboot api

---
 controllers/dbtablesCon.go |   16 +++++++++++++---
 1 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/controllers/dbtablesCon.go b/controllers/dbtablesCon.go
index 760fcc9..c3e09e5 100644
--- a/controllers/dbtablesCon.go
+++ b/controllers/dbtablesCon.go
@@ -20,6 +20,7 @@
 type DbTableController struct {
 }
 
+// @Security ApiKeyAuth
 // @Summary 鏄剧ず搴曞簱鍒楄〃
 // @Description 鏄剧ず鍚屾鎴栨湰鍦板簱鍒楄〃
 // @Accept  x-www-form-urlencoded
@@ -40,6 +41,7 @@
 	}
 }
 
+// @Security ApiKeyAuth
 // @Summary 鏌ヨ鏈満鎵�鏈夊簳搴撳垪琛�
 // @Description 鏌ヨ鏈満鎵�鏈夊簳搴撳垪琛�
 // @Accept  x-www-form-urlencoded
@@ -77,6 +79,7 @@
 	return data
 }
 
+// @Security ApiKeyAuth
 // @Summary 淇敼搴曞簱
 // @Description 淇敼鍚屾鎴栨湰鍦板簱
 // @Accept  json
@@ -143,6 +146,7 @@
 	Enable int `json:"enable"`
 }
 
+// @Security ApiKeyAuth
 // @Summary 淇敼搴曞簱鐘舵��
 // @Description 淇敼鍚屾鎴栨湰鍦板簱搴曞簱鐘舵��
 // @Accept  json
@@ -230,6 +234,7 @@
 	return flag
 }
 
+// @Security ApiKeyAuth
 // @Summary 娣诲姞搴曞簱
 // @Description 娣诲姞鍚屾鎴栨湰鍦板簱
 // @Accept  json
@@ -276,11 +281,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
@@ -292,6 +301,7 @@
 	}
 }
 
+// @Security ApiKeyAuth
 // @Summary 鍒犻櫎搴曞簱
 // @Description 鍒犻櫎鍚屾鎴栨湰鍦板簱
 // @Accept  x-www-form-urlencoded

--
Gitblit v1.8.0