master
wangshuai 5 years ago
parent 674c3f4cea
commit 45f3e9adb8

@ -2,7 +2,6 @@ package DataaccessDAO
import (
"dsSupport/MyModel/MySwagger"
"dsSupport/Utils/CacheUtil"
"dsSupport/Utils/CommonUtil"
"dsSupport/Utils/DbUtil"
"dsSupport/Utils/ErrorConst"
@ -15,44 +14,93 @@ import (
// 数据库
var db = DbUtil.Engine
func GetDataaccessResults(query MySwagger.DataaccessQuery) (bool, string, int32, []map[string]interface{}, error) {
sql := "SELECT id FROM t_dataex_dataaccess WHERE 1 = 1" + query.Conditions
func GetDataaccessResults(query MySwagger.DataaccessQuery) (bool, string, int, []map[string]interface{}, error) {
//sql := "SELECT ls.id source_systemid, ls.system_name source_systemname, ls1.system_name consume_systemname, da.* FROM t_dataex_dataaccess da LEFT JOIN t_dataex_datasource ds ON da.datasource_id = ds.id LEFT JOIN t_dataex_linksystem ls ON ls.id = ds.system_id LEFT JOIN t_dataex_linksystem ls1 ON ls1.id = da.consume_systemid" + query.Conditions
fmt.Println("sql=", sql)
//通过SQL获取带缓存的数据
list, count, _ := CacheUtil.Page(sql, 100, query.Page)
listJson, _ :=json.Marshal(list)
sql1 := "SELECT id FROM t_dataex_datasource WHERE 1 = 1"
joinList1, _, _ := CacheUtil.Page(sql1, 10000, 0)
joinListJson1, _ := json.Marshal(joinList1)
mergedList1 := CommonUtil.ListMerge(string(listJson), string(joinListJson1), "datasource_id", "id", "source_systemid", "system_id")
sql2 := "SELECT id FROM t_dataex_datasource WHERE 1 = 1"
joinList2, _, _ := CacheUtil.Page(sql2, 10000, 0)
joinListJson2, _ := json.Marshal(joinList2)
mergedList2 := CommonUtil.ListMerge(mergedList1, string(joinListJson2), "datasource_id", "id", "datasource_name", "datasource_name")
sql3 := "SELECT app_id FROM t_app_base WHERE 1 = 1"
joinList3, _, _ := CacheUtil.Page(sql3, 10000, 0)
joinListJson3, _ := json.Marshal(joinList3)
mergedList3 := CommonUtil.ListMerge(mergedList2, string(joinListJson3), "source_systemid", "app_id", "source_systemname", "app_name")
sql4 := "SELECT app_id FROM t_app_base WHERE 1 = 1"
joinList4, _, _ := CacheUtil.Page(sql4, 10000, 0)
joinListJson4, _ := json.Marshal(joinList4)
mergedList4 := CommonUtil.ListMerge(mergedList3, string(joinListJson4), "consume_systemid", "app_id", "consume_systemname", "app_name")
fmt.Println(mergedList4)
var datas []map[string]interface{}
json.Unmarshal([]byte(mergedList4), &datas)
fmt.Println(datas)
sql := "SELECT * FROM t_dataex_dataaccess WHERE 1 = 1" + query.Conditions + " ORDER BY create_time DESC, change_time DESC"
//接收传入参数
var limit = 100
var offset = (query.Page - 1) * limit
//条件查询语句
conditionSql := fmt.Sprintf("%s", " limit ? offset ? ")
//分页的语句
pageSql := fmt.Sprintf("%s %s", sql, conditionSql)
//分页数据当前页现存条数
count, _ := DbUtil.Engine.SQL(pageSql, limit, offset).Query().Count()
if count > 0 {
//分页数据
list, _ := DbUtil.Engine.SQL(pageSql, limit, offset).Query().List()
listJson, _ :=json.Marshal(list)
sql1 := "SELECT * FROM t_dataex_datasource WHERE 1 = 1"
var offset1 = (query.Page - 1) * 10
conditionSql1 := fmt.Sprintf("%s", " limit ? offset ? ")
pageSql1 := fmt.Sprintf("%s %s", sql1, conditionSql1)
joinList1, _ := DbUtil.Engine.SQL(pageSql1, limit, offset1).Query().List()
joinListJson1, _ := json.Marshal(joinList1)
mergedList1 := CommonUtil.ListMerge(string(listJson), string(joinListJson1), "datasource_id", "id", "source_systemid", "system_id")
sql2 := "SELECT * FROM t_dataex_datasource WHERE 1 = 1"
var offset2 = (query.Page - 1) * 10
conditionSql2 := fmt.Sprintf("%s", " limit ? offset ? ")
pageSql2 := fmt.Sprintf("%s %s", sql2, conditionSql2)
joinList2, _ := DbUtil.Engine.SQL(pageSql2, limit, offset2).Query().List()
joinListJson2, _ := json.Marshal(joinList2)
mergedList2 := CommonUtil.ListMerge(mergedList1, string(joinListJson2), "datasource_id", "id", "datasource_name", "datasource_name")
sql3 := "SELECT * FROM t_app_base WHERE 1 = 1"
var offset3 = (query.Page - 1) * 10
conditionSql3 := fmt.Sprintf("%s", " limit ? offset ? ")
pageSql3 := fmt.Sprintf("%s %s", sql3, conditionSql3)
joinList3, _ := DbUtil.Engine.SQL(pageSql3, limit, offset3).Query().List()
joinListJson3, _ := json.Marshal(joinList3)
mergedList3 := CommonUtil.ListMerge(mergedList2, string(joinListJson3), "source_systemid", "app_id", "source_systemname", "app_name")
sql4 := "SELECT * FROM t_app_base WHERE 1 = 1"
var offset4 = (query.Page - 1) * 10
conditionSql4 := fmt.Sprintf("%s", " limit ? offset ? ")
pageSql4 := fmt.Sprintf("%s %s", sql4, conditionSql4)
joinList4, _ := DbUtil.Engine.SQL(pageSql4, limit, offset4).Query().List()
joinListJson4, _ := json.Marshal(joinList4)
mergedList4 := CommonUtil.ListMerge(mergedList3, string(joinListJson4), "consume_systemid", "app_id", "consume_systemname", "app_name")
//通过SQL获取带缓存的数据
/*
list, count, _ := CacheUtil.Page(sql, 100, query.Page)
listJson, _ :=json.Marshal(list)
sql1 := "SELECT id FROM t_dataex_datasource WHERE 1 = 1"
joinList1, _, _ := CacheUtil.Page(sql1, 10000, 0)
joinListJson1, _ := json.Marshal(joinList1)
mergedList1 := CommonUtil.ListMerge(string(listJson), string(joinListJson1), "datasource_id", "id", "source_systemid", "system_id")
sql2 := "SELECT id FROM t_dataex_datasource WHERE 1 = 1"
joinList2, _, _ := CacheUtil.Page(sql2, 10000, 0)
joinListJson2, _ := json.Marshal(joinList2)
mergedList2 := CommonUtil.ListMerge(mergedList1, string(joinListJson2), "datasource_id", "id", "datasource_name", "datasource_name")
sql3 := "SELECT app_id FROM t_app_base WHERE 1 = 1"
joinList3, _, _ := CacheUtil.Page(sql3, 10000, 0)
joinListJson3, _ := json.Marshal(joinList3)
mergedList3 := CommonUtil.ListMerge(mergedList2, string(joinListJson3), "source_systemid", "app_id", "source_systemname", "app_name")
sql4 := "SELECT app_id FROM t_app_base WHERE 1 = 1"
joinList4, _, _ := CacheUtil.Page(sql4, 10000, 0)
joinListJson4, _ := json.Marshal(joinList4)
mergedList4 := CommonUtil.ListMerge(mergedList3, string(joinListJson4), "consume_systemid", "app_id", "consume_systemname", "app_name")
*/
fmt.Println(mergedList4)
var datas []map[string]interface{}
json.Unmarshal([]byte(mergedList4), &datas)
fmt.Println(datas)
return true, "数据获取成功", count, datas, nil
} else {
return false, "数据获取失败,数据不存在", count, nil, nil

@ -31,7 +31,7 @@ func ReadDataaccess(c *gin.Context) {
fmt.Println(err)
return
}
fmt.Println("json.page=", raw.Page)
success, message, count, data, _ := DataaccessService.GetDataaccessResults(raw)
if success {

@ -16,10 +16,9 @@ import (
"time"
)
func GetDataaccessResults(swag MySwagger.DataaccessSwag) (bool, string, int32, []map[string]interface{}, error) {
func GetDataaccessResults(swag MySwagger.DataaccessSwag) (bool, string, int, []map[string]interface{}, error) {
var condition string
var conditions []string
var page int
var query MySwagger.DataaccessQuery
if swag.DatasourceId != "" {
@ -67,10 +66,9 @@ func GetDataaccessResults(swag MySwagger.DataaccessSwag) (bool, string, int32, [
conditions = append(conditions, "enable_flag='1'")
}
if swag.Page != 0 {
page = swag.Page
query.Page = (page - 1) * 100
query.Page = swag.Page
} else {
query.Page = 0
query.Page = 1
}
if len(conditions) > 0 {

@ -11,7 +11,6 @@ package DataerrorDAO
import (
"dsSupport/MyModel/MySwagger"
"dsSupport/Utils/CacheUtil"
"dsSupport/Utils/DbUtil"
"dsSupport/Utils/ErrorConst"
"dsSupport/Utils/LogUtil"
@ -22,17 +21,23 @@ import (
//数据库
var db = DbUtil.Engine
func GetDataerrorResults(query MySwagger.DataerrorQuery) (bool, string, int32, []map[string]interface{}, error) {
sql := "SELECT id FROM t_dataex_error WHERE 1 = 1" + query.Conditions
fmt.Println("sql = ", sql)
//通过SQL获取带缓存的数据
list, count, _ := CacheUtil.Page(sql, 100, query.Page)
func GetDataerrorResults(query MySwagger.DataerrorQuery) (bool, string, int, []map[string]interface{}, error) {
sql := "SELECT * FROM t_dataex_error WHERE 1 = 1" + query.Conditions + " ORDER BY create_time DESC, change_time DESC"
//接收传入参数
var limit = 100
var offset = (query.Page - 1) * limit
//条件查询语句
conditionSql := fmt.Sprintf("%s", " limit ? offset ? ")
//分页的语句
pageSql := fmt.Sprintf("%s %s", sql, conditionSql)
//分页数据当前页现存条数
count, _ := DbUtil.Engine.SQL(pageSql, limit, offset).Query().Count()
if count > 0 {
return true, "数据获取成功", count, list, nil
//分页数据
list, err := DbUtil.Engine.SQL(pageSql, limit, offset).Query().List()
return true, "数据获取成功", count, list, err
} else {
return false, "数据获取失败systemID对应的数据源类型不存在", count, nil, nil
return false, "数据获取失败,数据源不存在", count, nil, nil
}
}

@ -20,10 +20,9 @@ import (
"time"
)
func GetDataerrorResults(swag MySwagger.DataerrorSwag) (bool, string, int32, []map[string]interface{}, error) {
func GetDataerrorResults(swag MySwagger.DataerrorSwag) (bool, string, int, []map[string]interface{}, error) {
var condition string
var conditions []string
var page int
var query MySwagger.DataerrorQuery
if swag.DeleteFlag != 0 {
@ -37,8 +36,9 @@ func GetDataerrorResults(swag MySwagger.DataerrorSwag) (bool, string, int32, []m
conditions = append(conditions, "enable_flag='1'")
}
if swag.Page != 0 {
page = swag.Page
query.Page = (page - 1) * 100
query.Page = swag.Page
} else {
query.Page = 1
}
if len(conditions) > 0 {

@ -13,16 +13,28 @@ import (
//数据库
var db = DbUtil.Engine
func GetDatasourceResults(query MySwagger.DatasourceQuery) (bool, string, int32, []map[string]interface{}, error) {
sql := "SELECT id FROM t_dataex_datasource WHERE 1 = 1" + query.Conditions
fmt.Println("sql = ", sql)
//通过SQL获取带缓存的数据
list, count, _ := CacheUtil.Page(sql, 100, query.Page)
func GetDatasourceResults(query MySwagger.DatasourceQuery) (bool, string, int, []map[string]interface{}, error) {
sql := "SELECT * FROM t_dataex_datasource WHERE 1 = 1" + query.Conditions + " ORDER BY create_time DESC, change_time DESC"
//接收传入参数
var limit = 100
var offset = (query.Page - 1) * limit
//var orderby = "create_time DESC"
// 排序查询语句
//orderBySql := fmt.Sprintf("%s", " order by ? ")
//条件查询语句
conditionSql := fmt.Sprintf("%s", " limit ? offset ? ")
//分页的语句
pageSql := fmt.Sprintf("%s %s", sql, conditionSql)
fmt.Println(pageSql)
//分页数据当前页现存条数
count, _ := DbUtil.Engine.SQL(pageSql, limit, offset).Query().Count()
fmt.Println(count)
if count > 0 {
return true, "数据获取成功", count, list, nil
//分页数据
list, err := DbUtil.Engine.SQL(pageSql, limit, offset).Query().List()
return true, "数据获取成功", count, list, err
} else {
return false, "数据获取失败systemID对应的数据源类型不存在", count, nil, nil
return false, "数据获取失败,数据源不存在", count, nil, nil
}
}

@ -30,6 +30,7 @@ func ReadDatasource(c *gin.Context) {
fmt.Println(err)
return
}
fmt.Println("raw = ", raw)
success, message, count, data, _ := DatasourceService.GetDatasourceResults(raw)

@ -23,10 +23,10 @@ type ESDataContent struct {
OrgName string `json:"org_name"`
}
func GetDatasourceResults(swag MySwagger.DatasourceSwag) (bool, string, int32, []map[string]interface{}, error) {
func GetDatasourceResults(swag MySwagger.DatasourceSwag) (bool, string, int, []map[string]interface{}, error) {
var condition string
var conditions []string
var page int
//var page int
var query MySwagger.DatasourceQuery
if swag.SystemId != "" {
@ -70,8 +70,11 @@ func GetDatasourceResults(swag MySwagger.DatasourceSwag) (bool, string, int32, [
conditions = append(conditions, "enable_flag='1'")
}
if swag.Page != 0 {
page = swag.Page
query.Page = (page - 1) * 100
//page = swag.Page
//query.Page = (page - 1) * 100
query.Page = swag.Page
} else {
query.Page = 1
}
if len(conditions) > 0 {

@ -2,7 +2,6 @@ package Jyt2012DAO
import (
"dsSupport/MyModel/MySwagger"
"dsSupport/Utils/CacheUtil"
"dsSupport/Utils/DbUtil"
"dsSupport/Utils/ErrorConst"
"dsSupport/Utils/LogUtil"
@ -13,17 +12,23 @@ import (
// 数据库
var db = DbUtil.Engine
func GetJyt2012Results(query MySwagger.Jyt2012Query) (bool, string, int32, []map[string]interface{}, error) {
sql := "SELECT id FROM t_dataex_jyt2012 WHERE 1 = 1" + query.Conditions
fmt.Println("sql=", sql)
//通过SQL获取带缓存的数据
list, count, _ := CacheUtil.Page(sql, 100, query.Page)
func GetJyt2012Results(query MySwagger.Jyt2012Query) (bool, string, int, []map[string]interface{}, error) {
sql := "SELECT * FROM t_dataex_jyt2012 WHERE 1 = 1" + query.Conditions + " ORDER BY create_time DESC, change_time DESC"
//接收传入参数
var limit = 100
var offset = (query.Page - 1) * limit
//条件查询语句
conditionSql := fmt.Sprintf("%s", " limit ? offset ? ")
//分页的语句
pageSql := fmt.Sprintf("%s %s", sql, conditionSql)
//分页数据当前页现存条数
count, _ := DbUtil.Engine.SQL(pageSql, limit, offset).Query().Count()
if count > 0 {
return true, "数据获取成功", count, list, nil
//分页数据
list, err := DbUtil.Engine.SQL(pageSql, limit, offset).Query().List()
return true, "数据获取成功", count, list, err
} else {
return false, "数据获取失败,数据不存在", count, nil, nil
return false, "数据获取失败,数据不存在", count, nil, nil
}
}

@ -12,10 +12,9 @@ import (
"time"
)
func GetJyt2012Results(swag MySwagger.Jyt2012Swag) (bool, string, int32, []map[string]interface{}, error) {
func GetJyt2012Results(swag MySwagger.Jyt2012Swag) (bool, string, int, []map[string]interface{}, error) {
var condition string
var conditions []string
var page int
var query MySwagger.Jyt2012Query
if swag.DicName != "" {
@ -50,10 +49,9 @@ func GetJyt2012Results(swag MySwagger.Jyt2012Swag) (bool, string, int32, []map[s
conditions = append(conditions, "enable_flag='1'")
}
if swag.Page != 0 {
page = swag.Page
query.Page = (page - 1) * 100
query.Page = swag.Page
} else {
query.Page = 0
query.Page = 1
}
if len(conditions) > 0 {

@ -27,17 +27,23 @@ func GetMetadataRow(where string) (bool, string, map[string]interface{}, error)
}
}
func GetMetadataResults(query MySwagger.MetadataQuery) (bool, string, int32, []map[string]interface{}, error) {
sql := "SELECT id FROM t_dataex_metadata WHERE 1 = 1" + query.Conditions
fmt.Println("sql = ", sql)
//通过SQL获取带缓存的数据
list, count, _ := CacheUtil.Page(sql, 100, query.Page)
func GetMetadataResults(query MySwagger.MetadataQuery) (bool, string, int, []map[string]interface{}, error) {
sql := "SELECT * FROM t_dataex_metadata WHERE 1 = 1" + query.Conditions + " ORDER BY create_time DESC, change_time DESC"
//接收传入参数
var limit = 100
var offset = (query.Page - 1) * limit
//条件查询语句
conditionSql := fmt.Sprintf("%s", " limit ? offset ? ")
//分页的语句
pageSql := fmt.Sprintf("%s %s", sql, conditionSql)
//分页数据当前页现存条数
count, _ := DbUtil.Engine.SQL(pageSql, limit, offset).Query().Count()
if count > 0 {
return true, "数据获取成功", count, list, nil
//分页数据
list, err := DbUtil.Engine.SQL(pageSql, limit, offset).Query().List()
return true, "数据获取成功", count, list, err
} else {
return false, "数据获取失败systemID对应的数据源类型不存在", count, nil, nil
return false, "数据获取失败,数据源不存在", count, nil, nil
}
}

@ -28,7 +28,7 @@ func ReadMetadata(c *gin.Context) {
fmt.Println(err)
return
}
fmt.Println("json.page=", raw.Page)
success, message, count, data, _ := MetadataService.GetMetadataResults(raw)
if success {

@ -16,10 +16,9 @@ import (
"time"
)
func GetMetadataResults(swag MySwagger.MetadataSwag) (bool, string, int32, []map[string]interface{}, error) {
func GetMetadataResults(swag MySwagger.MetadataSwag) (bool, string, int, []map[string]interface{}, error) {
var condition string
var conditions []string
var page int
var query MySwagger.MetadataQuery
if swag.DatasourceId != "" {
@ -66,10 +65,9 @@ func GetMetadataResults(swag MySwagger.MetadataSwag) (bool, string, int32, []map
conditions = append(conditions, "enable_flag='1'")
}
if swag.Page != 0 {
page = swag.Page
query.Page = (page - 1) * 100
query.Page = swag.Page
} else {
query.Page = 0
query.Page = 1
}
if len(conditions) > 0 {

@ -4,6 +4,7 @@ type Result struct {
Success bool `json:"success" example:"true"`
Fail bool `json:"fail" example:"false"`
Message string `json:"message" example:"操作成功"`
Total int32 `json:"total" example:"120"`
Total int `json:"total" example:"120"`
Count int `json:"total" example:"120"`
Data []map[string]interface{} `json:"data" `
}

@ -13,17 +13,23 @@ import (
//数据库
var db = DbUtil.Engine
func GetOrgtreeResults(query MySwagger.OrgtreeQuery) (bool, string, []map[string]interface{}, error) {
sql := "SELECT id FROM t_dataex_orgtree WHERE 1 = 1" + query.Conditions
fmt.Println("sql = ", sql)
//通过SQL获取带缓存的数据
list, count, _ := CacheUtil.Page(sql, 100, query.Page)
fmt.Println("4count=", count)
func GetOrgtreeResults(query MySwagger.OrgtreeQuery) (bool, string, int, []map[string]interface{}, error) {
sql := "SELECT * FROM t_dataex_orgtree WHERE 1 = 1" + query.Conditions + " ORDER BY create_time DESC, change_time DESC"
//接收传入参数
var limit = 100
var offset = (query.Page - 1) * limit
//条件查询语句
conditionSql := fmt.Sprintf("%s", " limit ? offset ? ")
//分页的语句
pageSql := fmt.Sprintf("%s %s", sql, conditionSql)
//分页数据当前页现存条数
count, _ := DbUtil.Engine.SQL(pageSql, limit, offset).Query().Count()
if count > 0 {
return true, "数据获取成功", list, nil
//分页数据
list, err := DbUtil.Engine.SQL(pageSql, limit, offset).Query().List()
return true, "数据获取成功", count, list, err
} else {
return false, "数据获取失败systemID对应的数据源类型不存在", nil, nil
return false, "数据获取失败,数据源不存在", count, nil, nil
}
}

@ -27,13 +27,14 @@ func ReadOrgtree(c *gin.Context) {
fmt.Println(err)
return
}
success, message, data, _ := OrgtreeService.GetOrgtreeResults(raw)
success, message, count, data, _ := OrgtreeService.GetOrgtreeResults(raw)
if success {
c.JSON(http.StatusOK, MySwagger.Result{
Success: true,
Fail: false,
Message: message,
Total: count,
Data: data,
})

@ -13,10 +13,9 @@ import (
"time"
)
func GetOrgtreeResults(swag MySwagger.OrgtreeSwag) (bool, string, []map[string]interface{}, error) {
func GetOrgtreeResults(swag MySwagger.OrgtreeSwag) (bool, string, int, []map[string]interface{}, error) {
var condition string
var conditions []string
var page int
var query MySwagger.OrgtreeQuery
if swag.OrgName != "" {
@ -57,10 +56,9 @@ func GetOrgtreeResults(swag MySwagger.OrgtreeSwag) (bool, string, []map[string]i
conditions = append(conditions, "enable_flag='1'")
}
if swag.Page != 0 {
page = swag.Page
query.Page = (page - 1) * 100
query.Page = swag.Page
} else {
query.Page = 0
query.Page = 1
}
if len(conditions) > 0 {
@ -70,9 +68,9 @@ func GetOrgtreeResults(swag MySwagger.OrgtreeSwag) (bool, string, []map[string]i
}
query.Conditions = condition
result, message, data, failResult := OrgtreeDAO.GetOrgtreeResults(query)
result, message, count, data, failResult := OrgtreeDAO.GetOrgtreeResults(query)
return result, message, data, failResult
return result, message, count, data, failResult
}
func CreateOrgtree(model models.TDataexOrgtree) (bool, string, error) {

Loading…
Cancel
Save