From 49aafc75edad4497abe99e37a6146321891fbffb Mon Sep 17 00:00:00 2001
From: sunty <suntianyu0923@163.com>
Date: 星期四, 01 八月 2019 09:33:40 +0800
Subject: [PATCH] add dbtable enable determination
---
controllers/dbtablesCon.go | 21 +++++++++++++++++++++
models/model.go | 1 -
2 files changed, 21 insertions(+), 1 deletions(-)
diff --git a/controllers/dbtablesCon.go b/controllers/dbtablesCon.go
index 831437f..e942fc8 100644
--- a/controllers/dbtablesCon.go
+++ b/controllers/dbtablesCon.go
@@ -7,6 +7,7 @@
"github.com/gin-gonic/gin"
"github.com/satori/go.uuid"
"log"
+ "time"
"webserver/extend/code"
"webserver/extend/config"
"webserver/extend/esutil"
@@ -159,6 +160,26 @@
url := "http://" + config.EsInfo.Masterip + ":" + config.EsInfo.Httpport +
"/" + config.EsInfo.EsIndex.DbTables.IndexName + "/" + config.EsInfo.EsIndex.DbTables.IndexType + "/" + tableId + "?refresh=wait_for"
dbtable.PriInsert() // 娣诲姞鏃堕棿鍜屽垱寤轰汉
+
+ 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
+ }
dbTableByte, err := json.Marshal(dbtable)
if err != nil {
log.Fatalf("Json marshaling failed锛�%s", err)
diff --git a/models/model.go b/models/model.go
index 7d86219..6292a5b 100644
--- a/models/model.go
+++ b/models/model.go
@@ -15,7 +15,6 @@
dp.CreateTime = time.Now().Format("2006-01-02 15:04:05")
dp.CreateBy = "admin"
dp.IsDelete = 0
- dp.Enable = 1
}
func (dp *BaseEntity) PriUpdate() {
--
Gitblit v1.8.0