bigdata
/
dsMin
6
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

'commit'

Browse Source
master
wangshuai 5 years ago
parent 5e76bbec28
commit 8974792312
6 changed files with 53 additions and 58 deletions
Show Stats Download Patch File Download Diff File

2
dsDataex/go.mod
Unescape View File

@ -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

2
dsDataex/go.sum
Unescape View File

@ -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=

1
dsSupport/MyModel/DataSource/DatasourceDAO/DatasourceDAO.go
Unescape View File

@ -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 {

2
dsSupport/MyModel/MetaData/MetadataDAO/MetadataDAO.go
Unescape View File

@ -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
}

1
dsSupport/MyModel/MetaData/MetadataOpenAPI/MetadataOpenAPI.go
Unescape View File

@ -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
}

103
dsSupport/MyModel/MetaData/MetadataService/MetadataService.go
Unescape View File

@ -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
}

Write Preview
Loading…
Cancel
Save