From 8974792312750b093237921cdc4ff09248b01201 Mon Sep 17 00:00:00 2001 From: wangshuai Date: Wed, 9 Dec 2020 16:40:02 +0800 Subject: [PATCH] 'commit' --- dsDataex/go.mod | 2 +- dsDataex/go.sum | 2 + .../DataSource/DatasourceDAO/DatasourceDAO.go | 1 - .../MetaData/MetadataDAO/MetadataDAO.go | 2 - .../MetadataOpenAPI/MetadataOpenAPI.go | 1 - .../MetadataService/MetadataService.go | 103 +++++++++--------- 6 files changed, 53 insertions(+), 58 deletions(-) diff --git a/dsDataex/go.mod b/dsDataex/go.mod index 3fe4ecb4..9584fa7e 100644 --- a/dsDataex/go.mod +++ b/dsDataex/go.mod @@ -18,7 +18,7 @@ require ( github.com/fsnotify/fsnotify v1.4.9 // indirect github.com/garyburd/redigo v1.6.0 github.com/gin-gonic/gin v1.6.3 - github.com/go-co-op/gocron v0.3.0 + github.com/go-co-op/gocron v0.3.3 github.com/go-openapi/loads v0.19.5 github.com/go-openapi/spec v0.19.6 github.com/go-redis/redis/v7 v7.3.0 diff --git a/dsDataex/go.sum b/dsDataex/go.sum index 89714d69..84637e3b 100644 --- a/dsDataex/go.sum +++ b/dsDataex/go.sum @@ -172,6 +172,8 @@ github.com/gliderlabs/ssh v0.1.1/go.mod h1:U7qILu1NlMHj9FlMhZLlkCdDnU1DBEAqr0aev github.com/globalsign/mgo v0.0.0-20180905125535-1ca0a4f7cbcb/go.mod h1:xkRDCp4j0OGD1HRkm4kmhM+pmpv3AKq5SU7GMg4oO/Q= github.com/go-co-op/gocron v0.3.0 h1:GVNbAB0rrMaP/v1Xs8t2/NzyEG4vP8UbLNy6C22o3RY= github.com/go-co-op/gocron v0.3.0/go.mod h1:Y9PWlYqDChf2Nbgg7kfS+ZsXHDTZbMZYPEQ0MILqH+M= +github.com/go-co-op/gocron v0.3.3 h1:QnarcMZWWKrEP25uCbtDiLsnnGw+PhCjL3wNITdWJOs= +github.com/go-co-op/gocron v0.3.3/go.mod h1:Y9PWlYqDChf2Nbgg7kfS+ZsXHDTZbMZYPEQ0MILqH+M= github.com/go-gl/glfw v0.0.0-20190409004039-e6da0acd62b1/go.mod h1:vR7hzQXu2zJy9AVAgeJqvqgH9Q5CA+iKCZ2gyEVpxRU= github.com/go-gl/glfw/v3.3/glfw v0.0.0-20191125211704-12ad95a8df72/go.mod h1:tQ2UAYgL5IevRw8kRxooKSPJfGvJ9fJQFa0TUsXzTg8= github.com/go-ini/ini v1.25.4/go.mod h1:ByCAeIL28uOIIG0E3PJtZPDL8WnHpFKFOtgjp+3Ies8= diff --git a/dsSupport/MyModel/DataSource/DatasourceDAO/DatasourceDAO.go b/dsSupport/MyModel/DataSource/DatasourceDAO/DatasourceDAO.go index 8681d607..6f7ba71c 100644 --- a/dsSupport/MyModel/DataSource/DatasourceDAO/DatasourceDAO.go +++ b/dsSupport/MyModel/DataSource/DatasourceDAO/DatasourceDAO.go @@ -127,7 +127,6 @@ func GetDatasourceIdByCode(code string) (bool, string, interface{}, error) { var id int has, _ := DbUtil.Engine.SQL(sql, code).Get(&id) - fmt.Println(id) if has == true { return true, "数据获取成功", id, nil } else { diff --git a/dsSupport/MyModel/MetaData/MetadataDAO/MetadataDAO.go b/dsSupport/MyModel/MetaData/MetadataDAO/MetadataDAO.go index 2090ec12..ff96668b 100644 --- a/dsSupport/MyModel/MetaData/MetadataDAO/MetadataDAO.go +++ b/dsSupport/MyModel/MetaData/MetadataDAO/MetadataDAO.go @@ -35,7 +35,6 @@ func GetMetadataResults(query MySwagger.MetadataQuery) (bool, string, int, []map func CreateMetadata(model *models.TDataexMetadata) (bool, string, error) { _, err := db.Insert(model) if err != nil { - fmt.Println("err=", err) LogUtil.Error(ErrorConst.SqlUpdateError, "接入系统authToken Update，数据库操作发生严重错误："+err.Error()) return false, "数据库操作失败", err } @@ -45,7 +44,6 @@ func CreateMetadata(model *models.TDataexMetadata) (bool, string, error) { func CreateMetadataBatch(model []models.TDataexMetadata) (bool, string, error) { _, err := db.Insert(model) if err != nil { - fmt.Println("err=", err) LogUtil.Error(ErrorConst.SqlUpdateError, "接入系统authToken Update，数据库操作发生严重错误："+err.Error()) return false, "数据库操作失败", err } diff --git a/dsSupport/MyModel/MetaData/MetadataOpenAPI/MetadataOpenAPI.go b/dsSupport/MyModel/MetaData/MetadataOpenAPI/MetadataOpenAPI.go index 9b049f61..010394e6 100644 --- a/dsSupport/MyModel/MetaData/MetadataOpenAPI/MetadataOpenAPI.go +++ b/dsSupport/MyModel/MetaData/MetadataOpenAPI/MetadataOpenAPI.go @@ -234,7 +234,6 @@ func CreateMetadataES(c *gin.Context) { if err := c.ShouldBindJSON(&raw); err != nil { c.JSON(http.StatusBadRequest, MySwagger.Result{Success: false, Message: "接入系统数据JSON格式错误"}) - fmt.Println(err) return } diff --git a/dsSupport/MyModel/MetaData/MetadataService/MetadataService.go b/dsSupport/MyModel/MetaData/MetadataService/MetadataService.go index 8fdb170a..58fa5871 100644 --- a/dsSupport/MyModel/MetaData/MetadataService/MetadataService.go +++ b/dsSupport/MyModel/MetaData/MetadataService/MetadataService.go @@ -9,7 +9,6 @@ import ( "dsSupport/Utils/CommonUtil" "dsSupport/Utils/ES7Util" "dsSupport/models" - "fmt" "html" "strconv" "strings" @@ -179,61 +178,59 @@ func RemoveMetadata(id string) (bool, string, error) { } func CreateMetadataES(indexName string) (bool, string, error) { - res, _, datasourceId, _ := DatasourceDAO.GetDatasourceIdByCode(indexName) + res, _, _, _ := DatasourceDAO.GetDatasourceIdByCode(indexName) if res == true { - if MetadataDAO.IsMetadataExistsByDatasourceCode(indexName) == true { - MetadataDAO.DeleteMetadataByDatasourceCode(indexName) - } - fmt.Println("datasourceId: ", datasourceId) - result := ES7Util.IndexDataContentMapping(indexName) - var itemType string - itemType = "string" - business := []models.TDataexMetadata{} - for k, v := range result { - fmt.Println(k, v) - fmt.Println("v: ", v.(map[string]interface{})["type"]) - if v.(map[string]interface{})["type"] == "float" { - itemType = "float" - } else if v.(map[string]interface{})["type"] == "keyword" { - itemType = "string" - } else if v.(map[string]interface{})["type"] == "date" { - itemType = "datetime" - } else if v.(map[string]interface{})["type"] == "integer" { - itemType = "integer" - } else if v.(map[string]interface{})["type"] == "long" { - itemType = "text" - } else if v.(map[string]interface{})["type"] == "text" { - itemType = "text" - } else if v.(map[string]interface{})["type"] == "boolean" { - itemType = "boolean" - } else { - itemType = "string" + r, _ := ES7Util.IndexExist(indexName) + if r == true { + if MetadataDAO.IsMetadataExistsByDatasourceCode(indexName) == true { + MetadataDAO.DeleteMetadataByDatasourceCode(indexName) } - - b := models.TDataexMetadata{} - b.Id = CommonUtil.GetUUID() - b.DatasourceId = html.EscapeString(indexName) - b.ItemName = html.EscapeString(k) - //b.DicId = html.EscapeString("BA710E2E-895B-4563-9377-0CA5B3DE1CFD") - b.ItemType = itemType - b.ItemLength = -1 - b.ItemPattern = html.EscapeString("") - b.ItemInfo = html.EscapeString("") - b.CheckName = -1 - b.CheckDic = -1 - b.CheckType = -1 - b.CheckPattern = -1 - b.CheckExist = -1 - b.CreateTime = time.Now() - b.DeleteFlag = -1 - - business = append(business, b) + result := ES7Util.IndexDataContentMapping(indexName) + var itemType string + itemType = "string" + business := []models.TDataexMetadata{} + for k, v := range result { + if v.(map[string]interface{})["type"] == "float" { + itemType = "float" + } else if v.(map[string]interface{})["type"] == "keyword" { + itemType = "string" + } else if v.(map[string]interface{})["type"] == "date" { + itemType = "datetime" + } else if v.(map[string]interface{})["type"] == "integer" { + itemType = "integer" + } else if v.(map[string]interface{})["type"] == "long" { + itemType = "text" + } else if v.(map[string]interface{})["type"] == "text" { + itemType = "text" + } else if v.(map[string]interface{})["type"] == "boolean" { + itemType = "boolean" + } else { + itemType = "string" + } + + b := models.TDataexMetadata{} + b.Id = CommonUtil.GetUUID() + b.DatasourceId = html.EscapeString(indexName) + b.ItemName = html.EscapeString(k) + b.ItemType = itemType + b.ItemLength = -1 + b.ItemPattern = html.EscapeString("") + b.ItemInfo = html.EscapeString("") + b.CheckName = -1 + b.CheckDic = -1 + b.CheckType = -1 + b.CheckPattern = -1 + b.CheckExist = -1 + b.CreateTime = time.Now() + b.DeleteFlag = -1 + + business = append(business, b) + } + result1, message, error := MetadataDAO.CreateMetadataBatch(business) + return result1, message, error + } else { + return false, "", nil } - - fmt.Println(business) - result1, message, error := MetadataDAO.CreateMetadataBatch(business) - return result1, message, error - //return true, "ok", nil } else { return false, "", nil }